fix(styles): 优化颜色混合模式

ecaps1038 · Mar 24, 2024 · 4392dc8 · 4392dc8
1 parent 91998a3
commit 4392dc8
Show file tree

Hide file tree

Showing 63 changed files with 349 additions and 312 deletions.
diff --git a/packages/yike-design-ui/components/alert/style/variables.less b/packages/yike-design-ui/components/alert/style/variables.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 @alert-info-color: @pcolor;
 @alert-success-color: @scolor;
 @alert-warning-color: @wcolor;

diff --git a/packages/yike-design-ui/components/anchor/style/index.less b/packages/yike-design-ui/components/anchor/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 @import '../../scrollbar/style/index.less';
 .yk-anchor {
   position: relative;

diff --git a/packages/yike-design-ui/components/avatar/style/index.less b/packages/yike-design-ui/components/avatar/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 .yk-avatar {
   display: inline-flex;
   justify-content: center;

diff --git a/packages/yike-design-ui/components/back-top/style/index.less b/packages/yike-design-ui/components/back-top/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 .yk-backtop {
   position: fixed;
   z-index: 999;

diff --git a/packages/yike-design-ui/components/badge/style/index.less b/packages/yike-design-ui/components/badge/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 .modal {
   &-enter {
     &-from {

diff --git a/packages/yike-design-ui/components/button/style/variables.less b/packages/yike-design-ui/components/button/style/variables.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 
 // Primary
 // btn-[type]-color-text_[status]

diff --git a/packages/yike-design-ui/components/calendar/style/index.less b/packages/yike-design-ui/components/calendar/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 
 .yk-calendar {
   color: var(--pcolor);
@@ -32,7 +32,7 @@
     box-sizing: border-box;
     &.is-selected {
       border-bottom-width: 3px;
-      border-bottom-color: @scolor-7;
+      border-bottom-color: @scolor;
     }
   }
   td.prev,

diff --git a/packages/yike-design-ui/components/checkbox/style/checkbox.less b/packages/yike-design-ui/components/checkbox/style/checkbox.less
@@ -1,4 +1,5 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
+
 .yk-checkbox {
   position: relative;
   display: inline-flex;

diff --git a/packages/yike-design-ui/components/checkbox/style/index.less b/packages/yike-design-ui/components/checkbox/style/index.less
@@ -1,3 +1,2 @@
-@import '../../styles/color/colors.less';
 @import './checkbox.less';
 @import './checkbox-group.less';
diff --git a/packages/yike-design-ui/components/collapse/style/index.less b/packages/yike-design-ui/components/collapse/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 @import '../../styles/mixin.less';
 
 .yk-collapse-group {

diff --git a/packages/yike-design-ui/components/divider/style/index.less b/packages/yike-design-ui/components/divider/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/index.less';
+@import '../../styles/basis.less';
 .yk-divider {
   --border-color: @line-color-m;
   --border-style: solid;

diff --git a/packages/yike-design-ui/components/drawer/style/index.less b/packages/yike-design-ui/components/drawer/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 @import '../../styles/icon.less';
 
 .yk-drawer {

diff --git a/packages/yike-design-ui/components/dropdown/style/index.less b/packages/yike-design-ui/components/dropdown/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 @import '../../styles//mixin.less';
 @import '../../tooltip/style/index.less';
 .yk-dropdown {

diff --git a/packages/yike-design-ui/components/empty/style/index.less b/packages/yike-design-ui/components/empty/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 .yk-empty {
   display: flex;
   justify-content: center;

diff --git a/packages/yike-design-ui/components/form/style/index.less b/packages/yike-design-ui/components/form/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 
 .yk-form {
   display: flex;

diff --git a/packages/yike-design-ui/components/icon/index.ts b/packages/yike-design-ui/components/icon/index.ts
diff --git a/packages/yike-design-ui/components/icon/src/icon.vue b/packages/yike-design-ui/components/icon/src/icon.vue
diff --git a/packages/yike-design-ui/components/icon/style/index.less b/packages/yike-design-ui/components/icon/style/index.less
diff --git a/packages/yike-design-ui/components/icon/style/index.ts b/packages/yike-design-ui/components/icon/style/index.ts
diff --git a/packages/yike-design-ui/components/image/style/index.less b/packages/yike-design-ui/components/image/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 @import '../../styles/mixin.less';
 
 .yk-image {

diff --git a/packages/yike-design-ui/components/input-search/style/index.less b/packages/yike-design-ui/components/input-search/style/index.less
@@ -1,2 +1,2 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 @import '../../input/style/index.less';
diff --git a/packages/yike-design-ui/components/input-tag/style/index.less b/packages/yike-design-ui/components/input-tag/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 @import '../../input/style/index.less';
 @import '../../tag/style/index.less';
 

diff --git a/packages/yike-design-ui/components/input/style/index.less b/packages/yike-design-ui/components/input/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 @import './functions.less';
 @import '../../spinner/style/index.less';
 .yk-input {

diff --git a/packages/yike-design-ui/components/link/style/index.less b/packages/yike-design-ui/components/link/style/index.less
@@ -1,3 +1,5 @@
+@import '../../styles/basis.less';
+
 .yk-link {
   border-radius: @radius-s;
   text-decoration: underline;

diff --git a/packages/yike-design-ui/components/message/style/index.less b/packages/yike-design-ui/components/message/style/index.less
@@ -1,4 +1,5 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
+
 .yk-message-container {
   position: fixed;
   top: @space-xl;

diff --git a/packages/yike-design-ui/components/modal/style/index.less b/packages/yike-design-ui/components/modal/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 @import '../../styles/icon.less';
 
 .yk-modal__mask {

diff --git a/packages/yike-design-ui/components/notification/style/index.less b/packages/yike-design-ui/components/notification/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 @import '../../styles/icon.less';
 .yk-notification-container {
   position: fixed;

diff --git a/packages/yike-design-ui/components/pagination/style/index.less b/packages/yike-design-ui/components/pagination/style/index.less
@@ -1,5 +1,5 @@
+@import '../../styles/basis.less';
 @import './variables.less';
-@import '../../styles/color/colors.less';
 
 .pagination-disabled() {
   cursor: not-allowed;

diff --git a/packages/yike-design-ui/components/popover/style/index.less b/packages/yike-design-ui/components/popover/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 @import '../../tooltip/style/index.less';
 
 .yk-popover {

diff --git a/packages/yike-design-ui/components/progress/style/index.less b/packages/yike-design-ui/components/progress/style/index.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 .yk-progress {
   &-line-wrapper {
     display: flex;

diff --git a/packages/yike-design-ui/components/radio/style/button-shape.less b/packages/yike-design-ui/components/radio/style/button-shape.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 .yk-radio--button {
   cursor: pointer;
   input {

diff --git a/packages/yike-design-ui/components/radio/style/radio-group.less b/packages/yike-design-ui/components/radio/style/radio-group.less
@@ -1,4 +1,4 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 .yk-radio-group {
   display: flex;
   flex-direction: row;

diff --git a/packages/yike-design-ui/components/radio/style/radio-shape.less b/packages/yike-design-ui/components/radio/style/radio-shape.less
@@ -1,4 +1,5 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
+
 .yk-radio--radio {
   position: relative;
   display: flex;

diff --git a/packages/yike-design-ui/components/rate/style/index.less b/packages/yike-design-ui/components/rate/style/index.less
@@ -1,4 +1,5 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
+
 @sizes: {
   s: 14px;
   m: 18px;

diff --git a/packages/yike-design-ui/components/scrollbar/style/index.less b/packages/yike-design-ui/components/scrollbar/style/index.less
@@ -1,4 +1,5 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
+
 .yk-scrollbar {
   position: relative;
   overflow: hidden;

diff --git a/packages/yike-design-ui/components/skeleton/style/index.less b/packages/yike-design-ui/components/skeleton/style/index.less
@@ -1,3 +1,5 @@
+@import '../../styles/basis.less';
+
 .yk-skeleton {
   position: relative;
   display: inline-block;

diff --git a/packages/yike-design-ui/components/slider/style/variables.less b/packages/yike-design-ui/components/slider/style/variables.less
@@ -1,4 +1,5 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
+@import '../../styles/colors.less';
 
 @btn-primary-color-text: #fff;
 @btn-primary-color-text_primary: #fff;

diff --git a/packages/yike-design-ui/components/space/style/index.less b/packages/yike-design-ui/components/space/style/index.less
@@ -1,9 +1,10 @@
-@import '../../styles/color/colors.less';
+@import '../../styles/basis.less';
 
 .yk-space {
   display: flex;
-  gap: @space-l;
+  width: 100%;
   transition: all @animatb ease-in-out;
+  gap: @space-l;
 
   &.inline {
     display: inline-flex;