Commit 94a77da6 authored by cyh's avatar cyh

进度条样式调整

parent 5d9b2c7c
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
@include e(text) { @include e(text) {
font-size:14px; font-size:14px;
color: $--color-text-regular; color: $--color-text-primary;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-left: 10px; margin-left: 10px;
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
box-sizing: border-box; box-sizing: border-box;
@include e(outer) { @include e(outer) {
height: 6px; height: 8px !important;
border-radius: 100px; border-radius: 100px;
background-color: $--border-color-lighter; background-color: $--border-color-lighter;
overflow: hidden; overflow: hidden;
......
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
thead { thead {
color: $--table-header-font-color; color: $--table-header-font-color;
th{ th{
font-weight: 600; font-weight: 500;
} }
&.is-group { &.is-group {
th { th {
......
...@@ -318,20 +318,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -318,20 +318,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-date-table td.today.end-date span { .el-date-table td.today.end-date span {
color: #FFFFFF; } color: #FFFFFF; }
.el-date-table td.available:hover { .el-date-table td.available:hover {
color: #0994DC; } color: #0885C6; }
.el-date-table td.in-range div { .el-date-table td.in-range div {
background-color: #F2F6FC; } background-color: #F2F6FC; }
.el-date-table td.in-range div:hover { .el-date-table td.in-range div:hover {
background-color: #F2F6FC; } background-color: #F2F6FC; }
.el-date-table td.current:not(.disabled) span { .el-date-table td.current:not(.disabled) span {
color: #FFFFFF; color: #FFFFFF;
background-color: #0994DC; } background-color: #0885C6; }
.el-date-table td.start-date div, .el-date-table td.start-date div,
.el-date-table td.end-date div { .el-date-table td.end-date div {
color: #FFFFFF; } color: #FFFFFF; }
.el-date-table td.start-date span, .el-date-table td.start-date span,
.el-date-table td.end-date span { .el-date-table td.end-date span {
background-color: #0994DC; } background-color: #0885C6; }
.el-date-table td.start-date div { .el-date-table td.start-date div {
margin-left: 5px; margin-left: 5px;
border-top-left-radius: 15px; border-top-left-radius: 15px;
...@@ -353,7 +353,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -353,7 +353,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-date-table td.selected div:hover { .el-date-table td.selected div:hover {
background-color: #F2F6FC; } background-color: #F2F6FC; }
.el-date-table td.selected span { .el-date-table td.selected span {
background-color: #0994DC; background-color: #0885C6;
color: #FFFFFF; color: #FFFFFF;
border-radius: 15px; } border-radius: 15px; }
.el-date-table td.week { .el-date-table td.week {
...@@ -526,7 +526,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -526,7 +526,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
margin: 0 auto; margin: 0 auto;
border-radius: 18px; } border-radius: 18px; }
.el-month-table td .cell:hover { .el-month-table td .cell:hover {
color: #0994DC; } color: #0885C6; }
.el-month-table td.in-range div { .el-month-table td.in-range div {
background-color: #F2F6FC; } background-color: #F2F6FC; }
.el-month-table td.in-range div:hover { .el-month-table td.in-range div:hover {
...@@ -537,7 +537,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -537,7 +537,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-month-table td.start-date .cell, .el-month-table td.start-date .cell,
.el-month-table td.end-date .cell { .el-month-table td.end-date .cell {
color: #FFFFFF; color: #FFFFFF;
background-color: #0994DC; } background-color: #0885C6; }
.el-month-table td.start-date div { .el-month-table td.start-date div {
border-top-left-radius: 24px; border-top-left-radius: 24px;
border-bottom-left-radius: 24px; } border-bottom-left-radius: 24px; }
...@@ -545,7 +545,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -545,7 +545,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-top-right-radius: 24px; border-top-right-radius: 24px;
border-bottom-right-radius: 24px; } border-bottom-right-radius: 24px; }
.el-month-table td.current:not(.disabled) .cell { .el-month-table td.current:not(.disabled) .cell {
color: #0994DC; } color: #0885C6; }
/* Element Chalk Variables */ /* Element Chalk Variables */
/* Transition /* Transition
...@@ -701,9 +701,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -701,9 +701,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
color: #666666; color: #666666;
margin: 0 auto; } margin: 0 auto; }
.el-year-table td .cell:hover { .el-year-table td .cell:hover {
color: #0994DC; } color: #0885C6; }
.el-year-table td.current:not(.disabled) .cell { .el-year-table td.current:not(.disabled) .cell {
color: #0994DC; } color: #0885C6; }
/* Element Chalk Variables */ /* Element Chalk Variables */
/* Transition /* Transition
...@@ -1979,15 +1979,15 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1979,15 +1979,15 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 28px; line-height: 28px;
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;
padding-left: 12px; padding-left: 8px;
text-align: left; text-align: left;
outline: none; outline: none;
cursor: pointer; } cursor: pointer; }
.el-picker-panel__shortcut:hover { .el-picker-panel__shortcut:hover {
color: #0994DC; } color: #0885C6; }
.el-picker-panel__shortcut.active { .el-picker-panel__shortcut.active {
background-color: #e6f1fe; background-color: #e6f1fe;
color: #0994DC; } color: #0885C6; }
.el-picker-panel__btn { .el-picker-panel__btn {
border: 1px solid #dcdcdc; border: 1px solid #dcdcdc;
color: #333; color: #333;
...@@ -2010,7 +2010,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2010,7 +2010,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
outline: none; outline: none;
margin-top: 8px; } margin-top: 8px; }
.el-picker-panel__icon-btn:hover { .el-picker-panel__icon-btn:hover {
color: #0994DC; } color: #0885C6; }
.el-picker-panel__icon-btn.is-disabled { .el-picker-panel__icon-btn.is-disabled {
color: #CCCCCC; } color: #CCCCCC; }
.el-picker-panel__icon-btn.is-disabled:hover { .el-picker-panel__icon-btn.is-disabled:hover {
...@@ -2027,7 +2027,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2027,7 +2027,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-right: 1px solid #e4e4e4; border-right: 1px solid #e4e4e4;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
padding-top: 6px; padding-top: 4px;
background-color: #FFFFFF; background-color: #FFFFFF;
overflow: auto; } overflow: auto; }
...@@ -2079,9 +2079,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2079,9 +2079,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
cursor: pointer; cursor: pointer;
color: #666666; } color: #666666; }
.el-date-picker__header-label:hover { .el-date-picker__header-label:hover {
color: #0994DC; } color: #0885C6; }
.el-date-picker__header-label.active { .el-date-picker__header-label.active {
color: #0994DC; } color: #0885C6; }
.el-date-picker__prev-btn { .el-date-picker__prev-btn {
float: left; } float: left; }
.el-date-picker__next-btn { .el-date-picker__next-btn {
...@@ -2251,12 +2251,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2251,12 +2251,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
margin: 0; margin: 0;
padding: 16px; } padding: 16px 16px 4px 16px; }
.el-date-range-picker__content.is-left { .el-date-range-picker__content.is-left {
border-right: 1px solid #e4e4e4; } border-right: 1px solid #e4e4e4; }
.el-date-range-picker__content .el-date-range-picker__header div { .el-date-range-picker__content .el-date-range-picker__header div {
margin-left: 50px; margin-left: 50px;
margin-right: 50px; } margin-right: 50px;
color: #333; }
.el-date-range-picker__editors-wrap { .el-date-range-picker__editors-wrap {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -2632,7 +2633,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2632,7 +2633,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
color: #333333; } color: #333333; }
.el-time-panel__btn.confirm { .el-time-panel__btn.confirm {
font-weight: 800; font-weight: 800;
color: #0994DC; } color: #0885C6; }
/* BEM support Func /* BEM support Func
-------------------------- */ -------------------------- */
......
This diff is collapsed.
...@@ -307,9 +307,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -307,9 +307,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--primary { .el-link.el-link--primary {
color: #0994DC; } color: #0994DC; }
.el-link.el-link--primary:hover { .el-link.el-link--primary:hover {
color: #3aa9e3; } color: #0885C6; }
.el-link.el-link--primary:after { .el-link.el-link--primary:after {
border-color: #0994DC; } border-color: #0885C6; }
.el-link.el-link--primary.is-disabled { .el-link.el-link--primary.is-disabled {
color: #84caee; } color: #84caee; }
.el-link.el-link--primary.is-underline:hover:after { .el-link.el-link--primary.is-underline:hover:after {
...@@ -317,9 +317,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -317,9 +317,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--danger { .el-link.el-link--danger {
color: #FF3D33; } color: #FF3D33; }
.el-link.el-link--danger:hover { .el-link.el-link--danger:hover {
color: #ff645c; } color: #0885C6; }
.el-link.el-link--danger:after { .el-link.el-link--danger:after {
border-color: #FF3D33; } border-color: #0885C6; }
.el-link.el-link--danger.is-disabled { .el-link.el-link--danger.is-disabled {
color: #ff9e99; } color: #ff9e99; }
.el-link.el-link--danger.is-underline:hover:after { .el-link.el-link--danger.is-underline:hover:after {
...@@ -327,9 +327,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -327,9 +327,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--success { .el-link.el-link--success {
color: #4EC87C; } color: #4EC87C; }
.el-link.el-link--success:hover { .el-link.el-link--success:hover {
color: #71d396; } color: #0885C6; }
.el-link.el-link--success:after { .el-link.el-link--success:after {
border-color: #4EC87C; } border-color: #0885C6; }
.el-link.el-link--success.is-disabled { .el-link.el-link--success.is-disabled {
color: #a7e4be; } color: #a7e4be; }
.el-link.el-link--success.is-underline:hover:after { .el-link.el-link--success.is-underline:hover:after {
...@@ -337,9 +337,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -337,9 +337,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--warning { .el-link.el-link--warning {
color: #FFA533; } color: #FFA533; }
.el-link.el-link--warning:hover { .el-link.el-link--warning:hover {
color: #ffb75c; } color: #0885C6; }
.el-link.el-link--warning:after { .el-link.el-link--warning:after {
border-color: #FFA533; } border-color: #0885C6; }
.el-link.el-link--warning.is-disabled { .el-link.el-link--warning.is-disabled {
color: #ffd299; } color: #ffd299; }
.el-link.el-link--warning.is-underline:hover:after { .el-link.el-link--warning.is-underline:hover:after {
...@@ -347,9 +347,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -347,9 +347,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--info { .el-link.el-link--info {
color: #00BBF2; } color: #00BBF2; }
.el-link.el-link--info:hover { .el-link.el-link--info:hover {
color: #33c9f5; } color: #0885C6; }
.el-link.el-link--info:after { .el-link.el-link--info:after {
border-color: #00BBF2; } border-color: #0885C6; }
.el-link.el-link--info.is-disabled { .el-link.el-link--info.is-disabled {
color: #80ddf9; } color: #80ddf9; }
.el-link.el-link--info.is-underline:hover:after { .el-link.el-link--info.is-underline:hover:after {
......
...@@ -267,7 +267,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -267,7 +267,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 1; } line-height: 1; }
.el-progress__text { .el-progress__text {
font-size: 14px; font-size: 14px;
color: #666666; color: #333333;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-left: 10px; margin-left: 10px;
...@@ -320,7 +320,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -320,7 +320,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
.el-progress-bar__outer { .el-progress-bar__outer {
height: 6px; height: 8px !important;
border-radius: 100px; border-radius: 100px;
background-color: #EBEBEB; background-color: #EBEBEB;
overflow: hidden; overflow: hidden;
......
...@@ -1829,7 +1829,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1829,7 +1829,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-table thead { .el-table thead {
color: #333333; } color: #333333; }
.el-table thead th { .el-table thead th {
font-weight: 600; } font-weight: 500; }
.el-table thead.is-group th { .el-table thead.is-group th {
background: #F6F6F6; } background: #F6F6F6; }
.el-table th, .el-table td { .el-table th, .el-table td {
......
...@@ -807,15 +807,15 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -807,15 +807,15 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 28px; line-height: 28px;
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;
padding-left: 12px; padding-left: 8px;
text-align: left; text-align: left;
outline: none; outline: none;
cursor: pointer; } cursor: pointer; }
.el-picker-panel__shortcut:hover { .el-picker-panel__shortcut:hover {
color: #0994DC; } color: #0885C6; }
.el-picker-panel__shortcut.active { .el-picker-panel__shortcut.active {
background-color: #e6f1fe; background-color: #e6f1fe;
color: #0994DC; } color: #0885C6; }
.el-picker-panel__btn { .el-picker-panel__btn {
border: 1px solid #dcdcdc; border: 1px solid #dcdcdc;
color: #333; color: #333;
...@@ -838,7 +838,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -838,7 +838,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
outline: none; outline: none;
margin-top: 8px; } margin-top: 8px; }
.el-picker-panel__icon-btn:hover { .el-picker-panel__icon-btn:hover {
color: #0994DC; } color: #0885C6; }
.el-picker-panel__icon-btn.is-disabled { .el-picker-panel__icon-btn.is-disabled {
color: #CCCCCC; } color: #CCCCCC; }
.el-picker-panel__icon-btn.is-disabled:hover { .el-picker-panel__icon-btn.is-disabled:hover {
...@@ -855,7 +855,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -855,7 +855,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-right: 1px solid #e4e4e4; border-right: 1px solid #e4e4e4;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
padding-top: 6px; padding-top: 4px;
background-color: #FFFFFF; background-color: #FFFFFF;
overflow: auto; } overflow: auto; }
...@@ -1259,7 +1259,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1259,7 +1259,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
color: #333333; } color: #333333; }
.el-time-panel__btn.confirm { .el-time-panel__btn.confirm {
font-weight: 800; font-weight: 800;
color: #0994DC; } color: #0885C6; }
/* Element Chalk Variables */ /* Element Chalk Variables */
/* Transition /* Transition
......
...@@ -1198,15 +1198,15 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1198,15 +1198,15 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 28px; line-height: 28px;
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;
padding-left: 12px; padding-left: 8px;
text-align: left; text-align: left;
outline: none; outline: none;
cursor: pointer; } cursor: pointer; }
.el-picker-panel__shortcut:hover { .el-picker-panel__shortcut:hover {
color: #0994DC; } color: #0885C6; }
.el-picker-panel__shortcut.active { .el-picker-panel__shortcut.active {
background-color: #e6f1fe; background-color: #e6f1fe;
color: #0994DC; } color: #0885C6; }
.el-picker-panel__btn { .el-picker-panel__btn {
border: 1px solid #dcdcdc; border: 1px solid #dcdcdc;
color: #333; color: #333;
...@@ -1229,7 +1229,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1229,7 +1229,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
outline: none; outline: none;
margin-top: 8px; } margin-top: 8px; }
.el-picker-panel__icon-btn:hover { .el-picker-panel__icon-btn:hover {
color: #0994DC; } color: #0885C6; }
.el-picker-panel__icon-btn.is-disabled { .el-picker-panel__icon-btn.is-disabled {
color: #CCCCCC; } color: #CCCCCC; }
.el-picker-panel__icon-btn.is-disabled:hover { .el-picker-panel__icon-btn.is-disabled:hover {
...@@ -1246,7 +1246,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1246,7 +1246,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-right: 1px solid #e4e4e4; border-right: 1px solid #e4e4e4;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
padding-top: 6px; padding-top: 4px;
background-color: #FFFFFF; background-color: #FFFFFF;
overflow: auto; } overflow: auto; }
...@@ -1298,9 +1298,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1298,9 +1298,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
cursor: pointer; cursor: pointer;
color: #666666; } color: #666666; }
.el-date-picker__header-label:hover { .el-date-picker__header-label:hover {
color: #0994DC; } color: #0885C6; }
.el-date-picker__header-label.active { .el-date-picker__header-label.active {
color: #0994DC; } color: #0885C6; }
.el-date-picker__prev-btn { .el-date-picker__prev-btn {
float: left; } float: left; }
.el-date-picker__next-btn { .el-date-picker__next-btn {
......
...@@ -405,7 +405,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -405,7 +405,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
line-height: 1; } line-height: 1; }
.el-progress__text { .el-progress__text {
font-size: 14px; font-size: 14px;
color: #666666; color: #333333;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-left: 10px; margin-left: 10px;
...@@ -458,7 +458,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -458,7 +458,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
.el-progress-bar__outer { .el-progress-bar__outer {
height: 6px; height: 8px !important;
border-radius: 100px; border-radius: 100px;
background-color: #EBEBEB; background-color: #EBEBEB;
overflow: hidden; overflow: hidden;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment