浏览代码

theme color update

marymelisa 4 年之前
父节点
当前提交
c54fae4ba7

二进制
src/assets/images/tabbg_active_white.png


二进制
src/assets/images/tabbg_white.png


二进制
src/assets/images/titleArrow_white.png


+ 4 - 1
src/assets/styles/mixin.less

@@ -1830,7 +1830,7 @@ input:-internal-autofill-selected {
             .arrowRightIcon,.arrowLeftIcon {
                 width: 12px;
                 height: 40px;
-                background-image: url(../images/titleArrow.png);
+                background-image: @m-arrowRight;
                 background-position: 0 0;
                 background-repeat: no-repeat;
             }
@@ -2352,6 +2352,9 @@ input:-internal-autofill-selected {
     .ant-select-tree {
         color: @m-grey1;
         li {
+            .ant-select-tree-node-content-wrapper-open:hover {
+                background: @m-blue3;
+            }
             .ant-select-tree-node-content-wrapper {
                 color: @m-grey1;
             }

+ 14 - 1
src/assets/styles/theme.css

@@ -121,6 +121,11 @@
     --m-red2: #271112;
     
     --m-nodata: url("../images/nodata.png");
+
+    --m-tabbg: url("../images/tabbg.png");
+    --m-tabbg-active: url("../images/tabbgActive.png");
+    --m-arrowRight: url("../images/titleArrow.png");
+    
 } 
 /* 白色主题 */
 /* :root[theme="light"] { */
@@ -144,7 +149,7 @@
     --m-grey15-hover: rgba(114, 124, 152, .8);
     --m-grey16: #727C98;
     --m-grey16-hover: rgba(114, 124, 152, .8);
-    --m-grey17: #808E97;
+    --m-grey17: #808E97; 
     --m-grey18: #FFFFFF; /* #ECF2F5 */
     --m-grey19: #F6F8FA;
     --m-grey20: #DAE5EC;
@@ -246,6 +251,10 @@
     --m-red2: #ffe2e2;
 
     --m-nodata: url("../images/nodata_white.png");
+
+    --m-tabbg: url("../images/tabbg_white.png");
+    --m-tabbg-active: url("../images/tabbg_active_white.png");
+    --m-arrowRight: url("../images/titleArrow_white.png");
 }
 
 /* 黑色主题 */
@@ -372,5 +381,9 @@
     --m-red2: #271112;
 
     --m-nodata: url("../images/nodata.png");
+
+    --m-tabbg: url("../images/tabbg.png");
+    --m-tabbg-active: url("../images/tabbgActive.png");
+    --m-arrowRight: url("../images/titleArrow.png");
 }
 

+ 4 - 0
src/assets/styles/variables.less

@@ -158,6 +158,10 @@
 
 @m-nodata: var(--m-nodata);
 
+@m-tabbg: var(--m-tabbg);
+@m-tabbg-active: var(--m-tabbg-active);
+@m-arrowRight: var(--m-arrowRight);
+
 @m-yellow0: #FF9600;
 @m-yellow1: #FC9618;
 @m-yellow2: #ffae00;

+ 2 - 2
src/common/components/thirdMenu/index.vue

@@ -80,12 +80,12 @@ export default defineComponent({
                                 color: @m-grey1;
                                 padding: 0 20px;
                                 margin: 0;
-                                background: url(../../../assets/images/tabbg.png) center center no-repeat;
+                                background: @m-tabbg center center no-repeat;
                                 background-size: cover;
                             }
                             .ant-tabs-tab-active.ant-tabs-tab {
                                 color: @m-white0;
-                                background: url(../../../assets/images/tabbgActive.png) center center no-repeat;
+                                background: @m-tabbg-active center center no-repeat;
                                 background-size: cover;
                                 z-index: 2;
                             }