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

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

@@ -6,7 +6,13 @@
   font-size: 14px;
   line-height: 1;
   @include utils-clearfix;
-
+    & i.el-icon-location{
+      font-size:20px;
+      color:#1A56a8;
+      float:left;
+      margin-top:-3px;
+      margin-right:12px;
+   }
   @include e(separator) {
     margin: 0 9px;
     font-weight: bold;
@@ -25,14 +31,15 @@
       color: $--color-text-regular;
 
       &.is-link, & a {
-        font-weight: bold;
+        font-weight: normal;
         text-decoration: none;
         transition: $--color-transition-base;
         color: $--color-text-primary;
 
         &:hover {
-          color: $--color-primary;
+          color: $--color-primary-hover;
           cursor: pointer;
+          text-decoration: underline;
         }
       }
     }

node_module/element-theme-chalk/src/message-box.scss

@@ -78,6 +78,7 @@
     padding: 0px $--msgbox-padding-primary;
     color: $--messagebox-content-color;
     font-size: $--messagebox-content-font-size;
+    position: relative;
   }
   
   @include e(container) {

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

@@ -2,6 +2,11 @@
 @import "common/var";
 
 @include b(tabs) {
+   border: 1px solid #D7D8D9;
+   border-radius: 3px;
+   > .el-tabs__content {
+    padding: 0 8px 8px 8px;
+   }
   @include e(header) {
     padding: 0;
     position: relative;
@@ -10,12 +15,13 @@
   @include e(active-bar) {
     position: absolute;
     bottom: 0;
-    left: 0;
+    left: -16px;
     height: 2px;
     background-color: $--color-primary;
     z-index: 1;
     transition: transform .3s cubic-bezier(.645,.045,.355,1);
     list-style: none;
+    padding:0 16px;
   }
   @include e(new-tab) {
     float: right;
@@ -50,7 +56,7 @@
       left: 0;
       bottom: 0;
       width: 100%;
-      height: 2px;
+      height: 1px;
       background-color: $--border-color-light;
       z-index: $--index-normal;
     }
@@ -93,17 +99,16 @@
     }
   }
   @include e(item) {
-    padding: 0 20px;
-    height: 40px;
+    padding: 0 24px;
+    height: 48px;
     box-sizing: border-box;
-    line-height: 40px;
+    line-height: 48px;
     display: inline-block;
     list-style: none;
-    font-size: 14px;
+    font-size: 16px;
     font-weight: 500;
-    color: $--color-text-primary;
+    color: $--color-text-regular;
     position: relative;
-
     &:focus, &:focus:active {
       outline: none;
     }
@@ -255,14 +260,14 @@
     }
   }
   @include m((top, bottom)) {
-    .el-tabs__item.is-top:nth-child(2),
-    .el-tabs__item.is-bottom:nth-child(2) {
-      padding-left: 0;
-    }
-    .el-tabs__item.is-top:last-child,
-    .el-tabs__item.is-bottom:last-child {
-      padding-right: 0;
-    }
+    // .el-tabs__item.is-top:nth-child(2),
+    // .el-tabs__item.is-bottom:nth-child(2) {
+    //   padding-left: 0;
+    // }
+    // .el-tabs__item.is-top:last-child,
+    // .el-tabs__item.is-bottom:last-child {
+    //   padding-right: 0;
+    // }
 
     &.el-tabs--border-card, &.el-tabs--card,
     .el-tabs--left, .el-tabs--right {

theme/breadcrumb.css

@@ -271,6 +271,12 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     content: ""; }
   .el-breadcrumb::after {
     clear: both; }
+  .el-breadcrumb i.el-icon-location {
+    font-size: 20px;
+    color: #1A56a8;
+    float: left;
+    margin-top: -3px;
+    margin-right: 12px; }
   .el-breadcrumb__separator {
     margin: 0 9px;
     font-weight: bold;
@@ -283,14 +289,15 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     .el-breadcrumb__inner {
       color: #666666; }
       .el-breadcrumb__inner.is-link, .el-breadcrumb__inner a {
-        font-weight: bold;
+        font-weight: normal;
         text-decoration: none;
         -webkit-transition: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
         transition: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
         color: #333333; }
         .el-breadcrumb__inner.is-link:hover, .el-breadcrumb__inner a:hover {
-          color: #0994DC;
-          cursor: pointer; }
+          color: #0885C6;
+          cursor: pointer;
+          text-decoration: underline; }
     .el-breadcrumb__item:last-child .el-breadcrumb__inner, .el-breadcrumb__item:last-child .el-breadcrumb__inner:hover,
     .el-breadcrumb__item:last-child .el-breadcrumb__inner a,
     .el-breadcrumb__item:last-child .el-breadcrumb__inner a:hover {

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: 12px;
+    padding-left: 8px;
     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: 6px;
+  padding-top: 4px;
   background-color: #FFFFFF;
   overflow: auto; }
 
@@ -2251,12 +2251,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
     margin: 0;
-    padding: 16px; }
+    padding: 16px 16px 4px 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; }
+      margin-right: 50px;
+      color: #333; }
   .el-date-range-picker__editors-wrap {
     -webkit-box-sizing: border-box;
     box-sizing: border-box;

theme/dialog.css

@@ -591,12 +591,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     overflow: auto;
     margin: 0; }
   .el-dialog__header {
-    padding: 24px;
-    padding-bottom: 10px; }
+    padding: 16px;
+    padding-bottom: 8px;
+    padding-top: 8px; }
   .el-dialog__headerbtn {
     position: absolute;
-    top: 24px;
-    right: 24px;
+    top: 16px;
+    right: 12px;
     padding: 0;
     background: transparent;
     border: none;
@@ -604,24 +605,36 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     cursor: pointer;
     font-size: 16px; }
     .el-dialog__headerbtn .el-dialog__close {
-      color: #00BBF2; }
+      color: #999999; }
     .el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close {
       color: #0994DC; }
   .el-dialog__title {
-    line-height: 24px;
+    line-height: 36px;
+    height: 36px;
     font-size: 18px;
     color: #333333; }
   .el-dialog__body {
-    padding: 34px 24px;
+    padding: 8px 24px;
     color: #666666;
     font-size: 14px;
     word-break: break-all; }
   .el-dialog__footer {
     padding: 24px;
-    padding-top: 10px;
+    padding-top: 24px;
+    padding-right: 16px;
     text-align: right;
     -webkit-box-sizing: border-box;
     box-sizing: border-box; }
+    .el-dialog__footer button:nth-child(1) {
+      color: #999999;
+      background-color: #FFFFFF;
+      border-color: #CCCCCC; }
+      .el-dialog__footer button:nth-child(1):focus, .el-dialog__footer button:nth-child(1):hover {
+        color: #0885C6;
+        background-color: #EDF6FC;
+        border-color: #0885C6; }
+    .el-dialog__footer button:nth-child(2) {
+      margin-left: 8px; }
   .el-dialog--center {
     text-align: center; }
     .el-dialog--center .el-dialog__body {

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: #3aa9e3; }
+      color: #0885C6; }
     .el-link.el-link--primary:after {
-      border-color: #0994DC; }
+      border-color: #0885C6; }
     .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: #ff645c; }
+      color: #0885C6; }
     .el-link.el-link--danger:after {
-      border-color: #FF3D33; }
+      border-color: #0885C6; }
     .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: #71d396; }
+      color: #0885C6; }
     .el-link.el-link--success:after {
-      border-color: #4EC87C; }
+      border-color: #0885C6; }
     .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: #ffb75c; }
+      color: #0885C6; }
     .el-link.el-link--warning:after {
-      border-color: #FFA533; }
+      border-color: #0885C6; }
     .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: #33c9f5; }
+      color: #0885C6; }
     .el-link.el-link--info:after {
-      border-color: #00BBF2; }
+      border-color: #0885C6; }
     .el-link.el-link--info.is-disabled {
       color: #80ddf9; }
     .el-link.el-link--info.is-underline:hover:after {

theme/message-box.css

@@ -1933,14 +1933,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
 .el-message-box {
   display: inline-block;
   width: 420px;
-  padding-bottom: 10px;
+  padding-bottom: 24px;
   vertical-align: middle;
   background-color: #FFFFFF;
   border-radius: 6px;
   border: 1px solid #EBEBEB;
   font-size: 18px;
-  -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);
   text-align: left;
   overflow: hidden;
   -webkit-backface-visibility: hidden;
@@ -1960,18 +1960,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
       vertical-align: middle; }
   .el-message-box__header {
     position: relative;
-    padding: 24px;
-    padding-bottom: 10px; }
+    padding: 16px;
+    padding-bottom: 8px;
+    padding-top: 8px; }
   .el-message-box__title {
     padding-left: 0;
     margin-bottom: 0;
     font-size: 18px;
-    line-height: 1;
+    line-height: 36px;
+    height: 36px;
     color: #333333; }
   .el-message-box__headerbtn {
     position: absolute;
-    top: 24px;
-    right: 24px;
+    top: 16px;
+    right: 12px;
     padding: 0;
     border: none;
     outline: none;
@@ -1979,17 +1981,17 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     font-size: 16px;
     cursor: pointer; }
     .el-message-box__headerbtn .el-message-box__close {
-      color: #00BBF2; }
+      color: #999999; }
     .el-message-box__headerbtn:focus .el-message-box__close, .el-message-box__headerbtn:hover .el-message-box__close {
       color: #0994DC; }
   .el-message-box__content {
-    padding: 10px 24px;
+    padding: 0px 24px;
     color: #333333;
     font-size: 14px; }
   .el-message-box__container {
     position: relative; }
   .el-message-box__input {
-    padding-top: 15px; }
+    padding-top: 8px; }
     .el-message-box__input input.invalid {
       border-color: #FF3D33; }
       .el-message-box__input input.invalid:focus {
@@ -2003,8 +2005,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     .el-message-box__status::before {
       padding-left: 1px; }
     .el-message-box__status + .el-message-box__message {
-      padding-left: 36px;
-      padding-right: 12px; }
+      padding-left: 32px;
+      padding-right: 8px; }
     .el-message-box__status.el-icon-success {
       color: #4EC87C; }
     .el-message-box__status.el-icon-info {
@@ -2024,10 +2026,18 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
     min-height: 18px;
     margin-top: 2px; }
   .el-message-box__btns {
-    padding: 5px 15px 0;
+    padding: 24px 16px 0;
     text-align: right; }
-    .el-message-box__btns button:nth-child(2) {
-      margin-left: 10px; }
+    .el-message-box__btns button:nth-child(1) {
+      color: #999999;
+      background-color: #FFFFFF;
+      border-color: #CCCCCC;
+      float: right;
+      margin-left: 8px; }
+      .el-message-box__btns button:nth-child(1):focus, .el-message-box__btns button:nth-child(1):hover {
+        color: #0885C6;
+        background-color: #EDF6FC;
+        border-color: #0885C6; }
   .el-message-box__btns-reverse {
     -webkit-box-orient: horizontal;
     -webkit-box-direction: reverse;

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: #666666;
+    color: #333333;
     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: 6px;
+    height: 8px !important;
     border-radius: 100px;
     background-color: #EBEBEB;
     overflow: hidden;

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: 600; }
+      font-weight: 500; }
     .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: 12px;
+    padding-left: 8px;
     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: 6px;
+  padding-top: 4px;
   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: 12px;
+    padding-left: 8px;
     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: 6px;
+  padding-top: 4px;
   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: #666666;
+    color: #333333;
     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: 6px;
+    height: 8px !important;
     border-radius: 100px;
     background-color: #EBEBEB;
     overflow: hidden;