feat(theme/datasource&setting): change datasource and setting panel t…

…heme variable
opentiny · Dec 6, 2024 · 91a3c5b · 91a3c5b
1 parent 3421b0f
commit 91a3c5b
Show file tree

Hide file tree

Showing 53 changed files with 304 additions and 369 deletions.
diff --git a/packages/configurator/src/code-list-configurator/CodeListConfigurator.vue b/packages/configurator/src/code-list-configurator/CodeListConfigurator.vue
@@ -220,7 +220,7 @@ export default {
     justify-content: space-between;
     align-items: center;
     padding: 10px 0;
-    color: var(--ti-lowcode-toolbar-breadcrumb-color);
+    color: var(--te-common-text-secondary);
 
     .header-title {
       font-size: 14px;

diff --git a/packages/configurator/src/html-attributes-configurator/HtmlAttributesConfigurator.vue b/packages/configurator/src/html-attributes-configurator/HtmlAttributesConfigurator.vue
@@ -195,8 +195,8 @@ export default {
     width: 24px;
     height: 24px;
     font-size: 16px;
-    color: var(--ti-lowcode-toolbar-breadcrumb-color);
-    background: var(--ti-lowcode-canvas-wrap-bg);
+    color: var(--te-common-text-secondary);
+    background: var(--te-common-bg-container);
     border: 1px solid var(--ti-lowcode-left-button-border-color);
     border-radius: 2px;
     display: inline-flex;
@@ -223,7 +223,7 @@ export default {
     border: 1px solid var(--ti-lowcode-optionitem-border-color);
     background: var(--ti-lowcode-optionitem-background-color);
     margin-bottom: -1px;
-    color: var(--ti-lowcode-toolbar-breadcrumb-color);
+    color: var(--te-common-text-secondary);
     padding: 7px;
     display: grid;
     grid-template-columns: 3fr auto;

diff --git a/packages/configurator/src/input-configurator/InputConfigurator.vue b/packages/configurator/src/input-configurator/InputConfigurator.vue
@@ -66,7 +66,7 @@ export default {
   font-size: 16px;
   &:hover {
     cursor: pointer;
-    color: var(--ti-lowcode-dialog-font-color);
+    color: var(--te-common-text-primary);
   }
 }
 </style>
diff --git a/packages/configurator/src/layout-grid-configurator/LayoutGridConfigurator.vue b/packages/configurator/src/layout-grid-configurator/LayoutGridConfigurator.vue
@@ -268,7 +268,7 @@ export default {
       box-sizing: border-box;
       width: 48px;
       border: 1px solid var(--ti-lowcode-tabs-border-color);
-      background: var(--ti-lowcode-canvas-wrap-bg);
+      background: var(--te-common-bg-container);
       border-radius: 4px;
       padding: 4px;
       margin: 0 4px 4px 4px;
@@ -313,13 +313,13 @@ export default {
     justify-content: center;
     align-items: center;
     display: flex;
-    background: var(--ti-lowcode-canvas-wrap-bg);
-    color: var(--ti-lowcode-toolbar-breadcrumb-color);
+    background: var(--te-common-bg-container);
+    color: var(--te-common-text-secondary);
     transition: none;
   }
 
   :deep(.splitpanes__splitter) {
-    background: var(--ti-lowcode-toolbar-view-hover-bg);
+    background: var(--te-common-bg-container);
     border-left: var(--ti-lowcode-tabs-border-color);
   }
 
@@ -328,7 +328,7 @@ export default {
 
     .customize {
       margin-bottom: 8px;
-      color: var(--ti-lowcode-toolbar-breadcrumb-color);
+      color: var(--te-common-text-secondary);
     }
   }
 }

diff --git a/packages/configurator/src/select-icon-configurator/SelectIconConfigurator.vue b/packages/configurator/src/select-icon-configurator/SelectIconConfigurator.vue
@@ -107,15 +107,15 @@ export default {
   padding-right: 20px;
   width: 136px;
   cursor: pointer;
-  background: var(--ti-lowcode-tabs-bg);
-  color: var(--ti-lowcode-toolbar-breadcrumb-color);
+  background: var(--te-common-bg-prompt);
+  color: var(--te-common-text-secondary);
   border: 1px solid var(--ti-lowcode-tabs-active-bg);
   border-radius: 3px;
   .icon-box {
     border-right: 1px solid var(--ti-lowcode-tabs-active-bg);
     padding: 4px 8px;
     .tiny-svg {
-      color: var(--ti-lowcode-toolbar-breadcrumb-color);
+      color: var(--te-common-text-secondary);
       font-size: 14px;
     }
   }

diff --git a/packages/configurator/src/slider-configurator/SliderConfigurator.vue b/packages/configurator/src/slider-configurator/SliderConfigurator.vue
@@ -95,22 +95,22 @@ export default {
     height: 3px;
     width: 100%;
     border-radius: 2px;
-    background-color: var(--ti-lowcode-canvas-wrap-bg);
+    background-color: var(--te-common-bg-container);
     .tiny-slider__handle {
       width: 10px;
       height: 10px;
       margin: -4px -5px 0 -5px;
       border-radius: 50%;
       border: none;
       cursor: ew-resize;
-      background-color: var(--ti-lowcode-toolbar-breadcrumb-color);
+      background-color: var(--te-common-text-secondary);
       box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 1px, rgba(0, 0, 0, 0.3) 0px 0px 0px 0.5px;
     }
     .tiny-slider__range {
       height: 3px;
       border-radius: 3px;
       margin-top: 0;
-      background: var(--ti-lowcode-canvas-wrap-bg);
+      background: var(--te-common-bg-container);
     }
 
     .tiny-slider__tips {

diff --git a/packages/configurator/src/slot-configurator/SlotConfigurator.vue b/packages/configurator/src/slot-configurator/SlotConfigurator.vue
@@ -141,7 +141,7 @@ export default {
   }
   .slot-name {
     width: 30%;
-    color: var(--ti-lowcode-dialog-font-color);
+    color: var(--te-common-text-primary);
     font-size: 12px;
     display: flex;
     justify-content: space-between;

diff --git a/packages/engine-cli/template/designer/src/configurators/MyInputConfigurator.vue b/packages/engine-cli/template/designer/src/configurators/MyInputConfigurator.vue
@@ -57,7 +57,7 @@ export default {
   font-size: 16px;
   &:hover {
     cursor: pointer;
-    color: var(--ti-lowcode-dialog-font-color);
+    color: var(--te-common-text-primary);
   }
 }
 </style>
diff --git a/packages/plugins/datasource/src/DataSourceField.vue b/packages/plugins/datasource/src/DataSourceField.vue
@@ -186,10 +186,10 @@ export default {
         align-items: center;
 
         &.field-row-add {
-          color: var(--ti-lowcode-datasource-json-border-colorr);
+          color: var(--ti-lowcode-datasource-json-border-color);
 
           svg {
-            color: var(--ti-lowcode-datasource-json-border-colorr);
+            color: var(--ti-lowcode-datasource-json-border-color);
           }
         }
       }

diff --git a/packages/plugins/datasource/src/DataSourceList.vue b/packages/plugins/datasource/src/DataSourceList.vue
@@ -152,7 +152,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: space-between;
-      color: var(--ti-lowcode-base-gray-90);
+      color: var(--te-common-text-primary);
       .item-name {
         display: flex;
         align-items: center;

diff --git a/packages/plugins/datasource/src/DataSourceRecordList.vue b/packages/plugins/datasource/src/DataSourceRecordList.vue
@@ -615,7 +615,7 @@ export default {
     font-size: 12px;
     text-align: left;
     padding: 0;
-    color: var(--ti-lowcode-base-text-color);
+    color: var(--te-common-text-primary);
     .icon-download {
       margin: 0 1px 4px 0;
       font-size: 16px;
@@ -631,10 +631,9 @@ export default {
   .empty-icon {
     width: 50px;
     height: 50px;
-    color: var(--ti-lowcode-datasource-common-empty-color);
   }
   .add-column {
-    color: var(--ti-lowcode-datasource-json-border-colorr);
+    color: var(--ti-lowcode-datasource-json-border-color);
     cursor: pointer;
   }
 }

diff --git a/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue b/packages/plugins/datasource/src/DataSourceRemoteDataResult.vue
@@ -123,7 +123,7 @@ export default {
   .monaco-editor {
     height: 120px;
     margin-top: 8px;
-    border: 1px solid var(--ti-lowcode-base-gray-101);
+    border: 1px solid var(--te-common-border-divider);
     border-radius: 4px;
   }
 }

diff --git a/packages/plugins/datasource/src/DataSourceRemoteForm.vue b/packages/plugins/datasource/src/DataSourceRemoteForm.vue
@@ -100,18 +100,6 @@ export default {
       width: 100px;
       border: none;
     }
-    :deep(.tiny-input-group__prepend) {
-      background: var(--ti-lowcode-datasource-respones-select-color-bg);
-      border-color: var(--ti-lowcode-datasource-select-border-color);
-      .tiny-input-suffix {
-        .tiny-input-display-only {
-          .tiny-input__inner {
-            border-color: var(--ti-lowcode-datasource-select-border-right-color-bg);
-            border-left: none;
-          }
-        }
-      }
-    }
     :deep(.tiny-input-suffix) {
       width: 100px;
       .tiny-input__inner {
@@ -123,9 +111,6 @@ export default {
       border: none;
       background: var(--ti-lowcode-datasource-respones-color-bg);
     }
-    .requestBtn {
-      color: var(--ti-lowcode-datasource-respones-border-color-bg);
-    }
     :deep(.border-input) {
       input {
         border-radius: 0;

diff --git a/packages/plugins/datasource/src/DataSourceRemotePanel.vue b/packages/plugins/datasource/src/DataSourceRemotePanel.vue
@@ -305,19 +305,6 @@ export default {
       :deep(.tiny-tabs__content) {
         margin: 12px 0;
       }
-      :deep(.is-active) {
-        .tiny-tabs__item__title {
-          color: var(--ti-lowcode-datasource-tabs-bottom-border-color);
-        }
-      }
-      :deep(.tiny-tabs__item__title) {
-        font-size: 14px;
-      }
-    }
-    :deep(.tiny-tabs__item__title) {
-      margin-right: 20px;
-      margin-left: 15px;
-      color: var(--ti-lowcode-datasource-label-color);
     }
   }
 }

diff --git a/packages/plugins/datasource/src/DataSourceRemoteParameter.vue b/packages/plugins/datasource/src/DataSourceRemoteParameter.vue
@@ -43,7 +43,7 @@ export default {
 .monaco-editor {
   height: 180px;
   margin-top: 8px;
-  border: 1px solid var(--ti-lowcode-base-gray-101);
+  border: 1px solid var(--te-common-border-divider);
   border-radius: 4px;
 }
 </style>
diff --git a/packages/plugins/datasource/src/DataSourceTemplate.vue b/packages/plugins/datasource/src/DataSourceTemplate.vue
@@ -79,7 +79,7 @@ export default {
       }
     }
     .blue::before {
-      border: 1px solid var(--ti-lowcode-datasource-json-border-colorr);
+      border: 1px solid var(--ti-lowcode-datasource-json-border-color);
     }
 
     .green::before {
@@ -105,7 +105,7 @@ export default {
     .tiny-button {
       color: var(--ti-lowcode-datasource-toolbar-breadcrumb-color);
       &.tiny-button--primary {
-        border-color: var(--ti-lowcode-datasource-common-primary-color);
+        border-color: var(--ti-lowcode-datasource-common-border-primary-color);
       }
 
       &.tiny-button--success {

diff --git a/packages/plugins/datasource/src/DataSourceType.vue b/packages/plugins/datasource/src/DataSourceType.vue
@@ -117,7 +117,7 @@ export default {
     &.is-checked {
       color: var(--ti-lowcode-datasource-toolbar-breadcrumb-color);
       .svg-icon {
-        color: var(--ti-lowcode-datasource-common-primary-color);
+        color: var(--ti-lowcode-datasource-common-border-primary-color);
       }
     }
     .svg-icon {

diff --git a/packages/plugins/datasource/src/RemoteDataAdapterForm.vue b/packages/plugins/datasource/src/RemoteDataAdapterForm.vue
@@ -55,12 +55,11 @@ export default {
   justify-content: space-between;
   align-items: center;
   padding: 8px 12px;
-  background: var(--ti-lowcode-datasource-toolbar-bg);
   margin-top: 12px;
-  font-size: 14px;
+  font-size: 12px;
 
   div {
-    color: var(--ti-lowcode-datasource-toolbar-breadcrumb-color);
+    color: var(--te-common-text-secondary);
   }
 
   .icon-del {
@@ -73,7 +72,7 @@ export default {
   min-height: 120px;
   height: 100%;
   margin-top: 8px;
-  border: 1px solid var(--ti-lowcode-base-gray-101);
+  border: 1px solid var(--te-common-border-divider);
   border-radius: 4px;
 }
 </style>
diff --git a/packages/plugins/materials/src/meta/block/src/BlockGroupSort.vue b/packages/plugins/materials/src/meta/block/src/BlockGroupSort.vue
@@ -78,11 +78,11 @@ export default {
 
 <style lang="less" scoped>
 .sort-text {
-  color: var(--ti-lowcode-toolbar-breadcrumb-color);
+  color: var(--te-common-text-secondary);
   margin-right: 6px;
 }
 .sort-caret {
-  color: var(--ti-lowcode-toolbar-breadcrumb-color);
+  color: var(--te-common-text-secondary);
   cursor: pointer;
 }
 

diff --git a/packages/plugins/state/src/DataSourceRightPanel.vue b/packages/plugins/state/src/DataSourceRightPanel.vue
@@ -113,7 +113,7 @@ export default {
 .data-source-right-panel {
   width: 442px;
   height: 100%;
-  border-right: 1px solid var(--ti-lowcode-toolbar-border-color);
+  border-right: 1px solid var(--te-common-border-divider);
   background: var(--ti-lowcode-toolbar-bg);
   position: absolute;
   left: calc(var(--base-left-panel-width) - 6px);
@@ -126,8 +126,8 @@ export default {
     height: 45px;
     padding: 0 12px;
     color: var(--ti-lowcode-toolbar-icon-color);
-    background: var(--ti-lowcode-toolbar-view-hover-bg);
-    border-bottom: 1px solid var(--ti-lowcode-tabs-border-color);
+    background: var(--te-common-bg-container);
+    border-bottom: 1px solid var(--te-common-border-divider);
   }
 }
 </style>
diff --git a/packages/settings/design/src/App.vue b/packages/settings/design/src/App.vue
@@ -97,14 +97,9 @@ export default {
 
 <style lang="less">
 :root {
-  --ti-lowcode-common-primary-color: #5e7ce0;
-  --ti-lowcode-common-text-title-color: #252b3a;
   --ti-lowcode-common-secondary-text-color: #adb0b8;
-  --ti-lowcode-common-text-main-color: #575d6c;
-  --ti-lowcode-design-plugin-color: #8a8e99;
   --ti-lowcode-common-border-color: #dfe1e6;
   --ti-lowcode-common-hover-bg-color: #f2f5fc;
-  --ti-lowcode-title-color: #333;
   --ti-lowcode-mask-bg: #fafafa;
   --max-height: calc(65vh - 70px);
 }
@@ -189,7 +184,7 @@ td {
   .source-code {
     --ti-lowcode-toolbar-bg: var(--ti-lowcode-mask-bg);
     .tiny-button {
-      --ti-button-info-normal-bg-color: var(--ti-lowcode-common-primary-color);
+      --ti-button-info-normal-bg-color: var(--te-common-color-info);
     }
   }
 }

diff --git a/packages/settings/design/src/components/ArrayConfigItemForm.vue b/packages/settings/design/src/components/ArrayConfigItemForm.vue
@@ -197,20 +197,20 @@ export default {
   cursor: pointer;
   display: flex;
   align-items: center;
-  color: var(--ti-lowcode-common-text-title-color);
+  color: var(--te-common-text-primary);
   .config-title {
     margin-left: 6px;
   }
 }
 .config-item-form {
   :deep(.tiny-form-item) {
     .tiny-form-item__label {
-      color: var(--ti-lowcode-common-text-main-color);
+      color: var(--te-common-text-secondary);
     }
     .tiny-form-item__content {
       .editor-warp {
-        --ti-lowcode-meta-codeEditor-border-color: var(--ti-lowcode-common-secondary-text-color);
-        --ti-lowcode-meta-codeEditor-color: var(--ti-lowcode-common-secondary-text-color);
+        --ti-lowcode-meta-codeEditor-border-color: var(--te-common-text-secondary);
+        --ti-lowcode-meta-codeEditor-color: var(--te-common-text-secondary);
       }
     }
   }