Merge branch 'htcloud' of http://114.115.168.181/yuguangyang/style_tool into htcloud

element-variables.scss

@@ -785,7 +785,7 @@ $--cascader-height: 200px !default;
 /// color||Color|0
 $--switch-on-color: $--color-primary !default;
 /// color||Color|0
-$--switch-off-color: $--border-color-base !default;
+$--switch-off-color: $--border-color-lighter !default;
 /// fontSize||Font|1
 $--switch-font-size: $--font-size-base !default;
 $--switch-core-border-radius: 10px !default;

node_module/element-theme-chalk/src/switch.scss

@@ -24,17 +24,17 @@
     font-weight: 500;
     cursor: pointer;
     vertical-align: middle;
-    color: $--color-text-primary;
+    color: $--color-text-secondary;
 
     @include when(active) {
-      color: $--color-primary;
+      color: $--color-text-primary;
     }
 
     @include m(left) {
-      margin-right: 10px;
+      margin-right: 8px;
     }
     @include m(right) {
-      margin-left: 10px;
+      margin-left: 8px;
     }
     & * {
       line-height: 1;

theme/date-picker.css

@@ -1979,7 +1979,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     line-height: 28px;
     font-size: 14px;
     color: #666666;
-    padding-left: 8px;
+    padding-left: 12px;
     text-align: left;
     outline: none;
     cursor: pointer; }
@@ -2027,7 +2027,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   border-right: 1px solid #e4e4e4;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
-  padding-top: 4px;
+  padding-top: 6px;
   background-color: #FFFFFF;
   overflow: auto; }
 
@@ -2251,13 +2251,12 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
     margin: 0;
-    padding: 16px 16px 4px 16px; }
+    padding: 16px; }
     .el-date-range-picker__content.is-left {
       border-right: 1px solid #e4e4e4; }
     .el-date-range-picker__content .el-date-range-picker__header div {
       margin-left: 50px;
-      margin-right: 50px;
-      color: #333; }
+      margin-right: 50px; }
   .el-date-range-picker__editors-wrap {
     -webkit-box-sizing: border-box;
     box-sizing: border-box;

theme/index.css

@@ -12822,13 +12822,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     font-weight: 500;
     cursor: pointer;
     vertical-align: middle;
-    color: #333333; }
+    color: #999999; }
     .el-switch__label.is-active {
-      color: #0994DC; }
+      color: #333333; }
     .el-switch__label--left {
-      margin-right: 10px; }
+      margin-right: 8px; }
     .el-switch__label--right {
-      margin-left: 10px; }
+      margin-left: 8px; }
     .el-switch__label * {
       line-height: 1;
       font-size: 14px;
@@ -12845,12 +12845,12 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     position: relative;
     width: 40px;
     height: 20px;
-    border: 1px solid #E4E4E4;
+    border: 1px solid #EBEBEB;
     outline: none;
     border-radius: 10px;
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
-    background: #E4E4E4;
+    background: #EBEBEB;
     cursor: pointer;
     -webkit-transition: border-color .3s, background-color .3s;
     transition: border-color .3s, background-color .3s;
@@ -18455,7 +18455,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   .el-table thead {
     color: #333333; }
     .el-table thead th {
-      font-weight: 500; }
+      font-weight: 600; }
     .el-table thead.is-group th {
       background: #F6F6F6; }
   .el-table th, .el-table td {
@@ -22180,7 +22180,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     line-height: 28px;
     font-size: 14px;
     color: #666666;
-    padding-left: 8px;
+    padding-left: 12px;
     text-align: left;
     outline: none;
     cursor: pointer; }
@@ -22228,7 +22228,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   border-right: 1px solid #e4e4e4;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
-  padding-top: 4px;
+  padding-top: 6px;
   background-color: #FFFFFF;
   overflow: auto; }
 
@@ -22452,13 +22452,12 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
     margin: 0;
-    padding: 16px 16px 4px 16px; }
+    padding: 16px; }
     .el-date-range-picker__content.is-left {
       border-right: 1px solid #e4e4e4; }
     .el-date-range-picker__content .el-date-range-picker__header div {
       margin-left: 50px;
-      margin-right: 50px;
-      color: #333; }
+      margin-right: 50px; }
   .el-date-range-picker__editors-wrap {
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
@@ -25235,7 +25234,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     line-height: 28px;
     font-size: 14px;
     color: #666666;
-    padding-left: 8px;
+    padding-left: 12px;
     text-align: left;
     outline: none;
     cursor: pointer; }
@@ -25283,7 +25282,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   border-right: 1px solid #e4e4e4;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
-  padding-top: 4px;
+  padding-top: 6px;
   background-color: #FFFFFF;
   overflow: auto; }
 
@@ -26830,7 +26829,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     line-height: 28px;
     font-size: 14px;
     color: #666666;
-    padding-left: 8px;
+    padding-left: 12px;
     text-align: left;
     outline: none;
     cursor: pointer; }
@@ -26878,7 +26877,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   border-right: 1px solid #e4e4e4;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
-  padding-top: 4px;
+  padding-top: 6px;
   background-color: #FFFFFF;
   overflow: auto; }
 
@@ -40359,7 +40358,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   line-height: 1; }
   .el-progress__text {
     font-size: 14px;
-    color: #333333;
+    color: #666666;
     display: inline-block;
     vertical-align: middle;
     margin-left: 10px;
@@ -40412,7 +40411,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   -webkit-box-sizing: border-box;
   box-sizing: border-box; }
   .el-progress-bar__outer {
-    height: 8px !important;
+    height: 6px;
     border-radius: 100px;
     background-color: #EBEBEB;
     overflow: hidden;
@@ -41295,7 +41294,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   line-height: 1; }
   .el-progress__text {
     font-size: 14px;
-    color: #333333;
+    color: #666666;
     display: inline-block;
     vertical-align: middle;
     margin-left: 10px;
@@ -41348,7 +41347,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   -webkit-box-sizing: border-box;
   box-sizing: border-box; }
   .el-progress-bar__outer {
-    height: 8px !important;
+    height: 6px;
     border-radius: 100px;
     background-color: #EBEBEB;
     overflow: hidden;
@@ -53708,9 +53707,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   .el-link.el-link--primary {
     color: #0994DC; }
     .el-link.el-link--primary:hover {
-      color: #0885C6; }
+      color: #3aa9e3; }
     .el-link.el-link--primary:after {
-      border-color: #0885C6; }
+      border-color: #0994DC; }
     .el-link.el-link--primary.is-disabled {
       color: #84caee; }
     .el-link.el-link--primary.is-underline:hover:after {
@@ -53718,9 +53717,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   .el-link.el-link--danger {
     color: #FF3D33; }
     .el-link.el-link--danger:hover {
-      color: #0885C6; }
+      color: #ff645c; }
     .el-link.el-link--danger:after {
-      border-color: #0885C6; }
+      border-color: #FF3D33; }
     .el-link.el-link--danger.is-disabled {
       color: #ff9e99; }
     .el-link.el-link--danger.is-underline:hover:after {
@@ -53728,9 +53727,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   .el-link.el-link--success {
     color: #4EC87C; }
     .el-link.el-link--success:hover {
-      color: #0885C6; }
+      color: #71d396; }
     .el-link.el-link--success:after {
-      border-color: #0885C6; }
+      border-color: #4EC87C; }
     .el-link.el-link--success.is-disabled {
       color: #a7e4be; }
     .el-link.el-link--success.is-underline:hover:after {
@@ -53738,9 +53737,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   .el-link.el-link--warning {
     color: #FFA533; }
     .el-link.el-link--warning:hover {
-      color: #0885C6; }
+      color: #ffb75c; }
     .el-link.el-link--warning:after {
-      border-color: #0885C6; }
+      border-color: #FFA533; }
     .el-link.el-link--warning.is-disabled {
       color: #ffd299; }
     .el-link.el-link--warning.is-underline:hover:after {
@@ -53748,9 +53747,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   .el-link.el-link--info {
     color: #00BBF2; }
     .el-link.el-link--info:hover {
-      color: #0885C6; }
+      color: #33c9f5; }
     .el-link.el-link--info:after {
-      border-color: #0885C6; }
+      border-color: #00BBF2; }
     .el-link.el-link--info.is-disabled {
       color: #80ddf9; }
     .el-link.el-link--info.is-underline:hover:after {

theme/link.css

@@ -307,9 +307,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   .el-link.el-link--primary {
     color: #0994DC; }
     .el-link.el-link--primary:hover {
-      color: #0885C6; }
+      color: #3aa9e3; }
     .el-link.el-link--primary:after {
-      border-color: #0885C6; }
+      border-color: #0994DC; }
     .el-link.el-link--primary.is-disabled {
       color: #84caee; }
     .el-link.el-link--primary.is-underline:hover:after {
@@ -317,9 +317,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   .el-link.el-link--danger {
     color: #FF3D33; }
     .el-link.el-link--danger:hover {
-      color: #0885C6; }
+      color: #ff645c; }
     .el-link.el-link--danger:after {
-      border-color: #0885C6; }
+      border-color: #FF3D33; }
     .el-link.el-link--danger.is-disabled {
       color: #ff9e99; }
     .el-link.el-link--danger.is-underline:hover:after {
@@ -327,9 +327,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   .el-link.el-link--success {
     color: #4EC87C; }
     .el-link.el-link--success:hover {
-      color: #0885C6; }
+      color: #71d396; }
     .el-link.el-link--success:after {
-      border-color: #0885C6; }
+      border-color: #4EC87C; }
     .el-link.el-link--success.is-disabled {
       color: #a7e4be; }
     .el-link.el-link--success.is-underline:hover:after {
@@ -337,9 +337,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   .el-link.el-link--warning {
     color: #FFA533; }
     .el-link.el-link--warning:hover {
-      color: #0885C6; }
+      color: #ffb75c; }
     .el-link.el-link--warning:after {
-      border-color: #0885C6; }
+      border-color: #FFA533; }
     .el-link.el-link--warning.is-disabled {
       color: #ffd299; }
     .el-link.el-link--warning.is-underline:hover:after {
@@ -347,9 +347,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   .el-link.el-link--info {
     color: #00BBF2; }
     .el-link.el-link--info:hover {
-      color: #0885C6; }
+      color: #33c9f5; }
     .el-link.el-link--info:after {
-      border-color: #0885C6; }
+      border-color: #00BBF2; }
     .el-link.el-link--info.is-disabled {
       color: #80ddf9; }
     .el-link.el-link--info.is-underline:hover:after {

theme/progress.css

@@ -267,7 +267,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   line-height: 1; }
   .el-progress__text {
     font-size: 14px;
-    color: #333333;
+    color: #666666;
     display: inline-block;
     vertical-align: middle;
     margin-left: 10px;
@@ -320,7 +320,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   -webkit-box-sizing: border-box;
   box-sizing: border-box; }
   .el-progress-bar__outer {
-    height: 8px !important;
+    height: 6px;
     border-radius: 100px;
     background-color: #EBEBEB;
     overflow: hidden;

theme/switch.css

@@ -286,13 +286,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     font-weight: 500;
     cursor: pointer;
     vertical-align: middle;
-    color: #333333; }
+    color: #999999; }
     .el-switch__label.is-active {
-      color: #0994DC; }
+      color: #333333; }
     .el-switch__label--left {
-      margin-right: 10px; }
+      margin-right: 8px; }
     .el-switch__label--right {
-      margin-left: 10px; }
+      margin-left: 8px; }
     .el-switch__label * {
       line-height: 1;
       font-size: 14px;
@@ -309,12 +309,12 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     position: relative;
     width: 40px;
     height: 20px;
-    border: 1px solid #E4E4E4;
+    border: 1px solid #EBEBEB;
     outline: none;
     border-radius: 10px;
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
-    background: #E4E4E4;
+    background: #EBEBEB;
     cursor: pointer;
     -webkit-transition: border-color .3s, background-color .3s;
     transition: border-color .3s, background-color .3s;

theme/table.css

@@ -1829,7 +1829,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   .el-table thead {
     color: #333333; }
     .el-table thead th {
-      font-weight: 500; }
+      font-weight: 600; }
     .el-table thead.is-group th {
       background: #F6F6F6; }
   .el-table th, .el-table td {

theme/time-picker.css

@@ -807,7 +807,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     line-height: 28px;
     font-size: 14px;
     color: #666666;
-    padding-left: 8px;
+    padding-left: 12px;
     text-align: left;
     outline: none;
     cursor: pointer; }
@@ -855,7 +855,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   border-right: 1px solid #e4e4e4;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
-  padding-top: 4px;
+  padding-top: 6px;
   background-color: #FFFFFF;
   overflow: auto; }
 

theme/time-select.css

@@ -1198,7 +1198,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     line-height: 28px;
     font-size: 14px;
     color: #666666;
-    padding-left: 8px;
+    padding-left: 12px;
     text-align: left;
     outline: none;
     cursor: pointer; }
@@ -1246,7 +1246,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   border-right: 1px solid #e4e4e4;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
-  padding-top: 4px;
+  padding-top: 6px;
   background-color: #FFFFFF;
   overflow: auto; }
 

theme/upload.css

@@ -405,7 +405,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   line-height: 1; }
   .el-progress__text {
     font-size: 14px;
-    color: #333333;
+    color: #666666;
     display: inline-block;
     vertical-align: middle;
     margin-left: 10px;
@@ -458,7 +458,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
   -webkit-box-sizing: border-box;
   box-sizing: border-box; }
   .el-progress-bar__outer {
-    height: 8px !important;
+    height: 6px;
     border-radius: 100px;
     background-color: #EBEBEB;
     overflow: hidden;