feat(design): set default text color to prevent inheritance (#1751)

dream-num · Apr 1, 2024 · 71e1d94 · 71e1d94
1 parent 37a7787
commit 71e1d94
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/packages/design/src/components/input/index.module.less b/packages/design/src/components/input/index.module.less
@@ -67,6 +67,8 @@
             border: none;
             outline: none;
 
+            background-color: rgb(var(--bg-color-secondary));
+
             &[disabled] {
                 cursor: inherit;
                 color: rgb(var(--grey-200));

diff --git a/packages/design/src/themes/theme-root.module.less b/packages/design/src/themes/theme-root.module.less
@@ -1,4 +1,5 @@
 .theme {
+    color: rgb(var(--text-color));
     font-family:
         Inter,
         -apple-system,

diff --git a/packages/ui/src/views/components/doc-bars/Toolbar.tsx b/packages/ui/src/views/components/doc-bars/Toolbar.tsx
@@ -127,7 +127,7 @@ export function Toolbar(props: IToolbarProps) {
 
             const collapsedId: string[] = [];
 
-            let currentWidth = 168;
+            let currentWidth = 182;
             for (const item of itemWidths) {
                 currentWidth += item.width;
 

diff --git a/packages/ui/src/views/components/doc-bars/index.module.less b/packages/ui/src/views/components/doc-bars/index.module.less
@@ -104,7 +104,6 @@
 
         &-container {
             display: grid;
-            gap: var(--margin-xs) 0;
 
             box-sizing: border-box;
             padding: var(--padding-sm);
@@ -116,8 +115,12 @@
             .toolbar-group {
                 flex-wrap: wrap;
 
-                &:not(:last-child)::after {
-                    content: initial;
+                &:not(:last-child) {
+                    margin-bottom: var(--margin-xs);
+
+                    &::after {
+                        content: initial;
+                    }
                 }
             }
         }