Merge branch 'refactor/develop' of https://github.com/betterdancing/t…

…iny-engine into fix/styles-review
opentiny · Dec 6, 2024 · 13378f6 · 13378f6
2 parents 628c020 + 1dc492a
commit 13378f6
Show file tree

Hide file tree

Showing 18 changed files with 412 additions and 593 deletions.
diff --git a/designer-demo/public/mock/bundle.json b/designer-demo/public/mock/bundle.json
@@ -9060,7 +9060,7 @@
           "devMode": "proCode",
           "npm": {
             "package": "@opentiny/vue",
-            "exportName": "Select",
+            "exportName": "Breadcrumb",
             "version": "3.14.0",
             "destructuring": true,
             "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs",
@@ -10731,7 +10731,7 @@
           "devMode": "proCode",
           "npm": {
             "package": "@opentiny/vue",
-            "exportName": "PopEditor",
+            "exportName": "Popeditor",
             "version": "3.14.0",
             "destructuring": true,
             "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs",

diff --git a/designer-demo/src/configurators/MyInputConfigurator.vue b/designer-demo/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/canvas/container/src/components/CanvasAction.vue b/packages/canvas/container/src/components/CanvasAction.vue
@@ -671,21 +671,8 @@ export default {
     }
   }
 }
-.short-cut-set.tiny-popper.tiny-popover {
-  background: var(--ti-lowcode-toolbar-bg);
+.short-cut-set.short-cut-set.tiny-popper.tiny-popover {
   padding: 10px;
-  .body label,
-  .header {
-    color: var(--ti-lowcode-dialog-font-color);
-    font-size: 12px;
-  }
-  .tiny-popover__title {
-    color: var(--ti-lowcode-dialog-font-color);
-  }
-}
-
-.short-cut-set.tiny-popper.tiny-popover[x-placement^='bottom'] .popper__arrow::after {
-  border-bottom-color: var(--ti-lowcode-toolbar-bg);
 }
 
 .drag-resize {

diff --git a/packages/canvas/container/src/components/CanvasDivider.vue b/packages/canvas/container/src/components/CanvasDivider.vue
@@ -215,7 +215,7 @@ export default {
     left: v-bind('state.horizontalLeft');
   }
   &:hover {
-    background-color: var(--ti-lowcode-common-primary-color);
+    background-color: var(--te-common-bg-primary-checked);
     .divider {
       background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAGKADAAQAAAABAAAAGAAAAADiNXWtAAACbElEQVRIDZ2Vu2sVURCH9yZgbCxMsFFjKQkExScREgQtLISAXbS4GDu10fgHiL1gpxKDCLFRfICCCSpCwEiCYiNWFkYsImIRH4jgY/x+xzNy7t29614HvsycmfnN3j1nd5Nl0cysDrPwEV7DRVjn9Vaent7Y+wYvrWbUG/pJTIHsCzyBd1pg8v0NzcmC2kDswdkizIFmyKZCK4F+uWwGelxPfAx+wFPPpZ58JzyHX3DEa8TdoFmyesYf3ZKu+nd40nyJvGzEc+7JjYWK2aTn3JPXRTRzVhdYhjkvpp78KMieNeW7yGnPZYfSmsfktV3LHSSWoNVhro+CbTTvdzH+KGyI61batdSXdAcXQDYWBcGx1m2+ha/wHRZUwK+C9/ABtA3q6W7S+vadl6AH9LT8hAk4CKdAQtlJuBIis3340zE+gR+PsXqlkVYzNEsz/5wrQR/MQ2qfWYzHX72RWE+UnppPoP3vijUNVm9qCyz60rvSnXTAJtBjOwKr0wbWV8GtaDulkVYzdLbtGaLdINPed1ZVt3Mlf/21r8NVL1Cpj1+sM9IZvAK9uY8qCas2MfAGyPbC9RCZDVXVl/YxbHsc+FCNxDpE3cWDUmHVIoPug2yna4hvhYzZLs/9l2fInjjoZjqA3JaYn07zbccM0Qujw839TyB3B2Q72h4sAcIDQW52uWiABsf63aJ6aQ6h3uqX8A38q5nTULsHsq25YlkCweEgMzv3j77B2He7rK+hhmAFLII+YGsaigULevSU6bHdXFDOp2g8DrIz+Wo+Q99Q6Da7lq9mWdG3aCWNL+BskaA5V6vVHpPT8FpzTevfkrgJcwZ0OJIAAAAASUVORK5CYII=);
     }
@@ -232,7 +232,7 @@ export default {
 
 .divider-line {
   position: absolute;
-  border: 1px dashed var(--ti-lowcode-common-primary-color);
+  border: 1px dashed var(--te-common-border-checked);
   z-index: 2;
 }
 </style>
diff --git a/packages/canvas/container/src/components/CanvasResizeBorder.vue b/packages/canvas/container/src/components/CanvasResizeBorder.vue
@@ -199,7 +199,7 @@ export default {
   &::after {
     content: '';
     display: block;
-    border: 1px solid var(--ti-lowcode-common-primary-color);
+    border: 1px solid var(--te-common-border-checked);
   }
   &.resize-vertical {
     cursor: ns-resize;

diff --git a/packages/canvas/container/src/components/shortCutPopover.vue b/packages/canvas/container/src/components/shortCutPopover.vue
@@ -86,7 +86,7 @@ export default {
   display: flex;
   align-items: center;
   padding: 0 10px;
-  border-bottom: 1px solid var(--ti-lowcode-toolbar-border-color, #333);
+  border-bottom: 1px solid var(--te-common-border-default, #333);
   height: 36px;
 
   div {
@@ -96,7 +96,7 @@ export default {
 
   .icon-setting {
     font-size: 16px;
-    fill: var(--ti-lowcode-toolbar-breadcrumb-color, #d9d9d9);
+    fill: var(--te-common-text-secondary, #d9d9d9);
   }
 
   .icon-wrap {
@@ -111,7 +111,7 @@ export default {
     align-items: center;
     transition: 0.3s;
     &:hover {
-      fill: var(--ti-lowcode-toolbar-icon-color, #fff);
+      fill: var(--te-common-icon-primary, #fff);
       background: var(--ti-lowcode-icon-hover-bg, rgba(255, 255, 255, 0.1));
     }
   }
@@ -164,14 +164,14 @@ export default {
     width: 100%;
     padding: 4px 0;
     display: inline-block;
-    background: var(--ti-lowcode-toolbar-view-hover-bg, #4d4d4d);
+    background: var(--te-common-bg-container, #4d4d4d);
     border-radius: 2px;
     display: flex;
     justify-content: center;
     align-items: center;
   }
   svg {
-    fill: var(--ti-lowcode-toolbar-breadcrumb-color, #d9d9d9);
+    fill: var(--te-common-text-secondary, #d9d9d9);
     margin-left: 4px;
   }
 }

diff --git a/packages/canvas/layout/src/CanvasLayout.vue b/packages/canvas/layout/src/CanvasLayout.vue
@@ -21,7 +21,7 @@ const siteCanvasStyle = computed(() => {
 
 <style lang="less" scoped>
 #canvas-wrap {
-  background: var(--ti-lowcode-canvas-wrap-bg);
+  background: var(--te-common-bg-container);
   flex: 1 1 0;
   border: none;
   display: flex;

diff --git a/packages/common/component/SearchEmpty.vue b/packages/common/component/SearchEmpty.vue
@@ -26,11 +26,10 @@ export default {
   .empty-icon {
     width: 80px;
     height: 80px;
-    color: var(--ti-lowcode-datasource-common-empty-color);
   }
   .empty-text {
     font-size: 12px;
-    color: var(--te-base-text-color-3);
+    color: var(--te-common-text-weaken);
   }
 }
 </style>
diff --git a/packages/engine-cli/template/designer/public/mock/bundle.json b/packages/engine-cli/template/designer/public/mock/bundle.json
@@ -8799,7 +8799,7 @@
           "devMode": "proCode",
           "npm": {
             "package": "@opentiny/vue",
-            "exportName": "Select",
+            "exportName": "Breadcrumb",
             "version": "3.14.0",
             "destructuring": true,
             "script": "https://unpkg.com/@opentiny/vue@~3.14/runtime/tiny-vue.mjs",

diff --git a/packages/settings/styles/src/components/inputs/ResetButton.vue b/packages/settings/styles/src/components/inputs/ResetButton.vue
@@ -41,6 +41,6 @@ export default {
   display: block;
   padding: 8px 4px;
   text-align: center;
-  color: var(--te-common-text-description);
+  color: var(--te-common-text-secondary);
 }
 </style>