Merge pull request #1181 from refly-ai/fix/modal-center

mrcfps · web-flow · commit 527de981f2e3 · 2025-08-01T12:53:35.000+08:00
fix: center settings modal
diff --git a/apps/extension/src/entrypoints/floatingSphere-csui.content/index.tsx b/apps/extension/src/entrypoints/floatingSphere-csui.content/index.tsx
@@ -39,6 +39,10 @@ export default defineContentScript({
               token: {
                 colorPrimary: '#00968F',
                 borderRadius: 6,
+                // Modal specific tokens
+                colorBgMask: 'var(--refly-modal-mask)',
+                borderRadiusLG: 20,
+                boxShadow: '0 8px 32px 0 #00000014',
               },
             }}
           >
diff --git a/apps/web-next/src/prepare/InitializationSuspense.tsx b/apps/web-next/src/prepare/InitializationSuspense.tsx
@@ -34,15 +34,21 @@ export function InitializationSuspense({ children }: InitializationSuspenseProps
 
   useEffect(() => {
     const themeConfig = {
-      token: isDarkMode
-        ? {
-            controlItemBgActive: 'rgba(255, 255, 255, 0.08)',
-            controlItemBgActiveHover: 'rgba(255, 255, 255, 0.12)',
-          }
-        : {
-            controlItemBgActive: '#f1f1f0',
-            controlItemBgActiveHover: '#e0e0e0',
-          },
+      token: {
+        // Modal specific tokens
+        colorBgMask: 'var(--refly-modal-mask)',
+        borderRadiusLG: 20,
+        boxShadow: '0 8px 32px 0 #00000014',
+        ...(isDarkMode
+          ? {
+              controlItemBgActive: 'rgba(255, 255, 255, 0.08)',
+              controlItemBgActiveHover: 'rgba(255, 255, 255, 0.12)',
+            }
+          : {
+              controlItemBgActive: '#f1f1f0',
+              controlItemBgActiveHover: '#e0e0e0',
+            }),
+      },
       algorithm: isDarkMode ? theme.darkAlgorithm : theme.defaultAlgorithm,
     };
     updateTheme(themeConfig);
diff --git a/apps/web-next/src/tokens.css b/apps/web-next/src/tokens.css
@@ -7,7 +7,7 @@
   --refly-bg-float-z3: #ffffff;
   --refly-bg-glass-content: #ffffffcc;
   --refly-bg-canvas: #fbfbfb;
-  --refly-modal-mask: #00000026;
+  --refly-modal-mask: rgba(0, 0, 0, 0.15);
   --refly-Card-Border: rgba(0, 0, 0, 0.1);
   --refly-line: #1c232229;
   --refly-text-0: #1c1f23;
@@ -49,7 +49,7 @@
   --refly-bg-float-z3: #292929;
   --refly-bg-glass-content: #000000cc;
   --refly-bg-canvas: #1e1d1d;
-  --refly-modal-mask: #00000026;
+  --refly-modal-mask: rgba(0, 0, 0, 0.4);
   --refly-Card-Border: rgba(216, 216, 216, 0.1);
   --refly-line: #1c23221a;
   --refly-text-0: #f9f9f9;
diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsx
@@ -152,6 +152,10 @@ export const App = () => {
             token: {
               colorPrimary: '#0E9F77',
               borderRadius: 8,
+              // Modal specific tokens
+              colorBgMask: 'var(--refly-modal-mask)',
+              borderRadiusLG: 20,
+              boxShadow: '0 8px 32px 0 #00000014',
               ...(shouldUseDarkTheme
                 ? {
                     controlItemBgActive: 'rgba(255, 255, 255, 0.08)',
@@ -181,6 +185,10 @@ export const App = () => {
         token: {
           colorPrimary: '#0E9F77',
           borderRadius: 8,
+          // Modal specific tokens
+          colorBgMask: 'var(--refly-modal-mask)',
+          borderRadiusLG: 20,
+          boxShadow: '0 8px 32px 0 #00000014',
           ...(shouldUseDarkTheme
             ? {
                 controlItemBgActive: 'rgba(255, 255, 255, 0.08)',
diff --git a/packages/ai-workspace-common/src/components/canvas/layout-control/index.scss b/packages/ai-workspace-common/src/components/canvas/layout-control/index.scss
@@ -1,7 +1,6 @@
 .help-modal {
   .ant-modal-content {
     padding: 24px;
-    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
   }
 
   .ant-modal-close {
diff --git a/packages/ai-workspace-common/src/components/settings/index.scss b/packages/ai-workspace-common/src/components/settings/index.scss
@@ -3,11 +3,9 @@
   .ant-modal-content {
     height: 80vh;
     background: var(--refly-bg-content-z2);
-    box-shadow: none;
     padding: 0;
     margin: 0;
     box-sizing: border-box;
-    border-radius: 20px;
   }
 
   .ant-modal-body {
diff --git a/packages/ai-workspace-common/src/components/settings/index.tsx b/packages/ai-workspace-common/src/components/settings/index.tsx
@@ -183,10 +183,9 @@ const Settings: React.FC<SettingModalProps> = ({ visible, setVisible }) => {
       className="settings-modal"
       centered
       width={'90vw'}
-      height={'85vh'}
+      height={'80vh'}
       style={{
         maxWidth: '1400px',
-        maxHeight: '800px',
       }}
       title={null}
       footer={null}
diff --git a/packages/ai-workspace-common/src/components/settings/subscribe-modal/index.scss b/packages/ai-workspace-common/src/components/settings/subscribe-modal/index.scss
@@ -1,6 +1,7 @@
 .subscribe-modal {
   .ant-modal-content {
     height: 100vh;
+    border-radius: 0;
     padding: 0;
     margin: 0;
     box-sizing: border-box;
diff --git a/packages/ai-workspace-common/src/components/sider/popover.scss b/packages/ai-workspace-common/src/components/sider/popover.scss
@@ -0,0 +1,17 @@
+// Custom animation for SiderPopover
+.sider-popover-animation {
+  .ant-popover-inner {
+    animation: siderPopoverSlideIn 0.3s ease-out;
+  }
+}
+
+@keyframes siderPopoverSlideIn {
+  0% {
+    transform: translateX(-240px);
+    opacity: 0;
+  }
+  100% {
+    transform: translateX(0);
+    opacity: 1;
+  }
+} 
diff --git a/packages/ai-workspace-common/src/components/sider/popover.tsx b/packages/ai-workspace-common/src/components/sider/popover.tsx
@@ -6,6 +6,7 @@ import { Logo } from '../common/logo';
 import { GithubStar } from '../common/github-star';
 import cn from 'classnames';
 import { useState } from 'react';
+import './popover.scss';
 
 interface SiderPopoverProps {
   children?: React.ReactNode;
@@ -35,16 +36,12 @@ export const SiderPopover = (props: SiderPopoverProps) => {
         <Popover
           zIndex={11}
           overlayInnerStyle={{ padding: 0, boxShadow: 'none', border: 'none' }}
-          className="shadow-none"
+          overlayClassName="sider-popover-animation"
           arrow={false}
           placement="bottom"
           align={align}
           open={isVisible}
-          content={
-            <div className="animate-slide-in-left">
-              <SiderLayout source="popover" />
-            </div>
-          }
+          content={<SiderLayout source="popover" />}
         >
           {children || (
             <Button
diff --git a/packages/ui-kit/src/store/useConfigProviderStore.ts b/packages/ui-kit/src/store/useConfigProviderStore.ts
@@ -17,6 +17,14 @@ export const useConfigProviderStore = create<ConfigProviderState>((set) => ({
       borderRadius: 8,
       controlItemBgActive: 'var(--refly-tertiary-hover)',
       controlItemBgActiveHover: 'var(--refly-tertiary-hover)',
+      // Modal specific tokens
+      colorBgMask: 'var(--refly-modal-mask)',
+      borderRadiusLG: 20,
+      boxShadow: '0 8px 32px 0 #00000014',
+      // Input focus styles - remove outline and box-shadow
+      controlOutline: 'none',
+      controlOutlineWidth: 0,
+      controlBoxShadow: 'none',
     },
     algorithm: theme.defaultAlgorithm,
   },

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`.help-modal {`
`2`	`2`	`.ant-modal-content {`
`3`	`3`	`padding: 24px;`
`4`		`- box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);`
`5`	`4`	`}`
`6`	`5`
`7`	`6`	`.ant-modal-close {`