Commit 61d933ea authored by 刘安琪's avatar 刘安琪

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

parents 12a5b5ce c87df77b
...@@ -7,6 +7,7 @@ yarn-error.log* ...@@ -7,6 +7,7 @@ yarn-error.log*
/test/unit/coverage/ /test/unit/coverage/
/test/e2e/reports/ /test/e2e/reports/
selenium-debug.log selenium-debug.log
/theme
# Editor directories and files # Editor directories and files
.idea .idea
......
...@@ -52,7 +52,7 @@ $--color-success-background-plain-hover: #E1F2EA !default; ...@@ -52,7 +52,7 @@ $--color-success-background-plain-hover: #E1F2EA !default;
$--color-success-border-plain-hover: #43C072 !default; $--color-success-border-plain-hover: #43C072 !default;
$--color-success-text-plain-hover: #43BF73 !default; $--color-success-text-plain-hover: #43BF73 !default;
/// color|1|Functional Color|1 /// color|1|Functional Color|1
$--color-warning: #FFA533 !default; $--color-warning: #FFA533 !default;
$--color-warning-hover: #F29924 !default; $--color-warning-hover: #F29924 !default;
$--color-warning-background-plain: #FFF5E6 !default; $--color-warning-background-plain: #FFF5E6 !default;
$--color-warning-border-plain: #F8DDC0 !default; $--color-warning-border-plain: #F8DDC0 !default;
...@@ -808,18 +808,21 @@ $--dialog-padding-primary: 20px !default; ...@@ -808,18 +808,21 @@ $--dialog-padding-primary: 20px !default;
/* Table /* Table
-------------------------- */ -------------------------- */
///table||header|0
$--table-border-color-self:#E0E0E0;
$--table-current-row-color:#D1ECFF;
/// color||Color|0 /// color||Color|0
$--table-border-color: $--border-color-lighter !default; $--table-border-color: $--table-border-color-self !default;
$--table-border: 1px solid $--table-border-color !default; $--table-border: 1px solid $--table-border-color !default;
/// color||Color|0 /// color||Color|0
$--table-font-color: $--color-text-regular !default; $--table-font-color: $--color-text-regular !default;
/// color||Color|0 /// color||Color|0
$--table-header-font-color: $--color-text-secondary !default; $--table-header-font-color: $--color-text-primary !default;
/// color||Color|0 /// color||Color|0
$--table-row-hover-background-color: $--background-color-base !default; $--table-row-hover-background-color: $--color-primary-background-plain-hover !default;
$--table-current-row-background-color: $--color-primary-light-9 !default; $--table-current-row-background-color: $--table-current-row-color !default;
/// color||Color|0 /// color||Color|0
$--table-header-background-color: $--color-white !default; $--table-header-background-color: $--background-color-light !default;
$--table-fixed-box-shadow: 0 0 10px rgba(0, 0, 0, .12) !default; $--table-fixed-box-shadow: 0 0 10px rgba(0, 0, 0, .12) !default;
/* Pagination /* Pagination
...@@ -902,9 +905,9 @@ $--tag-padding: 0 10px !default; ...@@ -902,9 +905,9 @@ $--tag-padding: 0 10px !default;
/* Tree /* Tree
-------------------------- */ -------------------------- */
/// color||Color|0 /// color||Color|0
$--tree-node-hover-background-color: $--background-color-base !default; $--tree-node-hover-background-color: $--color-primary-background-plain-hover !default;
/// color||Color|0 /// color||Color|0
$--tree-font-color: $--color-text-regular !default; $--tree-font-color: $--color-text-primary !default;
/// color||Color|0 /// color||Color|0
$--tree-expand-icon-color: $--color-text-placeholder !default; $--tree-expand-icon-color: $--color-text-placeholder !default;
...@@ -1100,7 +1103,7 @@ $--link-font-weight: $--font-weight-primary !default; ...@@ -1100,7 +1103,7 @@ $--link-font-weight: $--font-weight-primary !default;
/// color||Color|0 /// color||Color|0
$--link-default-font-color: $--color-text-regular !default; $--link-default-font-color: $--color-text-regular !default;
/// color||Color|0 /// color||Color|0
$--link-default-active-color: $--color-primary !default; $--link-default-active-color: $--color-primary-hover !default;
/// color||Color|0 /// color||Color|0
$--link-disabled-font-color: $--color-text-placeholder !default; $--link-disabled-font-color: $--color-text-placeholder !default;
/// color||Color|0 /// color||Color|0
......
...@@ -108,8 +108,9 @@ ...@@ -108,8 +108,9 @@
thead { thead {
color: $--table-header-font-color; color: $--table-header-font-color;
font-weight: 500; th{
font-weight: 600;
}
&.is-group { &.is-group {
th { th {
background: $--background-color-base; background: $--background-color-base;
...@@ -118,7 +119,7 @@ ...@@ -118,7 +119,7 @@
} }
th, td { th, td {
padding: 12px 0; // padding: 12px 0;
min-width: 0; min-width: 0;
box-sizing: border-box; box-sizing: border-box;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -185,6 +186,8 @@ ...@@ -185,6 +186,8 @@
} }
th { th {
height:40px;
line-height:40px;
overflow: hidden; overflow: hidden;
user-select: none; user-select: none;
background-color: $--table-header-background-color; background-color: $--table-header-background-color;
...@@ -194,8 +197,8 @@ ...@@ -194,8 +197,8 @@
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
vertical-align: middle; vertical-align: middle;
padding-left: 10px; padding-left: 8px;
padding-right: 10px; padding-right: 8px;
width: 100%; width: 100%;
&.highlight { &.highlight {
...@@ -216,6 +219,8 @@ ...@@ -216,6 +219,8 @@
} }
td { td {
height: 32px;
line-height: 32px;
div { div {
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -232,8 +237,8 @@ ...@@ -232,8 +237,8 @@
white-space: normal; white-space: normal;
word-break: break-all; word-break: break-all;
line-height: 23px; line-height: 23px;
padding-left: 10px; padding-left: 8px;
padding-right: 10px; padding-right: 8px;
&.el-tooltip { &.el-tooltip {
white-space: nowrap; white-space: nowrap;
...@@ -284,7 +289,7 @@ ...@@ -284,7 +289,7 @@
border-right: $--table-border; border-right: $--table-border;
&:first-child .cell { &:first-child .cell {
padding-left: 10px; padding-left: 8px;
} }
} }
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
@include e(content) { @include e(content) {
display: flex; display: flex;
align-items: center; align-items: center;
height: 26px; height: 28px;
cursor: pointer; cursor: pointer;
& > .el-tree-node__expand-icon { & > .el-tree-node__expand-icon {
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -254,7 +268,7 @@ ...@@ -254,7 +268,7 @@
margin: 0; margin: 0;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
border-radius: 4px; border-radius: 3px;
position: relative; position: relative;
background-color: #FFFFFF; background-color: #FFFFFF;
overflow: hidden; overflow: hidden;
...@@ -286,13 +300,13 @@ ...@@ -286,13 +300,13 @@
background-color: #4EC87C; background-color: #4EC87C;
color: #FFFFFF; } color: #FFFFFF; }
.el-alert--info.is-light { .el-alert--info.is-light {
background-color: #fff9e6; background-color: #e6f8fe;
color: #FFBF00; } color: #00BBF2; }
.el-alert--info.is-dark { .el-alert--info.is-dark {
background-color: #FFBF00; background-color: #00BBF2;
color: #FFFFFF; } color: #FFFFFF; }
.el-alert--info .el-alert__description { .el-alert--info .el-alert__description {
color: #FFBF00; } color: #00BBF2; }
.el-alert--warning.is-light { .el-alert--warning.is-light {
background-color: #fff6eb; background-color: #fff6eb;
color: #FFA533; } color: #FFA533; }
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
......
This diff is collapsed.
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -267,7 +281,7 @@ ...@@ -267,7 +281,7 @@
.el-avatar--circle { .el-avatar--circle {
border-radius: 50%; } border-radius: 50%; }
.el-avatar--square { .el-avatar--square {
border-radius: 4px; } border-radius: 3px; }
.el-avatar--icon { .el-avatar--icon {
font-size: 18px; } font-size: 18px; }
.el-avatar--large { .el-avatar--large {
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -285,6 +299,6 @@ ...@@ -285,6 +299,6 @@
.el-badge__content--warning { .el-badge__content--warning {
background-color: #FFA533; } background-color: #FFA533; }
.el-badge__content--info { .el-badge__content--info {
background-color: #FFBF00; } background-color: #00BBF2; }
.el-badge__content--danger { .el-badge__content--danger {
background-color: #FF3D33; } background-color: #FF3D33; }
...@@ -30,6 +30,13 @@ ...@@ -30,6 +30,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -266,6 +273,13 @@ ...@@ -266,6 +273,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -267,13 +281,13 @@ ...@@ -267,13 +281,13 @@
.el-breadcrumb__item { .el-breadcrumb__item {
float: left; } float: left; }
.el-breadcrumb__inner { .el-breadcrumb__inner {
color: #606266; } color: #666666; }
.el-breadcrumb__inner.is-link, .el-breadcrumb__inner a { .el-breadcrumb__inner.is-link, .el-breadcrumb__inner a {
font-weight: bold; font-weight: bold;
text-decoration: none; text-decoration: none;
-webkit-transition: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1); -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); transition: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
color: #303133; } color: #333333; }
.el-breadcrumb__inner.is-link:hover, .el-breadcrumb__inner a:hover { .el-breadcrumb__inner.is-link:hover, .el-breadcrumb__inner a:hover {
color: #0994DC; color: #0994DC;
cursor: pointer; } cursor: pointer; }
...@@ -281,7 +295,7 @@ ...@@ -281,7 +295,7 @@
.el-breadcrumb__item:last-child .el-breadcrumb__inner a, .el-breadcrumb__item:last-child .el-breadcrumb__inner a,
.el-breadcrumb__item:last-child .el-breadcrumb__inner a:hover { .el-breadcrumb__item:last-child .el-breadcrumb__inner a:hover {
font-weight: normal; font-weight: normal;
color: #606266; color: #666666;
cursor: text; } cursor: text; }
.el-breadcrumb__item:last-child .el-breadcrumb__separator { .el-breadcrumb__item:last-child .el-breadcrumb__separator {
display: none; } display: none; }
...@@ -30,6 +30,13 @@ ...@@ -30,6 +30,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -150,6 +157,13 @@ ...@@ -150,6 +157,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -272,6 +286,13 @@ ...@@ -272,6 +286,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -374,9 +395,9 @@ ...@@ -374,9 +395,9 @@
white-space: nowrap; white-space: nowrap;
cursor: pointer; cursor: pointer;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #DCDFE6; border: 1px solid #E4E4E4;
border-color: #DCDFE6; border-color: #0994DC;
color: #606266; color: #0994DC;
-webkit-appearance: none; -webkit-appearance: none;
text-align: center; text-align: center;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
...@@ -389,13 +410,13 @@ ...@@ -389,13 +410,13 @@
-moz-user-select: none; -moz-user-select: none;
-webkit-user-select: none; -webkit-user-select: none;
-ms-user-select: none; -ms-user-select: none;
padding: 10px 18px; padding: 10px 16px;
font-size: 14px; font-size: 14px;
border-radius: 4px; } border-radius: 3px; }
.el-button + .el-button { .el-button + .el-button {
margin-left: 10px; } margin-left: 10px; }
.el-button.is-round { .el-button.is-round {
padding: 10px 18px; } padding: 10px 16px; }
.el-button:hover, .el-button:focus { .el-button:hover, .el-button:focus {
color: #0994DC; color: #0994DC;
border-color: #b5dff5; border-color: #b5dff5;
...@@ -476,6 +497,10 @@ ...@@ -476,6 +497,10 @@
color: #0994DC; color: #0994DC;
background: #e6f4fc; background: #e6f4fc;
border-color: #9dd4f1; } border-color: #9dd4f1; }
.el-button--primary.is-plain:hover, .el-button--primary.is-plain:focus {
background: #0994DC;
border-color: #0994DC;
color: #FFFFFF; }
.el-button--primary.is-plain:active { .el-button--primary.is-plain:active {
background: #0885c6; background: #0885c6;
border-color: #0885c6; border-color: #0885c6;
...@@ -511,9 +536,9 @@ ...@@ -511,9 +536,9 @@
background: #edfaf2; background: #edfaf2;
border-color: #b8e9cb; } border-color: #b8e9cb; }
.el-button--success.is-plain:hover, .el-button--success.is-plain:focus { .el-button--success.is-plain:hover, .el-button--success.is-plain:focus {
background: red; background: #4EC87C;
border-color: #CFEFDF; border-color: #4EC87C;
color: #4EC87C; } color: #FFFFFF; }
.el-button--success.is-plain:active { .el-button--success.is-plain:active {
background: #46b470; background: #46b470;
border-color: #46b470; border-color: #46b470;
...@@ -548,6 +573,10 @@ ...@@ -548,6 +573,10 @@
color: #FFA533; color: #FFA533;
background: #fff6eb; background: #fff6eb;
border-color: #ffdbad; } border-color: #ffdbad; }
.el-button--warning.is-plain:hover, .el-button--warning.is-plain:focus {
background: #FFA533;
border-color: #FFA533;
color: #FFFFFF; }
.el-button--warning.is-plain:active { .el-button--warning.is-plain:active {
background: #e6952e; background: #e6952e;
border-color: #e6952e; border-color: #e6952e;
...@@ -582,6 +611,10 @@ ...@@ -582,6 +611,10 @@
color: #FF3D33; color: #FF3D33;
background: #ffeceb; background: #ffeceb;
border-color: #ffb1ad; } border-color: #ffb1ad; }
.el-button--danger.is-plain:hover, .el-button--danger.is-plain:focus {
background: #FF3D33;
border-color: #FF3D33;
color: #FFFFFF; }
.el-button--danger.is-plain:active { .el-button--danger.is-plain:active {
background: #e6372e; background: #e6372e;
border-color: #e6372e; border-color: #e6372e;
...@@ -593,60 +626,64 @@ ...@@ -593,60 +626,64 @@
border-color: #ffd8d6; } border-color: #ffd8d6; }
.el-button--info { .el-button--info {
color: #FFFFFF; color: #FFFFFF;
background-color: #FFBF00; background-color: #00BBF2;
border-color: #FFBF00; } border-color: #00BBF2; }
.el-button--info:hover, .el-button--info:focus { .el-button--info:hover, .el-button--info:focus {
background: #ffcc33; background: #33c9f5;
border-color: #ffcc33; border-color: #33c9f5;
color: #FFFFFF; } color: #FFFFFF; }
.el-button--info:active { .el-button--info:active {
background: #e6ac00; background: #00a8da;
border-color: #e6ac00; border-color: #00a8da;
color: #FFFFFF; color: #FFFFFF;
outline: none; } outline: none; }
.el-button--info.is-active { .el-button--info.is-active {
background: #e6ac00; background: #00a8da;
border-color: #e6ac00; border-color: #00a8da;
color: #FFFFFF; } color: #FFFFFF; }
.el-button--info.is-disabled, .el-button--info.is-disabled:hover, .el-button--info.is-disabled:focus, .el-button--info.is-disabled:active { .el-button--info.is-disabled, .el-button--info.is-disabled:hover, .el-button--info.is-disabled:focus, .el-button--info.is-disabled:active {
color: #FFFFFF; color: #FFFFFF;
background-color: #ffdf80; background-color: #80ddf9;
border-color: #ffdf80; } border-color: #80ddf9; }
.el-button--info.is-plain { .el-button--info.is-plain {
color: #FFBF00; color: #00BBF2;
background: #fff9e6; background: #e6f8fe;
border-color: #ffe599; } border-color: #99e4fa; }
.el-button--info.is-plain:hover, .el-button--info.is-plain:focus {
background: #00BBF2;
border-color: #00BBF2;
color: #FFFFFF; }
.el-button--info.is-plain:active { .el-button--info.is-plain:active {
background: #e6ac00; background: #00a8da;
border-color: #e6ac00; border-color: #00a8da;
color: #FFFFFF; color: #FFFFFF;
outline: none; } outline: none; }
.el-button--info.is-plain.is-disabled, .el-button--info.is-plain.is-disabled:hover, .el-button--info.is-plain.is-disabled:focus, .el-button--info.is-plain.is-disabled:active { .el-button--info.is-plain.is-disabled, .el-button--info.is-plain.is-disabled:hover, .el-button--info.is-plain.is-disabled:focus, .el-button--info.is-plain.is-disabled:active {
color: #ffd966; color: #66d6f7;
background-color: #fff9e6; background-color: #e6f8fe;
border-color: #fff2cc; } border-color: #ccf1fc; }
.el-button--medium { .el-button--medium {
padding: 8px 18px; padding: 9px 16px;
font-size: 14px; font-size: 14px;
border-radius: 4px; } border-radius: 3px; }
.el-button--medium.is-round { .el-button--medium.is-round {
padding: 8px 18px; } padding: 9px 16px; }
.el-button--medium.is-circle { .el-button--medium.is-circle {
padding: 8px; } padding: 9px; }
.el-button--small { .el-button--small {
padding: 7px 13px; padding: 7px 16px;
font-size: 12px; font-size: 14px;
border-radius: 3px; } border-radius: 3px; }
.el-button--small.is-round { .el-button--small.is-round {
padding: 7px 13px; } padding: 7px 16px; }
.el-button--small.is-circle { .el-button--small.is-circle {
padding: 7px; } padding: 7px; }
.el-button--mini { .el-button--mini {
padding: 5px 13px; padding: 5px 16px;
font-size: 12px; font-size: 14px;
border-radius: 3px; } border-radius: 3px; }
.el-button--mini.is-round { .el-button--mini.is-round {
padding: 5px 13px; } padding: 5px 16px; }
.el-button--mini.is-circle { .el-button--mini.is-circle {
padding: 5px; } padding: 5px; }
.el-button--text { .el-button--text {
...@@ -689,10 +726,10 @@ ...@@ -689,10 +726,10 @@
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0; }
.el-button-group > .el-button:first-child:last-child { .el-button-group > .el-button:first-child:last-child {
border-top-right-radius: 4px; border-top-right-radius: 3px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 3px;
border-top-left-radius: 4px; border-top-left-radius: 3px;
border-bottom-left-radius: 4px; } border-bottom-left-radius: 3px; }
.el-button-group > .el-button:first-child:last-child.is-round { .el-button-group > .el-button:first-child:last-child.is-round {
border-radius: 20px; } border-radius: 20px; }
.el-button-group > .el-button:first-child:last-child.is-circle { .el-button-group > .el-button:first-child:last-child.is-circle {
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -280,6 +294,13 @@ ...@@ -280,6 +294,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -400,6 +421,13 @@ ...@@ -400,6 +421,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -522,6 +550,13 @@ ...@@ -522,6 +550,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -624,9 +659,9 @@ ...@@ -624,9 +659,9 @@
white-space: nowrap; white-space: nowrap;
cursor: pointer; cursor: pointer;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #DCDFE6; border: 1px solid #E4E4E4;
border-color: #DCDFE6; border-color: #0994DC;
color: #606266; color: #0994DC;
-webkit-appearance: none; -webkit-appearance: none;
text-align: center; text-align: center;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
...@@ -639,13 +674,13 @@ ...@@ -639,13 +674,13 @@
-moz-user-select: none; -moz-user-select: none;
-webkit-user-select: none; -webkit-user-select: none;
-ms-user-select: none; -ms-user-select: none;
padding: 10px 18px; padding: 10px 16px;
font-size: 14px; font-size: 14px;
border-radius: 4px; } border-radius: 3px; }
.el-button + .el-button { .el-button + .el-button {
margin-left: 10px; } margin-left: 10px; }
.el-button.is-round { .el-button.is-round {
padding: 10px 18px; } padding: 10px 16px; }
.el-button:hover, .el-button:focus { .el-button:hover, .el-button:focus {
color: #0994DC; color: #0994DC;
border-color: #b5dff5; border-color: #b5dff5;
...@@ -726,6 +761,10 @@ ...@@ -726,6 +761,10 @@
color: #0994DC; color: #0994DC;
background: #e6f4fc; background: #e6f4fc;
border-color: #9dd4f1; } border-color: #9dd4f1; }
.el-button--primary.is-plain:hover, .el-button--primary.is-plain:focus {
background: #0994DC;
border-color: #0994DC;
color: #FFFFFF; }
.el-button--primary.is-plain:active { .el-button--primary.is-plain:active {
background: #0885c6; background: #0885c6;
border-color: #0885c6; border-color: #0885c6;
...@@ -761,9 +800,9 @@ ...@@ -761,9 +800,9 @@
background: #edfaf2; background: #edfaf2;
border-color: #b8e9cb; } border-color: #b8e9cb; }
.el-button--success.is-plain:hover, .el-button--success.is-plain:focus { .el-button--success.is-plain:hover, .el-button--success.is-plain:focus {
background: red; background: #4EC87C;
border-color: #CFEFDF; border-color: #4EC87C;
color: #4EC87C; } color: #FFFFFF; }
.el-button--success.is-plain:active { .el-button--success.is-plain:active {
background: #46b470; background: #46b470;
border-color: #46b470; border-color: #46b470;
...@@ -798,6 +837,10 @@ ...@@ -798,6 +837,10 @@
color: #FFA533; color: #FFA533;
background: #fff6eb; background: #fff6eb;
border-color: #ffdbad; } border-color: #ffdbad; }
.el-button--warning.is-plain:hover, .el-button--warning.is-plain:focus {
background: #FFA533;
border-color: #FFA533;
color: #FFFFFF; }
.el-button--warning.is-plain:active { .el-button--warning.is-plain:active {
background: #e6952e; background: #e6952e;
border-color: #e6952e; border-color: #e6952e;
...@@ -832,6 +875,10 @@ ...@@ -832,6 +875,10 @@
color: #FF3D33; color: #FF3D33;
background: #ffeceb; background: #ffeceb;
border-color: #ffb1ad; } border-color: #ffb1ad; }
.el-button--danger.is-plain:hover, .el-button--danger.is-plain:focus {
background: #FF3D33;
border-color: #FF3D33;
color: #FFFFFF; }
.el-button--danger.is-plain:active { .el-button--danger.is-plain:active {
background: #e6372e; background: #e6372e;
border-color: #e6372e; border-color: #e6372e;
...@@ -843,60 +890,64 @@ ...@@ -843,60 +890,64 @@
border-color: #ffd8d6; } border-color: #ffd8d6; }
.el-button--info { .el-button--info {
color: #FFFFFF; color: #FFFFFF;
background-color: #FFBF00; background-color: #00BBF2;
border-color: #FFBF00; } border-color: #00BBF2; }
.el-button--info:hover, .el-button--info:focus { .el-button--info:hover, .el-button--info:focus {
background: #ffcc33; background: #33c9f5;
border-color: #ffcc33; border-color: #33c9f5;
color: #FFFFFF; } color: #FFFFFF; }
.el-button--info:active { .el-button--info:active {
background: #e6ac00; background: #00a8da;
border-color: #e6ac00; border-color: #00a8da;
color: #FFFFFF; color: #FFFFFF;
outline: none; } outline: none; }
.el-button--info.is-active { .el-button--info.is-active {
background: #e6ac00; background: #00a8da;
border-color: #e6ac00; border-color: #00a8da;
color: #FFFFFF; } color: #FFFFFF; }
.el-button--info.is-disabled, .el-button--info.is-disabled:hover, .el-button--info.is-disabled:focus, .el-button--info.is-disabled:active { .el-button--info.is-disabled, .el-button--info.is-disabled:hover, .el-button--info.is-disabled:focus, .el-button--info.is-disabled:active {
color: #FFFFFF; color: #FFFFFF;
background-color: #ffdf80; background-color: #80ddf9;
border-color: #ffdf80; } border-color: #80ddf9; }
.el-button--info.is-plain { .el-button--info.is-plain {
color: #FFBF00; color: #00BBF2;
background: #fff9e6; background: #e6f8fe;
border-color: #ffe599; } border-color: #99e4fa; }
.el-button--info.is-plain:hover, .el-button--info.is-plain:focus {
background: #00BBF2;
border-color: #00BBF2;
color: #FFFFFF; }
.el-button--info.is-plain:active { .el-button--info.is-plain:active {
background: #e6ac00; background: #00a8da;
border-color: #e6ac00; border-color: #00a8da;
color: #FFFFFF; color: #FFFFFF;
outline: none; } outline: none; }
.el-button--info.is-plain.is-disabled, .el-button--info.is-plain.is-disabled:hover, .el-button--info.is-plain.is-disabled:focus, .el-button--info.is-plain.is-disabled:active { .el-button--info.is-plain.is-disabled, .el-button--info.is-plain.is-disabled:hover, .el-button--info.is-plain.is-disabled:focus, .el-button--info.is-plain.is-disabled:active {
color: #ffd966; color: #66d6f7;
background-color: #fff9e6; background-color: #e6f8fe;
border-color: #fff2cc; } border-color: #ccf1fc; }
.el-button--medium { .el-button--medium {
padding: 8px 18px; padding: 9px 16px;
font-size: 14px; font-size: 14px;
border-radius: 4px; } border-radius: 3px; }
.el-button--medium.is-round { .el-button--medium.is-round {
padding: 8px 18px; } padding: 9px 16px; }
.el-button--medium.is-circle { .el-button--medium.is-circle {
padding: 8px; } padding: 9px; }
.el-button--small { .el-button--small {
padding: 7px 13px; padding: 7px 16px;
font-size: 12px; font-size: 14px;
border-radius: 3px; } border-radius: 3px; }
.el-button--small.is-round { .el-button--small.is-round {
padding: 7px 13px; } padding: 7px 16px; }
.el-button--small.is-circle { .el-button--small.is-circle {
padding: 7px; } padding: 7px; }
.el-button--mini { .el-button--mini {
padding: 5px 13px; padding: 5px 16px;
font-size: 12px; font-size: 14px;
border-radius: 3px; } border-radius: 3px; }
.el-button--mini.is-round { .el-button--mini.is-round {
padding: 5px 13px; } padding: 5px 16px; }
.el-button--mini.is-circle { .el-button--mini.is-circle {
padding: 5px; } padding: 5px; }
.el-button--text { .el-button--text {
...@@ -939,10 +990,10 @@ ...@@ -939,10 +990,10 @@
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0; }
.el-button-group > .el-button:first-child:last-child { .el-button-group > .el-button:first-child:last-child {
border-top-right-radius: 4px; border-top-right-radius: 3px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 3px;
border-top-left-radius: 4px; border-top-left-radius: 3px;
border-bottom-left-radius: 4px; } border-bottom-left-radius: 3px; }
.el-button-group > .el-button:first-child:last-child.is-round { .el-button-group > .el-button:first-child:last-child.is-round {
border-radius: 20px; } border-radius: 20px; }
.el-button-group > .el-button:first-child:last-child.is-circle { .el-button-group > .el-button:first-child:last-child.is-circle {
...@@ -1005,7 +1056,7 @@ ...@@ -1005,7 +1056,7 @@
-ms-flex-pack: justify; -ms-flex-pack: justify;
justify-content: space-between; justify-content: space-between;
padding: 12px 20px; padding: 12px 20px;
border-bottom: 1px solid #EBEEF5; } border-bottom: 1px solid #E0E0E0; }
.el-calendar__title { .el-calendar__title {
color: #000000; color: #000000;
-ms-flex-item-align: center; -ms-flex-item-align: center;
...@@ -1018,14 +1069,14 @@ ...@@ -1018,14 +1069,14 @@
width: 100%; } width: 100%; }
.el-calendar-table thead th { .el-calendar-table thead th {
padding: 12px 0; padding: 12px 0;
color: #606266; color: #666666;
font-weight: normal; } font-weight: normal; }
.el-calendar-table:not(.is-range) td.prev, .el-calendar-table:not(.is-range) td.prev,
.el-calendar-table:not(.is-range) td.next { .el-calendar-table:not(.is-range) td.next {
color: #CCCCCC; } color: #CCCCCC; }
.el-calendar-table td { .el-calendar-table td {
border-bottom: 1px solid #EBEEF5; border-bottom: 1px solid #E0E0E0;
border-right: 1px solid #EBEEF5; border-right: 1px solid #E0E0E0;
vertical-align: top; vertical-align: top;
-webkit-transition: background-color 0.2s ease; -webkit-transition: background-color 0.2s ease;
transition: background-color 0.2s ease; } transition: background-color 0.2s ease; }
...@@ -1034,9 +1085,9 @@ ...@@ -1034,9 +1085,9 @@
.el-calendar-table td.is-today { .el-calendar-table td.is-today {
color: #0994DC; } color: #0994DC; }
.el-calendar-table tr:first-child td { .el-calendar-table tr:first-child td {
border-top: 1px solid #EBEEF5; } border-top: 1px solid #E0E0E0; }
.el-calendar-table tr td:first-child { .el-calendar-table tr td:first-child {
border-left: 1px solid #EBEEF5; } border-left: 1px solid #E0E0E0; }
.el-calendar-table tr.el-calendar-table__row--hide-border td { .el-calendar-table tr.el-calendar-table__row--hide-border td {
border-top: none; } border-top: none; }
.el-calendar-table .el-calendar-day { .el-calendar-table .el-calendar-day {
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -250,10 +264,10 @@ ...@@ -250,10 +264,10 @@
--------------------------*/ --------------------------*/
.el-card { .el-card {
border-radius: 4px; border-radius: 4px;
border: 1px solid #EBEEF5; border: 1px solid #EBEBEB;
background-color: #FFFFFF; background-color: #FFFFFF;
overflow: hidden; overflow: hidden;
color: #303133; color: #333333;
-webkit-transition: 0.3s; -webkit-transition: 0.3s;
transition: 0.3s; } transition: 0.3s; }
.el-card.is-always-shadow { .el-card.is-always-shadow {
...@@ -264,7 +278,7 @@ ...@@ -264,7 +278,7 @@
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); } box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); }
.el-card__header { .el-card__header {
padding: 18px 20px; padding: 18px 20px;
border-bottom: 1px solid #EBEEF5; border-bottom: 1px solid #EBEBEB;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
.el-card__body { .el-card__body {
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
......
This diff is collapsed.
This diff is collapsed.
...@@ -31,6 +31,13 @@ ...@@ -31,6 +31,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -153,6 +160,13 @@ ...@@ -153,6 +160,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -281,6 +295,13 @@ ...@@ -281,6 +295,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -370,7 +391,7 @@ ...@@ -370,7 +391,7 @@
/* Break-point /* Break-point
--------------------------*/ --------------------------*/
.el-checkbox { .el-checkbox {
color: #606266; color: #333333;
font-weight: 500; font-weight: 500;
font-size: 14px; font-size: 14px;
position: relative; position: relative;
...@@ -384,8 +405,8 @@ ...@@ -384,8 +405,8 @@
margin-right: 30px; } margin-right: 30px; }
.el-checkbox.is-bordered { .el-checkbox.is-bordered {
padding: 9px 20px 9px 10px; padding: 9px 20px 9px 10px;
border-radius: 4px; border-radius: 3px;
border: 1px solid #DCDFE6; border: 1px solid #E4E4E4;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
line-height: normal; line-height: normal;
...@@ -393,13 +414,13 @@ ...@@ -393,13 +414,13 @@
.el-checkbox.is-bordered.is-checked { .el-checkbox.is-bordered.is-checked {
border-color: #0994DC; } border-color: #0994DC; }
.el-checkbox.is-bordered.is-disabled { .el-checkbox.is-bordered.is-disabled {
border-color: #EBEEF5; border-color: #EBEBEB;
cursor: not-allowed; } cursor: not-allowed; }
.el-checkbox.is-bordered + .el-checkbox.is-bordered { .el-checkbox.is-bordered + .el-checkbox.is-bordered {
margin-left: 10px; } margin-left: 10px; }
.el-checkbox.is-bordered.el-checkbox--medium { .el-checkbox.is-bordered.el-checkbox--medium {
padding: 7px 20px 7px 10px; padding: 7px 20px 7px 10px;
border-radius: 4px; border-radius: 3px;
height: 36px; } height: 36px; }
.el-checkbox.is-bordered.el-checkbox--medium .el-checkbox__label { .el-checkbox.is-bordered.el-checkbox--medium .el-checkbox__label {
line-height: 17px; line-height: 17px;
...@@ -413,7 +434,7 @@ ...@@ -413,7 +434,7 @@
height: 32px; } height: 32px; }
.el-checkbox.is-bordered.el-checkbox--small .el-checkbox__label { .el-checkbox.is-bordered.el-checkbox--small .el-checkbox__label {
line-height: 15px; line-height: 15px;
font-size: 12px; } font-size: 14px; }
.el-checkbox.is-bordered.el-checkbox--small .el-checkbox__inner { .el-checkbox.is-bordered.el-checkbox--small .el-checkbox__inner {
height: 12px; height: 12px;
width: 12px; } width: 12px; }
...@@ -426,7 +447,7 @@ ...@@ -426,7 +447,7 @@
height: 28px; } height: 28px; }
.el-checkbox.is-bordered.el-checkbox--mini .el-checkbox__label { .el-checkbox.is-bordered.el-checkbox--mini .el-checkbox__label {
line-height: 12px; line-height: 12px;
font-size: 12px; } font-size: 14px; }
.el-checkbox.is-bordered.el-checkbox--mini .el-checkbox__inner { .el-checkbox.is-bordered.el-checkbox--mini .el-checkbox__inner {
height: 12px; height: 12px;
width: 12px; } width: 12px; }
...@@ -442,8 +463,8 @@ ...@@ -442,8 +463,8 @@
position: relative; position: relative;
vertical-align: middle; } vertical-align: middle; }
.el-checkbox__input.is-disabled .el-checkbox__inner { .el-checkbox__input.is-disabled .el-checkbox__inner {
background-color: #edf2fc; background-color: #F8F8F8;
border-color: #DCDFE6; border-color: #E4E4E4;
cursor: not-allowed; } cursor: not-allowed; }
.el-checkbox__input.is-disabled .el-checkbox__inner::after { .el-checkbox__input.is-disabled .el-checkbox__inner::after {
cursor: not-allowed; cursor: not-allowed;
...@@ -451,13 +472,13 @@ ...@@ -451,13 +472,13 @@
.el-checkbox__input.is-disabled .el-checkbox__inner + .el-checkbox__label { .el-checkbox__input.is-disabled .el-checkbox__inner + .el-checkbox__label {
cursor: not-allowed; } cursor: not-allowed; }
.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner { .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
background-color: #F2F6FC; background-color: #F8F8F8;
border-color: #DCDFE6; } border-color: #EBEBEB; }
.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after { .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {
border-color: #CCCCCC; } border-color: #CCCCCC; }
.el-checkbox__input.is-disabled.is-indeterminate .el-checkbox__inner { .el-checkbox__input.is-disabled.is-indeterminate .el-checkbox__inner {
background-color: #F2F6FC; background-color: #F8F8F8;
border-color: #DCDFE6; } border-color: #EBEBEB; }
.el-checkbox__input.is-disabled.is-indeterminate .el-checkbox__inner::before { .el-checkbox__input.is-disabled.is-indeterminate .el-checkbox__inner::before {
background-color: #CCCCCC; background-color: #CCCCCC;
border-color: #CCCCCC; } border-color: #CCCCCC; }
...@@ -471,11 +492,11 @@ ...@@ -471,11 +492,11 @@
-webkit-transform: rotate(45deg) scaleY(1); -webkit-transform: rotate(45deg) scaleY(1);
transform: rotate(45deg) scaleY(1); } transform: rotate(45deg) scaleY(1); }
.el-checkbox__input.is-checked + .el-checkbox__label { .el-checkbox__input.is-checked + .el-checkbox__label {
color: #0994DC; } color: #333333; }
.el-checkbox__input.is-focus { .el-checkbox__input.is-focus {
/*focus时 视觉上区分*/ } /*focus时 视觉上区分*/ }
.el-checkbox__input.is-focus .el-checkbox__inner { .el-checkbox__input.is-focus .el-checkbox__inner {
border-color: #0994DC; } border-color: #0885C6; }
.el-checkbox__input.is-indeterminate .el-checkbox__inner { .el-checkbox__input.is-indeterminate .el-checkbox__inner {
background-color: #0994DC; background-color: #0994DC;
border-color: #0994DC; } border-color: #0994DC; }
...@@ -495,18 +516,18 @@ ...@@ -495,18 +516,18 @@
.el-checkbox__inner { .el-checkbox__inner {
display: inline-block; display: inline-block;
position: relative; position: relative;
border: 1px solid #DCDFE6; border: 1px solid #E4E4E4;
border-radius: 2px; border-radius: 3px;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
width: 14px; width: 16px;
height: 14px; height: 16px;
background-color: #FFFFFF; background-color: #FFFFFF;
z-index: 1; z-index: 1;
-webkit-transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46), background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46); -webkit-transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46), background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46), background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46); } transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46), background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46); }
.el-checkbox__inner:hover { .el-checkbox__inner:hover {
border-color: #0994DC; } border-color: #0885C6; }
.el-checkbox__inner::after { .el-checkbox__inner::after {
-webkit-box-sizing: content-box; -webkit-box-sizing: content-box;
box-sizing: content-box; box-sizing: content-box;
...@@ -554,9 +575,9 @@ ...@@ -554,9 +575,9 @@
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
background: #FFFFFF; background: #FFFFFF;
border: 1px solid #DCDFE6; border: 1px solid #E4E4E4;
border-left: 0; border-left: 0;
color: #606266; color: #0994DC;
-webkit-appearance: none; -webkit-appearance: none;
text-align: center; text-align: center;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
...@@ -569,11 +590,11 @@ ...@@ -569,11 +590,11 @@
-moz-user-select: none; -moz-user-select: none;
-webkit-user-select: none; -webkit-user-select: none;
-ms-user-select: none; -ms-user-select: none;
padding: 10px 18px; padding: 10px 16px;
font-size: 14px; font-size: 14px;
border-radius: 0; } border-radius: 0; }
.el-checkbox-button__inner.is-round { .el-checkbox-button__inner.is-round {
padding: 10px 18px; } padding: 10px 16px; }
.el-checkbox-button__inner:hover { .el-checkbox-button__inner:hover {
color: #0994DC; } color: #0994DC; }
.el-checkbox-button__inner [class*="el-icon-"] { .el-checkbox-button__inner [class*="el-icon-"] {
...@@ -605,32 +626,32 @@ ...@@ -605,32 +626,32 @@
.el-checkbox-button.is-disabled:first-child .el-checkbox-button__inner { .el-checkbox-button.is-disabled:first-child .el-checkbox-button__inner {
border-left-color: #EBEBEB; } border-left-color: #EBEBEB; }
.el-checkbox-button:first-child .el-checkbox-button__inner { .el-checkbox-button:first-child .el-checkbox-button__inner {
border-left: 1px solid #DCDFE6; border-left: 1px solid #E4E4E4;
border-radius: 4px 0 0 4px; border-radius: 3px 0 0 3px;
-webkit-box-shadow: none !important; -webkit-box-shadow: none !important;
box-shadow: none !important; } box-shadow: none !important; }
.el-checkbox-button.is-focus .el-checkbox-button__inner { .el-checkbox-button.is-focus .el-checkbox-button__inner {
border-color: #0994DC; } border-color: #0994DC; }
.el-checkbox-button:last-child .el-checkbox-button__inner { .el-checkbox-button:last-child .el-checkbox-button__inner {
border-radius: 0 4px 4px 0; } border-radius: 0 3px 3px 0; }
.el-checkbox-button--medium .el-checkbox-button__inner { .el-checkbox-button--medium .el-checkbox-button__inner {
padding: 8px 18px; padding: 9px 16px;
font-size: 14px; font-size: 14px;
border-radius: 0; } border-radius: 0; }
.el-checkbox-button--medium .el-checkbox-button__inner.is-round { .el-checkbox-button--medium .el-checkbox-button__inner.is-round {
padding: 8px 18px; } padding: 9px 16px; }
.el-checkbox-button--small .el-checkbox-button__inner { .el-checkbox-button--small .el-checkbox-button__inner {
padding: 7px 13px; padding: 7px 16px;
font-size: 12px; font-size: 14px;
border-radius: 0; } border-radius: 0; }
.el-checkbox-button--small .el-checkbox-button__inner.is-round { .el-checkbox-button--small .el-checkbox-button__inner.is-round {
padding: 7px 13px; } padding: 7px 16px; }
.el-checkbox-button--mini .el-checkbox-button__inner { .el-checkbox-button--mini .el-checkbox-button__inner {
padding: 5px 13px; padding: 5px 16px;
font-size: 12px; font-size: 14px;
border-radius: 0; } border-radius: 0; }
.el-checkbox-button--mini .el-checkbox-button__inner.is-round { .el-checkbox-button--mini .el-checkbox-button__inner.is-round {
padding: 5px 13px; } padding: 5px 16px; }
.el-checkbox-group { .el-checkbox-group {
font-size: 0; } font-size: 0; }
...@@ -30,6 +30,13 @@ ...@@ -30,6 +30,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -152,6 +159,13 @@ ...@@ -152,6 +159,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -280,6 +294,13 @@ ...@@ -280,6 +294,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -485,11 +506,11 @@ ...@@ -485,11 +506,11 @@
transition: opacity 0.3s cubic-bezier(0.55, 0, 0.1, 1); } transition: opacity 0.3s cubic-bezier(0.55, 0, 0.1, 1); }
.el-collapse { .el-collapse {
border-top: 1px solid #EBEEF5; border-top: 1px solid #EBEBEB;
border-bottom: 1px solid #EBEEF5; } border-bottom: 1px solid #EBEBEB; }
.el-collapse-item.is-disabled .el-collapse-item__header { .el-collapse-item.is-disabled .el-collapse-item__header {
color: #bbb; color: #CCCCCC;
cursor: not-allowed; } cursor: not-allowed; }
.el-collapse-item__header { .el-collapse-item__header {
...@@ -502,9 +523,9 @@ ...@@ -502,9 +523,9 @@
height: 48px; height: 48px;
line-height: 48px; line-height: 48px;
background-color: #FFFFFF; background-color: #FFFFFF;
color: #303133; color: #333333;
cursor: pointer; cursor: pointer;
border-bottom: 1px solid #EBEEF5; border-bottom: 1px solid #EBEBEB;
font-size: 13px; font-size: 13px;
font-weight: 500; font-weight: 500;
-webkit-transition: border-bottom-color .3s; -webkit-transition: border-bottom-color .3s;
...@@ -531,12 +552,12 @@ ...@@ -531,12 +552,12 @@
overflow: hidden; overflow: hidden;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
border-bottom: 1px solid #EBEEF5; } border-bottom: 1px solid #EBEBEB; }
.el-collapse-item__content { .el-collapse-item__content {
padding-bottom: 25px; padding-bottom: 25px;
font-size: 13px; font-size: 13px;
color: #303133; color: #333333;
line-height: 1.769230769230769; } line-height: 1.769230769230769; }
.el-collapse-item:last-child { .el-collapse-item:last-child {
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -501,7 +515,7 @@ ...@@ -501,7 +515,7 @@
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #999; border: 1px solid #999;
border-radius: 2px; border-radius: 3px;
width: 100%; width: 100%;
height: 100%; height: 100%;
text-align: center; } text-align: center; }
...@@ -539,7 +553,7 @@ ...@@ -539,7 +553,7 @@
-webkit-box-sizing: content-box; -webkit-box-sizing: content-box;
box-sizing: content-box; box-sizing: content-box;
background-color: #FFFFFF; background-color: #FFFFFF;
border: 1px solid #EBEEF5; border: 1px solid #EBEBEB;
border-radius: 4px; border-radius: 3px;
-webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); -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); } box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); }
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
......
This diff is collapsed.
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -280,6 +294,13 @@ ...@@ -280,6 +294,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -402,6 +423,13 @@ ...@@ -402,6 +423,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -542,7 +570,7 @@ ...@@ -542,7 +570,7 @@
position: relative; position: relative;
margin: 0 auto 50px; margin: 0 auto 50px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 2px; border-radius: 3px;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
...@@ -576,16 +604,16 @@ ...@@ -576,16 +604,16 @@
cursor: pointer; cursor: pointer;
font-size: 16px; } font-size: 16px; }
.el-dialog__headerbtn .el-dialog__close { .el-dialog__headerbtn .el-dialog__close {
color: #FFBF00; } color: #00BBF2; }
.el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close { .el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close {
color: #0994DC; } color: #0994DC; }
.el-dialog__title { .el-dialog__title {
line-height: 24px; line-height: 24px;
font-size: 18px; font-size: 18px;
color: #303133; } color: #333333; }
.el-dialog__body { .el-dialog__body {
padding: 30px 20px; padding: 30px 20px;
color: #606266; color: #666666;
font-size: 14px; font-size: 14px;
word-break: break-all; } word-break: break-all; }
.el-dialog__footer { .el-dialog__footer {
......
...@@ -30,6 +30,13 @@ ...@@ -30,6 +30,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -152,6 +159,13 @@ ...@@ -152,6 +159,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
......
...@@ -30,6 +30,13 @@ ...@@ -30,6 +30,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -152,6 +159,13 @@ ...@@ -152,6 +159,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -249,7 +263,7 @@ ...@@ -249,7 +263,7 @@
/* BEM /* BEM
-------------------------- */ -------------------------- */
.el-divider { .el-divider {
background-color: #DCDFE6; background-color: #E4E4E4;
position: relative; } position: relative; }
.el-divider--horizontal { .el-divider--horizontal {
display: block; display: block;
...@@ -268,7 +282,7 @@ ...@@ -268,7 +282,7 @@
background-color: #FFFFFF; background-color: #FFFFFF;
padding: 0 20px; padding: 0 20px;
font-weight: 500; font-weight: 500;
color: #303133; color: #333333;
font-size: 14px; } font-size: 14px; }
.el-divider__text.is-left { .el-divider__text.is-left {
left: 20px; left: 20px;
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
......
This diff is collapsed.
...@@ -30,6 +30,13 @@ ...@@ -30,6 +30,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -315,7 +329,7 @@ ...@@ -315,7 +329,7 @@
vertical-align: middle; vertical-align: middle;
float: left; float: left;
font-size: 14px; font-size: 14px;
color: #606266; color: #666666;
line-height: 40px; line-height: 40px;
padding: 0 12px 0 0; padding: 0 12px 0 0;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
......
...@@ -30,6 +30,13 @@ ...@@ -30,6 +30,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -266,7 +280,7 @@ ...@@ -266,7 +280,7 @@
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
display: block; } display: block; }
.el-image__placeholder { .el-image__placeholder {
background: #F5F7FA; } background: #F6F6F6; }
.el-image__error { .el-image__error {
display: -webkit-box; display: -webkit-box;
display: -ms-flexbox; display: -ms-flexbox;
...@@ -278,7 +292,7 @@ ...@@ -278,7 +292,7 @@
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
font-size: 14px; font-size: 14px;
background: #F5F7FA; background: #F6F6F6;
color: #CCCCCC; color: #CCCCCC;
vertical-align: middle; } vertical-align: middle; }
.el-image__preview { .el-image__preview {
......
This diff is collapsed.
This diff is collapsed.
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -263,11 +277,11 @@ ...@@ -263,11 +277,11 @@
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
font-size: inherit; font-size: inherit;
color: #606266; color: #333333;
background-color: #FFFFFF; background-color: #FFFFFF;
background-image: none; background-image: none;
border: 1px solid #DCDFE6; border: 1px solid #E4E4E4;
border-radius: 4px; border-radius: 3px;
-webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1); -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1); } transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1); }
.el-textarea__inner::-webkit-input-placeholder { .el-textarea__inner::-webkit-input-placeholder {
...@@ -279,20 +293,20 @@ ...@@ -279,20 +293,20 @@
.el-textarea__inner::placeholder { .el-textarea__inner::placeholder {
color: #CCCCCC; } color: #CCCCCC; }
.el-textarea__inner:hover { .el-textarea__inner:hover {
border-color: #CCCCCC; } border-color: #B3B5BA; }
.el-textarea__inner:focus { .el-textarea__inner:focus {
outline: none; outline: none;
border-color: #0994DC; } border-color: #0885C6; }
.el-textarea .el-input__count { .el-textarea .el-input__count {
color: #FFBF00; color: #00BBF2;
background: #FFFFFF; background: #FFFFFF;
position: absolute; position: absolute;
font-size: 12px; font-size: 12px;
bottom: 5px; bottom: 5px;
right: 10px; } right: 10px; }
.el-textarea.is-disabled .el-textarea__inner { .el-textarea.is-disabled .el-textarea__inner {
background-color: #F5F7FA; background-color: #F8F8F8;
border-color: #E4E7ED; border-color: #EBEBEB;
color: #CCCCCC; color: #CCCCCC;
cursor: not-allowed; } cursor: not-allowed; }
.el-textarea.is-disabled .el-textarea__inner::-webkit-input-placeholder { .el-textarea.is-disabled .el-textarea__inner::-webkit-input-placeholder {
...@@ -336,7 +350,7 @@ ...@@ -336,7 +350,7 @@
-webkit-transition: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1); -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); } transition: color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1); }
.el-input .el-input__clear:hover { .el-input .el-input__clear:hover {
color: #909399; } color: #999999; }
.el-input .el-input__count { .el-input .el-input__count {
height: 100%; height: 100%;
display: -webkit-inline-box; display: -webkit-inline-box;
...@@ -345,7 +359,7 @@ ...@@ -345,7 +359,7 @@
-webkit-box-align: center; -webkit-box-align: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
color: #FFBF00; color: #00BBF2;
font-size: 12px; } font-size: 12px; }
.el-input .el-input__count .el-input__count-inner { .el-input .el-input__count .el-input__count-inner {
background: #FFFFFF; background: #FFFFFF;
...@@ -356,15 +370,15 @@ ...@@ -356,15 +370,15 @@
-webkit-appearance: none; -webkit-appearance: none;
background-color: #FFFFFF; background-color: #FFFFFF;
background-image: none; background-image: none;
border-radius: 4px; border-radius: 3px;
border: 1px solid #DCDFE6; border: 1px solid #E4E4E4;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
color: #606266; color: #333333;
display: inline-block; display: inline-block;
font-size: inherit; font-size: inherit;
height: 40px; height: 36px;
line-height: 40px; line-height: 36px;
outline: none; outline: none;
padding: 0 15px; padding: 0 15px;
-webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1); -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
...@@ -379,10 +393,10 @@ ...@@ -379,10 +393,10 @@
.el-input__inner::placeholder { .el-input__inner::placeholder {
color: #CCCCCC; } color: #CCCCCC; }
.el-input__inner:hover { .el-input__inner:hover {
border-color: #CCCCCC; } border-color: #B3B5BA; }
.el-input__inner:focus { .el-input__inner:focus {
outline: none; outline: none;
border-color: #0994DC; } border-color: #0885C6; }
.el-input__suffix { .el-input__suffix {
position: absolute; position: absolute;
height: 100%; height: 100%;
...@@ -410,7 +424,7 @@ ...@@ -410,7 +424,7 @@
text-align: center; text-align: center;
-webkit-transition: all .3s; -webkit-transition: all .3s;
transition: all .3s; transition: all .3s;
line-height: 40px; } line-height: 36px; }
.el-input__icon:after { .el-input__icon:after {
content: ''; content: '';
height: 100%; height: 100%;
...@@ -421,10 +435,10 @@ ...@@ -421,10 +435,10 @@
pointer-events: none; } pointer-events: none; }
.el-input.is-active .el-input__inner { .el-input.is-active .el-input__inner {
outline: none; outline: none;
border-color: #0994DC; } border-color: #0885C6; }
.el-input.is-disabled .el-input__inner { .el-input.is-disabled .el-input__inner {
background-color: #F5F7FA; background-color: #F8F8F8;
border-color: #E4E7ED; border-color: #EBEBEB;
color: #CCCCCC; color: #CCCCCC;
cursor: not-allowed; } cursor: not-allowed; }
.el-input.is-disabled .el-input__inner::-webkit-input-placeholder { .el-input.is-disabled .el-input__inner::-webkit-input-placeholder {
...@@ -448,19 +462,19 @@ ...@@ -448,19 +462,19 @@
.el-input--medium { .el-input--medium {
font-size: 14px; } font-size: 14px; }
.el-input--medium .el-input__inner { .el-input--medium .el-input__inner {
height: 36px; height: 32px;
line-height: 36px; } line-height: 32px; }
.el-input--medium .el-input__icon { .el-input--medium .el-input__icon {
line-height: 36px; } line-height: 32px; }
.el-input--small { .el-input--small {
font-size: 13px; } font-size: 14px; }
.el-input--small .el-input__inner { .el-input--small .el-input__inner {
height: 32px; height: 28px;
line-height: 32px; } line-height: 28px; }
.el-input--small .el-input__icon { .el-input--small .el-input__icon {
line-height: 32px; } line-height: 28px; }
.el-input--mini { .el-input--mini {
font-size: 12px; } font-size: 14px; }
.el-input--mini .el-input__inner { .el-input--mini .el-input__inner {
height: 28px; height: 28px;
line-height: 28px; } line-height: 28px; }
...@@ -477,13 +491,13 @@ ...@@ -477,13 +491,13 @@
vertical-align: middle; vertical-align: middle;
display: table-cell; } display: table-cell; }
.el-input-group__append, .el-input-group__prepend { .el-input-group__append, .el-input-group__prepend {
background-color: #F5F7FA; background-color: #F6F6F6;
color: #FFBF00; color: #00BBF2;
vertical-align: middle; vertical-align: middle;
display: table-cell; display: table-cell;
position: relative; position: relative;
border: 1px solid #DCDFE6; border: 1px solid #E4E4E4;
border-radius: 4px; border-radius: 3px;
padding: 0 20px; padding: 0 20px;
width: 1px; width: 1px;
white-space: nowrap; } white-space: nowrap; }
......
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -160,6 +167,13 @@ ...@@ -160,6 +167,13 @@
-------------------------- */ -------------------------- */
/* Checkbox /* Checkbox
-------------------------- */ -------------------------- */
/*$--checkbox-disabled-border-color: $--border-color-base !default;
$--checkbox-disabled-input-fill: $--disabled-fill-base !default;
$--checkbox-disabled-icon-color: $--disabled-fill-base !default;
$--checkbox-disabled-checked-input-fill: $--background-color-lighter !default;
$--checkbox-disabled-checked-input-border-color: $--border-color-lighter !default;
$--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Radio /* Radio
-------------------------- */ -------------------------- */
/* Select /* Select
...@@ -283,7 +297,7 @@ ...@@ -283,7 +297,7 @@
.el-link [class*="el-icon-"] + span { .el-link [class*="el-icon-"] + span {
margin-left: 5px; } margin-left: 5px; }
.el-link.el-link--default { .el-link.el-link--default {
color: #606266; } color: #666666; }
.el-link.el-link--default:hover { .el-link.el-link--default:hover {
color: #0994DC; } color: #0994DC; }
.el-link.el-link--default:after { .el-link.el-link--default:after {
...@@ -331,12 +345,12 @@ ...@@ -331,12 +345,12 @@
.el-link.el-link--warning.is-underline:hover:after { .el-link.el-link--warning.is-underline:hover:after {
border-color: #FFA533; } border-color: #FFA533; }
.el-link.el-link--info { .el-link.el-link--info {
color: #FFBF00; } color: #00BBF2; }
.el-link.el-link--info:hover { .el-link.el-link--info:hover {
color: #ffcc33; } color: #33c9f5; }
.el-link.el-link--info:after { .el-link.el-link--info:after {
border-color: #FFBF00; } border-color: #00BBF2; }
.el-link.el-link--info.is-disabled { .el-link.el-link--info.is-disabled {
color: #ffdf80; } color: #80ddf9; }
.el-link.el-link--info.is-underline:hover:after { .el-link.el-link--info.is-underline:hover:after {
border-color: #FFBF00; } border-color: #00BBF2; }
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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