Skip to content

S
style_tool
Commit b537749d authored by cyh's avatar cyh
Browse files
Options

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

parents 589eeb32 4fe5ccc4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2781 additions and 2553 deletions
node_module/element-theme-chalk/src/scrollbar.scss
View file @ b537749d
...@@ -44,16 +44,16 @@ ...@@ -44,16 +44,16 @@
@include e(bar) { @include e(bar) {
position: absolute; position: absolute;
right: 2px; right: 4px;
bottom: 2px; bottom: 4px;
z-index: 1; z-index: 1;
border-radius: 4px; border-radius: 4px;
opacity: 0; opacity: 0;
transition: opacity 120ms ease-out; transition: opacity 120ms ease-out;
@include when(vertical) { @include when(vertical) {
width: 6px; width: 4px;
top: 2px; top: 4px;
> div { > div {
width: 100%; width: 100%;
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
} }
@include when(horizontal) { @include when(horizontal) {
height: 6px; height: 4px;
left: 2px; left: 8px;
> div { > div {
height: 100%; height: 100%;
......
theme/autocomplete.css
View file @ b537749d
...@@ -535,7 +535,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -535,7 +535,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-textarea__inner { .el-textarea__inner {
display: block; display: block;
resize: vertical; resize: vertical;
padding: 5px 15px; padding: 5px 8px;
line-height: 1.5; line-height: 1.5;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -644,7 +644,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -644,7 +644,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
outline: none; outline: none;
padding: 0 15px; padding: 0 8px;
-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);
width: 100%; } width: 100%; }
...@@ -660,7 +660,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -660,7 +660,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: #B3B5BA; } border-color: #B3B5BA; }
.el-input__inner:focus { .el-input__inner:focus {
outline: none; outline: none;
border-color: #0885C6; } border-color: #0885C6;
-webkit-box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2);
box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2); }
.el-input__suffix { .el-input__suffix {
position: absolute; position: absolute;
height: 100%; height: 100%;
...@@ -684,7 +686,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -684,7 +686,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
transition: all .3s; } transition: all .3s; }
.el-input__icon { .el-input__icon {
height: 100%; height: 100%;
width: 25px; width: 17px;
text-align: center; text-align: center;
-webkit-transition: all .3s; -webkit-transition: all .3s;
transition: all .3s; transition: all .3s;
...@@ -755,14 +757,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -755,14 +757,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
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: #F6F6F6; background-color: #F8F8F8;
color: #00BBF2; color: #666666;
vertical-align: middle; vertical-align: middle;
display: table-cell; display: table-cell;
position: relative; position: relative;
border: 1px solid #E4E4E4; border: 1px solid #E4E4E4;
border-radius: 3px; border-radius: 3px;
padding: 0 20px;
width: 1px; width: 1px;
white-space: nowrap; } white-space: nowrap; }
.el-input-group__append:focus, .el-input-group__prepend:focus { .el-input-group__append:focus, .el-input-group__prepend:focus {
...@@ -779,21 +780,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -779,21 +780,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-input-group__prepend div.el-select:hover .el-input__inner { .el-input-group__prepend div.el-select:hover .el-input__inner {
border-color: transparent; border-color: transparent;
background-color: transparent; background-color: transparent;
color: inherit; color: #666666;
border-top: 0; border-top: 0;
border-bottom: 0; } border-bottom: 0; }
.el-input-group__append .el-button, .el-input-group__append .el-button, .el-input-group__append .el-input, .el-input-group__prepend .el-button, .el-input-group__prepend .el-input {
.el-input-group__append .el-input, .el-input-group__prepend .el-button, font-size: 14px; }
.el-input-group__prepend .el-input {
font-size: inherit; }
.el-input-group__prepend { .el-input-group__prepend {
border-right: 0; border-right: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; } border-bottom-right-radius: 0;
padding: 0 8px;
font-size: 12px; }
.el-input-group__append { .el-input-group__append {
border-left: 0; border-left: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0;
padding: 0 16px; }
.el-input-group__append:hover {
border-color: #0885C6;
background-color: #EDF6FC;
color: #0885C6; }
.el-input-group--prepend .el-input__inner { .el-input-group--prepend .el-input__inner {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0; }
...@@ -1104,21 +1110,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1104,21 +1110,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: rgba(153, 153, 153, 0.5); } background-color: rgba(153, 153, 153, 0.5); }
.el-scrollbar__bar { .el-scrollbar__bar {
position: absolute; position: absolute;
right: 2px; right: 4px;
bottom: 2px; bottom: 4px;
z-index: 1; z-index: 1;
border-radius: 4px; border-radius: 4px;
opacity: 0; opacity: 0;
-webkit-transition: opacity 120ms ease-out; -webkit-transition: opacity 120ms ease-out;
transition: opacity 120ms ease-out; } transition: opacity 120ms ease-out; }
.el-scrollbar__bar.is-vertical { .el-scrollbar__bar.is-vertical {
width: 6px; width: 4px;
top: 2px; } top: 4px; }
.el-scrollbar__bar.is-vertical > div { .el-scrollbar__bar.is-vertical > div {
width: 100%; } width: 100%; }
.el-scrollbar__bar.is-horizontal { .el-scrollbar__bar.is-horizontal {
height: 6px; height: 4px;
left: 2px; } left: 8px; }
.el-scrollbar__bar.is-horizontal > div { .el-scrollbar__bar.is-horizontal > div {
height: 100%; } height: 100%; }
...@@ -1386,8 +1392,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1386,8 +1392,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
--------------------------*/ --------------------------*/
/* Break-point /* Break-point
--------------------------*/ --------------------------*/
.el-popper .popper__arrow, .el-popper .popper__arrow {
.el-popper .popper__arrow::after {
position: absolute; position: absolute;
display: block; display: block;
width: 0; width: 0;
...@@ -1395,73 +1400,64 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1395,73 +1400,64 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: transparent; border-color: transparent;
border-style: solid; } border-style: solid; }
.el-popper .popper__arrow {
border-width: 6px;
-webkit-filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03)); }
.el-popper .popper__arrow::after {
content: " ";
border-width: 6px; }
.el-popper[x-placement^="top"] { .el-popper[x-placement^="top"] {
margin-bottom: 12px; } margin-bottom: 4px; }
.el-popper[x-placement^="top"] .popper__arrow { .el-popper[x-placement^="top"] .popper__arrow {
bottom: -6px; bottom: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-color: #EBEBEB; border-top-color: #EBEBEB;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="top"] .popper__arrow::after { .el-popper[x-placement^="top"] .popper__arrow::after {
bottom: 1px; bottom: 1px;
margin-left: -6px; margin-left: -4px;
border-top-color: #FFFFFF; border-top-color: #FFFFFF;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="bottom"] { .el-popper[x-placement^="bottom"] {
margin-top: 12px; } margin-top: 4px; }
.el-popper[x-placement^="bottom"] .popper__arrow { .el-popper[x-placement^="bottom"] .popper__arrow {
top: -6px; top: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #EBEBEB; } border-bottom-color: #EBEBEB; }
.el-popper[x-placement^="bottom"] .popper__arrow::after { .el-popper[x-placement^="bottom"] .popper__arrow::after {
top: 1px; top: 1px;
margin-left: -6px; margin-left: -4px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #FFFFFF; } border-bottom-color: #FFFFFF; }
.el-popper[x-placement^="right"] { .el-popper[x-placement^="right"] {
margin-left: 12px; } margin-left: 4px; }
.el-popper[x-placement^="right"] .popper__arrow { .el-popper[x-placement^="right"] .popper__arrow {
top: 50%; top: 50%;
left: -6px; left: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-color: #EBEBEB; border-right-color: #EBEBEB;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="right"] .popper__arrow::after { .el-popper[x-placement^="right"] .popper__arrow::after {
bottom: -6px; bottom: -4px;
left: 1px; left: 1px;
border-right-color: #FFFFFF; border-right-color: #FFFFFF;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="left"] { .el-popper[x-placement^="left"] {
margin-right: 12px; } margin-right: 4px; }
.el-popper[x-placement^="left"] .popper__arrow { .el-popper[x-placement^="left"] .popper__arrow {
top: 50%; top: 50%;
right: -6px; right: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-width: 0; border-right-width: 0;
border-left-color: #EBEBEB; } border-left-color: #EBEBEB; }
.el-popper[x-placement^="left"] .popper__arrow::after { .el-popper[x-placement^="left"] .popper__arrow::after {
right: 1px; right: 1px;
bottom: -6px; bottom: -4px;
margin-left: -6px; margin-left: -4px;
border-right-width: 0; border-right-width: 0;
border-left-color: #FFFFFF; } border-left-color: #FFFFFF; }
...@@ -1498,9 +1494,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1498,9 +1494,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; } text-overflow: ellipsis; }
.el-autocomplete-suggestion li:hover { .el-autocomplete-suggestion li:hover {
background-color: #F6F6F6; } background-color: #EDF6FC; }
.el-autocomplete-suggestion li.highlighted { .el-autocomplete-suggestion li.highlighted {
background-color: #F6F6F6; } background-color: #EDF6FC; }
.el-autocomplete-suggestion li.divider { .el-autocomplete-suggestion li.divider {
margin-top: 6px; margin-top: 6px;
border-top: 1px solid #000000; } border-top: 1px solid #000000; }
......
theme/button.css
View file @ b537749d
This diff is collapsed.
theme/calendar.css
View file @ b537749d
This diff is collapsed.
theme/cascader-panel.css
View file @ b537749d
...@@ -747,7 +747,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -747,7 +747,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: #CCCCCC; background-color: #CCCCCC;
border-color: #CCCCCC; } border-color: #CCCCCC; }
.el-checkbox__input.is-disabled + span.el-checkbox__label { .el-checkbox__input.is-disabled + span.el-checkbox__label {
color: #CCCCCC; color: #333333;
cursor: not-allowed; } cursor: not-allowed; }
.el-checkbox__input.is-checked .el-checkbox__inner { .el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #0994DC; background-color: #0994DC;
...@@ -800,9 +800,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -800,9 +800,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-left: 0; border-left: 0;
border-top: 0; border-top: 0;
height: 7px; height: 7px;
left: 4px; left: 5px;
position: absolute; position: absolute;
top: 1px; top: 2px;
-webkit-transform: rotate(45deg) scaleY(0); -webkit-transform: rotate(45deg) scaleY(0);
transform: rotate(45deg) scaleY(0); transform: rotate(45deg) scaleY(0);
width: 3px; width: 3px;
...@@ -822,7 +822,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -822,7 +822,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
z-index: -1; } z-index: -1; }
.el-checkbox__label { .el-checkbox__label {
display: inline-block; display: inline-block;
padding-left: 10px; padding-left: 8px;
line-height: 19px; line-height: 19px;
font-size: 14px; } font-size: 14px; }
.el-checkbox:last-of-type { .el-checkbox:last-of-type {
...@@ -1389,16 +1389,17 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1389,16 +1389,17 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: #F8F8F8; background-color: #F8F8F8;
border-color: #EBEBEB; } border-color: #EBEBEB; }
.el-radio__input.is-disabled.is-checked .el-radio__inner::after { .el-radio__input.is-disabled.is-checked .el-radio__inner::after {
background-color: #CCCCCC; } border-color: #CCCCCC;
background-color: #F8F8F8; }
.el-radio__input.is-disabled + span.el-radio__label { .el-radio__input.is-disabled + span.el-radio__label {
color: #CCCCCC; color: #333333;
cursor: not-allowed; } cursor: not-allowed; }
.el-radio__input.is-checked .el-radio__inner { .el-radio__input.is-checked .el-radio__inner {
border-color: #0994DC; border-color: #0994DC;
background: #0994DC; } background: #0994DC; }
.el-radio__input.is-checked .el-radio__inner::after { .el-radio__input.is-checked .el-radio__inner::after {
-webkit-transform: translate(-50%, -50%) scale(1); -webkit-transform: rotate(45deg) scaleY(1);
transform: translate(-50%, -50%) scale(1); } transform: rotate(45deg) scaleY(1); }
.el-radio__input.is-checked + .el-radio__label { .el-radio__input.is-checked + .el-radio__label {
color: #333333; } color: #333333; }
.el-radio__input.is-focus .el-radio__inner { .el-radio__input.is-focus .el-radio__inner {
...@@ -1417,20 +1418,25 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1417,20 +1418,25 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-radio__inner:hover { .el-radio__inner:hover {
border-color: #0885C6; } border-color: #0885C6; }
.el-radio__inner::after { .el-radio__inner::after {
width: 4px; -webkit-box-sizing: content-box;
height: 4px; box-sizing: content-box;
border-radius: 100%;
background-color: #FFFFFF;
content: ""; content: "";
border: 1px solid #FFFFFF;
border-left: 0;
border-top: 0;
height: 7px;
left: 5px;
position: absolute; position: absolute;
left: 50%; top: 2px;
top: 50%; -webkit-transform: rotate(45deg) scaleY(0);
-webkit-transform: translate(-50%, -50%) scale(0); transform: rotate(45deg) scaleY(0);
transform: translate(-50%, -50%) scale(0); width: 3px;
-webkit-transition: -webkit-transform .15s ease-in; -webkit-transition: -webkit-transform .15s ease-in .05s;
transition: -webkit-transform .15s ease-in; transition: -webkit-transform .15s ease-in .05s;
transition: transform .15s ease-in; transition: transform .15s ease-in .05s;
transition: transform .15s ease-in, -webkit-transform .15s ease-in; } transition: transform .15s ease-in .05s, -webkit-transform .15s ease-in .05s;
-webkit-transform-origin: center;
transform-origin: center; }
.el-radio__original { .el-radio__original {
opacity: 0; opacity: 0;
outline: none; outline: none;
...@@ -1448,7 +1454,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1448,7 +1454,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
box-shadow: 0 0 2px 2px #0885C6; } box-shadow: 0 0 2px 2px #0885C6; }
.el-radio__label { .el-radio__label {
font-size: 14px; font-size: 14px;
padding-left: 10px; } padding-left: 8px; }
/* BEM support Func /* BEM support Func
-------------------------- */ -------------------------- */
...@@ -1743,21 +1749,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1743,21 +1749,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: rgba(153, 153, 153, 0.5); } background-color: rgba(153, 153, 153, 0.5); }
.el-scrollbar__bar { .el-scrollbar__bar {
position: absolute; position: absolute;
right: 2px; right: 4px;
bottom: 2px; bottom: 4px;
z-index: 1; z-index: 1;
border-radius: 4px; border-radius: 4px;
opacity: 0; opacity: 0;
-webkit-transition: opacity 120ms ease-out; -webkit-transition: opacity 120ms ease-out;
transition: opacity 120ms ease-out; } transition: opacity 120ms ease-out; }
.el-scrollbar__bar.is-vertical { .el-scrollbar__bar.is-vertical {
width: 6px; width: 4px;
top: 2px; } top: 4px; }
.el-scrollbar__bar.is-vertical > div { .el-scrollbar__bar.is-vertical > div {
width: 100%; } width: 100%; }
.el-scrollbar__bar.is-horizontal { .el-scrollbar__bar.is-horizontal {
height: 6px; height: 4px;
left: 2px; } left: 8px; }
.el-scrollbar__bar.is-horizontal > div { .el-scrollbar__bar.is-horizontal > div {
height: 100%; } height: 100%; }
......
theme/cascader.css
View file @ b537749d
This diff is collapsed.
theme/checkbox.css
View file @ b537749d
...@@ -483,7 +483,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -483,7 +483,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: #CCCCCC; background-color: #CCCCCC;
border-color: #CCCCCC; } border-color: #CCCCCC; }
.el-checkbox__input.is-disabled + span.el-checkbox__label { .el-checkbox__input.is-disabled + span.el-checkbox__label {
color: #CCCCCC; color: #333333;
cursor: not-allowed; } cursor: not-allowed; }
.el-checkbox__input.is-checked .el-checkbox__inner { .el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #0994DC; background-color: #0994DC;
...@@ -536,9 +536,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -536,9 +536,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-left: 0; border-left: 0;
border-top: 0; border-top: 0;
height: 7px; height: 7px;
left: 4px; left: 5px;
position: absolute; position: absolute;
top: 1px; top: 2px;
-webkit-transform: rotate(45deg) scaleY(0); -webkit-transform: rotate(45deg) scaleY(0);
transform: rotate(45deg) scaleY(0); transform: rotate(45deg) scaleY(0);
width: 3px; width: 3px;
...@@ -558,7 +558,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -558,7 +558,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
z-index: -1; } z-index: -1; }
.el-checkbox__label { .el-checkbox__label {
display: inline-block; display: inline-block;
padding-left: 10px; padding-left: 8px;
line-height: 19px; line-height: 19px;
font-size: 14px; } font-size: 14px; }
.el-checkbox:last-of-type { .el-checkbox:last-of-type {
......
theme/date-picker.css
View file @ b537749d
...@@ -2907,7 +2907,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2907,7 +2907,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-textarea__inner { .el-textarea__inner {
display: block; display: block;
resize: vertical; resize: vertical;
padding: 5px 15px; padding: 5px 8px;
line-height: 1.5; line-height: 1.5;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -3016,7 +3016,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3016,7 +3016,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
outline: none; outline: none;
padding: 0 15px; padding: 0 8px;
-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);
width: 100%; } width: 100%; }
...@@ -3032,7 +3032,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3032,7 +3032,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: #B3B5BA; } border-color: #B3B5BA; }
.el-input__inner:focus { .el-input__inner:focus {
outline: none; outline: none;
border-color: #0885C6; } border-color: #0885C6;
-webkit-box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2);
box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2); }
.el-input__suffix { .el-input__suffix {
position: absolute; position: absolute;
height: 100%; height: 100%;
...@@ -3056,7 +3058,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3056,7 +3058,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
transition: all .3s; } transition: all .3s; }
.el-input__icon { .el-input__icon {
height: 100%; height: 100%;
width: 25px; width: 17px;
text-align: center; text-align: center;
-webkit-transition: all .3s; -webkit-transition: all .3s;
transition: all .3s; transition: all .3s;
...@@ -3127,14 +3129,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3127,14 +3129,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
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: #F6F6F6; background-color: #F8F8F8;
color: #00BBF2; color: #666666;
vertical-align: middle; vertical-align: middle;
display: table-cell; display: table-cell;
position: relative; position: relative;
border: 1px solid #E4E4E4; border: 1px solid #E4E4E4;
border-radius: 3px; border-radius: 3px;
padding: 0 20px;
width: 1px; width: 1px;
white-space: nowrap; } white-space: nowrap; }
.el-input-group__append:focus, .el-input-group__prepend:focus { .el-input-group__append:focus, .el-input-group__prepend:focus {
...@@ -3151,21 +3152,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3151,21 +3152,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-input-group__prepend div.el-select:hover .el-input__inner { .el-input-group__prepend div.el-select:hover .el-input__inner {
border-color: transparent; border-color: transparent;
background-color: transparent; background-color: transparent;
color: inherit; color: #666666;
border-top: 0; border-top: 0;
border-bottom: 0; } border-bottom: 0; }
.el-input-group__append .el-button, .el-input-group__append .el-button, .el-input-group__append .el-input, .el-input-group__prepend .el-button, .el-input-group__prepend .el-input {
.el-input-group__append .el-input, .el-input-group__prepend .el-button, font-size: 14px; }
.el-input-group__prepend .el-input {
font-size: inherit; }
.el-input-group__prepend { .el-input-group__prepend {
border-right: 0; border-right: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; } border-bottom-right-radius: 0;
padding: 0 8px;
font-size: 12px; }
.el-input-group__append { .el-input-group__append {
border-left: 0; border-left: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0;
padding: 0 16px; }
.el-input-group__append:hover {
border-color: #0885C6;
background-color: #EDF6FC;
color: #0885C6; }
.el-input-group--prepend .el-input__inner { .el-input-group--prepend .el-input__inner {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0; }
...@@ -3476,21 +3482,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3476,21 +3482,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: rgba(153, 153, 153, 0.5); } background-color: rgba(153, 153, 153, 0.5); }
.el-scrollbar__bar { .el-scrollbar__bar {
position: absolute; position: absolute;
right: 2px; right: 4px;
bottom: 2px; bottom: 4px;
z-index: 1; z-index: 1;
border-radius: 4px; border-radius: 4px;
opacity: 0; opacity: 0;
-webkit-transition: opacity 120ms ease-out; -webkit-transition: opacity 120ms ease-out;
transition: opacity 120ms ease-out; } transition: opacity 120ms ease-out; }
.el-scrollbar__bar.is-vertical { .el-scrollbar__bar.is-vertical {
width: 6px; width: 4px;
top: 2px; } top: 4px; }
.el-scrollbar__bar.is-vertical > div { .el-scrollbar__bar.is-vertical > div {
width: 100%; } width: 100%; }
.el-scrollbar__bar.is-horizontal { .el-scrollbar__bar.is-horizontal {
height: 6px; height: 4px;
left: 2px; } left: 8px; }
.el-scrollbar__bar.is-horizontal > div { .el-scrollbar__bar.is-horizontal > div {
height: 100%; } height: 100%; }
...@@ -3758,8 +3764,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3758,8 +3764,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
--------------------------*/ --------------------------*/
/* Break-point /* Break-point
--------------------------*/ --------------------------*/
.el-popper .popper__arrow, .el-popper .popper__arrow {
.el-popper .popper__arrow::after {
position: absolute; position: absolute;
display: block; display: block;
width: 0; width: 0;
...@@ -3767,72 +3772,63 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3767,72 +3772,63 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: transparent; border-color: transparent;
border-style: solid; } border-style: solid; }
.el-popper .popper__arrow {
border-width: 6px;
-webkit-filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03)); }
.el-popper .popper__arrow::after {
content: " ";
border-width: 6px; }
.el-popper[x-placement^="top"] { .el-popper[x-placement^="top"] {
margin-bottom: 12px; } margin-bottom: 4px; }
.el-popper[x-placement^="top"] .popper__arrow { .el-popper[x-placement^="top"] .popper__arrow {
bottom: -6px; bottom: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-color: #EBEBEB; border-top-color: #EBEBEB;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="top"] .popper__arrow::after { .el-popper[x-placement^="top"] .popper__arrow::after {
bottom: 1px; bottom: 1px;
margin-left: -6px; margin-left: -4px;
border-top-color: #FFFFFF; border-top-color: #FFFFFF;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="bottom"] { .el-popper[x-placement^="bottom"] {
margin-top: 12px; } margin-top: 4px; }
.el-popper[x-placement^="bottom"] .popper__arrow { .el-popper[x-placement^="bottom"] .popper__arrow {
top: -6px; top: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #EBEBEB; } border-bottom-color: #EBEBEB; }
.el-popper[x-placement^="bottom"] .popper__arrow::after { .el-popper[x-placement^="bottom"] .popper__arrow::after {
top: 1px; top: 1px;
margin-left: -6px; margin-left: -4px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #FFFFFF; } border-bottom-color: #FFFFFF; }
.el-popper[x-placement^="right"] { .el-popper[x-placement^="right"] {
margin-left: 12px; } margin-left: 4px; }
.el-popper[x-placement^="right"] .popper__arrow { .el-popper[x-placement^="right"] .popper__arrow {
top: 50%; top: 50%;
left: -6px; left: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-color: #EBEBEB; border-right-color: #EBEBEB;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="right"] .popper__arrow::after { .el-popper[x-placement^="right"] .popper__arrow::after {
bottom: -6px; bottom: -4px;
left: 1px; left: 1px;
border-right-color: #FFFFFF; border-right-color: #FFFFFF;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="left"] { .el-popper[x-placement^="left"] {
margin-right: 12px; } margin-right: 4px; }
.el-popper[x-placement^="left"] .popper__arrow { .el-popper[x-placement^="left"] .popper__arrow {
top: 50%; top: 50%;
right: -6px; right: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-width: 0; border-right-width: 0;
border-left-color: #EBEBEB; } border-left-color: #EBEBEB; }
.el-popper[x-placement^="left"] .popper__arrow::after { .el-popper[x-placement^="left"] .popper__arrow::after {
right: 1px; right: 1px;
bottom: -6px; bottom: -4px;
margin-left: -6px; margin-left: -4px;
border-right-width: 0; border-right-width: 0;
border-left-color: #FFFFFF; } border-left-color: #FFFFFF; }
theme/dropdown.css
View file @ b537749d
This diff is collapsed.
theme/index.css
View file @ b537749d
This diff is collapsed.
theme/input-number.css
View file @ b537749d
...@@ -535,7 +535,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -535,7 +535,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-textarea__inner { .el-textarea__inner {
display: block; display: block;
resize: vertical; resize: vertical;
padding: 5px 15px; padding: 5px 8px;
line-height: 1.5; line-height: 1.5;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -644,7 +644,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -644,7 +644,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
outline: none; outline: none;
padding: 0 15px; padding: 0 8px;
-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);
width: 100%; } width: 100%; }
...@@ -660,7 +660,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -660,7 +660,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: #B3B5BA; } border-color: #B3B5BA; }
.el-input__inner:focus { .el-input__inner:focus {
outline: none; outline: none;
border-color: #0885C6; } border-color: #0885C6;
-webkit-box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2);
box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2); }
.el-input__suffix { .el-input__suffix {
position: absolute; position: absolute;
height: 100%; height: 100%;
...@@ -684,7 +686,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -684,7 +686,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
transition: all .3s; } transition: all .3s; }
.el-input__icon { .el-input__icon {
height: 100%; height: 100%;
width: 25px; width: 17px;
text-align: center; text-align: center;
-webkit-transition: all .3s; -webkit-transition: all .3s;
transition: all .3s; transition: all .3s;
...@@ -755,14 +757,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -755,14 +757,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
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: #F6F6F6; background-color: #F8F8F8;
color: #00BBF2; color: #666666;
vertical-align: middle; vertical-align: middle;
display: table-cell; display: table-cell;
position: relative; position: relative;
border: 1px solid #E4E4E4; border: 1px solid #E4E4E4;
border-radius: 3px; border-radius: 3px;
padding: 0 20px;
width: 1px; width: 1px;
white-space: nowrap; } white-space: nowrap; }
.el-input-group__append:focus, .el-input-group__prepend:focus { .el-input-group__append:focus, .el-input-group__prepend:focus {
...@@ -779,21 +780,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -779,21 +780,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-input-group__prepend div.el-select:hover .el-input__inner { .el-input-group__prepend div.el-select:hover .el-input__inner {
border-color: transparent; border-color: transparent;
background-color: transparent; background-color: transparent;
color: inherit; color: #666666;
border-top: 0; border-top: 0;
border-bottom: 0; } border-bottom: 0; }
.el-input-group__append .el-button, .el-input-group__append .el-button, .el-input-group__append .el-input, .el-input-group__prepend .el-button, .el-input-group__prepend .el-input {
.el-input-group__append .el-input, .el-input-group__prepend .el-button, font-size: 14px; }
.el-input-group__prepend .el-input {
font-size: inherit; }
.el-input-group__prepend { .el-input-group__prepend {
border-right: 0; border-right: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; } border-bottom-right-radius: 0;
padding: 0 8px;
font-size: 12px; }
.el-input-group__append { .el-input-group__append {
border-left: 0; border-left: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0;
padding: 0 16px; }
.el-input-group__append:hover {
border-color: #0885C6;
background-color: #EDF6FC;
color: #0885C6; }
.el-input-group--prepend .el-input__inner { .el-input-group--prepend .el-input__inner {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0; }
......
theme/input.css
View file @ b537749d
...@@ -271,7 +271,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -271,7 +271,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-textarea__inner { .el-textarea__inner {
display: block; display: block;
resize: vertical; resize: vertical;
padding: 5px 15px; padding: 5px 8px;
line-height: 1.5; line-height: 1.5;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -380,7 +380,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -380,7 +380,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
outline: none; outline: none;
padding: 0 15px; padding: 0 8px;
-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);
width: 100%; } width: 100%; }
...@@ -396,7 +396,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -396,7 +396,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: #B3B5BA; } border-color: #B3B5BA; }
.el-input__inner:focus { .el-input__inner:focus {
outline: none; outline: none;
border-color: #0885C6; } border-color: #0885C6;
-webkit-box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2);
box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2); }
.el-input__suffix { .el-input__suffix {
position: absolute; position: absolute;
height: 100%; height: 100%;
...@@ -420,7 +422,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -420,7 +422,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
transition: all .3s; } transition: all .3s; }
.el-input__icon { .el-input__icon {
height: 100%; height: 100%;
width: 25px; width: 17px;
text-align: center; text-align: center;
-webkit-transition: all .3s; -webkit-transition: all .3s;
transition: all .3s; transition: all .3s;
...@@ -491,14 +493,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -491,14 +493,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
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: #F6F6F6; background-color: #F8F8F8;
color: #00BBF2; color: #666666;
vertical-align: middle; vertical-align: middle;
display: table-cell; display: table-cell;
position: relative; position: relative;
border: 1px solid #E4E4E4; border: 1px solid #E4E4E4;
border-radius: 3px; border-radius: 3px;
padding: 0 20px;
width: 1px; width: 1px;
white-space: nowrap; } white-space: nowrap; }
.el-input-group__append:focus, .el-input-group__prepend:focus { .el-input-group__append:focus, .el-input-group__prepend:focus {
...@@ -515,21 +516,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -515,21 +516,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-input-group__prepend div.el-select:hover .el-input__inner { .el-input-group__prepend div.el-select:hover .el-input__inner {
border-color: transparent; border-color: transparent;
background-color: transparent; background-color: transparent;
color: inherit; color: #666666;
border-top: 0; border-top: 0;
border-bottom: 0; } border-bottom: 0; }
.el-input-group__append .el-button, .el-input-group__append .el-button, .el-input-group__append .el-input, .el-input-group__prepend .el-button, .el-input-group__prepend .el-input {
.el-input-group__append .el-input, .el-input-group__prepend .el-button, font-size: 14px; }
.el-input-group__prepend .el-input {
font-size: inherit; }
.el-input-group__prepend { .el-input-group__prepend {
border-right: 0; border-right: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; } border-bottom-right-radius: 0;
padding: 0 8px;
font-size: 12px; }
.el-input-group__append { .el-input-group__append {
border-left: 0; border-left: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0;
padding: 0 16px; }
.el-input-group__append:hover {
border-color: #0885C6;
background-color: #EDF6FC;
color: #0885C6; }
.el-input-group--prepend .el-input__inner { .el-input-group--prepend .el-input__inner {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0; }
......
theme/link.css
View file @ b537749d
...@@ -291,7 +291,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -291,7 +291,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
right: 0; right: 0;
height: 0; height: 0;
bottom: 0; bottom: 0;
border-bottom: 1px solid #0994DC; } border-bottom: 1px solid #0885C6; }
.el-link.is-disabled { .el-link.is-disabled {
cursor: not-allowed; } cursor: not-allowed; }
.el-link [class*="el-icon-"] + span { .el-link [class*="el-icon-"] + span {
...@@ -299,9 +299,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -299,9 +299,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-link.el-link--default { .el-link.el-link--default {
color: #666666; } color: #666666; }
.el-link.el-link--default:hover { .el-link.el-link--default:hover {
color: #0994DC; } color: #0885C6; }
.el-link.el-link--default:after { .el-link.el-link--default:after {
border-color: #0994DC; } border-color: #0885C6; }
.el-link.el-link--default.is-disabled { .el-link.el-link--default.is-disabled {
color: #CCCCCC; } color: #CCCCCC; }
.el-link.el-link--primary { .el-link.el-link--primary {
......
theme/message-box.css
View file @ b537749d
This diff is collapsed.
theme/option-group.css
View file @ b537749d
...@@ -276,15 +276,15 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -276,15 +276,15 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
content: ''; content: '';
position: absolute; position: absolute;
display: block; display: block;
left: 20px; left: 8px;
right: 20px; right: 8px;
bottom: 12px; bottom: 12px;
height: 1px; height: 1px;
background: #D0D0D0; } background: #D0D0D0; }
.el-select-group__title { .el-select-group__title {
padding-left: 20px; padding-left: 8px;
font-size: 12px; font-size: 14px;
color: #00BBF2; color: #00BBF2;
line-height: 30px; } line-height: 30px; }
.el-select-group .el-select-dropdown__item { .el-select-group .el-select-dropdown__item {
padding-left: 20px; } padding-left: 8px; }
theme/option.css
View file @ b537749d
...@@ -264,14 +264,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -264,14 +264,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
--------------------------*/ --------------------------*/
.el-select-dropdown__item { .el-select-dropdown__item {
font-size: 14px; font-size: 14px;
padding: 0 20px; padding: 0 8px;
position: relative; position: relative;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: #666666; color: #666666;
height: 34px; height: 28px;
line-height: 34px; line-height: 28px;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
cursor: pointer; } cursor: pointer; }
...@@ -281,7 +281,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -281,7 +281,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-select-dropdown__item.is-disabled:hover { .el-select-dropdown__item.is-disabled:hover {
background-color: #FFFFFF; } background-color: #FFFFFF; }
.el-select-dropdown__item.hover, .el-select-dropdown__item:hover { .el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
background-color: #F6F6F6; } background-color: #EDF6FC;
color: #0885C6; }
.el-select-dropdown__item.selected { .el-select-dropdown__item.selected {
color: #0994DC; background-color: #D1ECFF;
font-weight: bold; } color: #0994DC; }
theme/pagination.css
View file @ b537749d
...@@ -1054,8 +1054,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1054,8 +1054,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
--------------------------*/ --------------------------*/
/* Break-point /* Break-point
--------------------------*/ --------------------------*/
.el-popper .popper__arrow, .el-popper .popper__arrow {
.el-popper .popper__arrow::after {
position: absolute; position: absolute;
display: block; display: block;
width: 0; width: 0;
...@@ -1063,92 +1062,84 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1063,92 +1062,84 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: transparent; border-color: transparent;
border-style: solid; } border-style: solid; }
.el-popper .popper__arrow {
border-width: 6px;
-webkit-filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03)); }
.el-popper .popper__arrow::after {
content: " ";
border-width: 6px; }
.el-popper[x-placement^="top"] { .el-popper[x-placement^="top"] {
margin-bottom: 12px; } margin-bottom: 4px; }
.el-popper[x-placement^="top"] .popper__arrow { .el-popper[x-placement^="top"] .popper__arrow {
bottom: -6px; bottom: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-color: #EBEBEB; border-top-color: #EBEBEB;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="top"] .popper__arrow::after { .el-popper[x-placement^="top"] .popper__arrow::after {
bottom: 1px; bottom: 1px;
margin-left: -6px; margin-left: -4px;
border-top-color: #FFFFFF; border-top-color: #FFFFFF;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="bottom"] { .el-popper[x-placement^="bottom"] {
margin-top: 12px; } margin-top: 4px; }
.el-popper[x-placement^="bottom"] .popper__arrow { .el-popper[x-placement^="bottom"] .popper__arrow {
top: -6px; top: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #EBEBEB; } border-bottom-color: #EBEBEB; }
.el-popper[x-placement^="bottom"] .popper__arrow::after { .el-popper[x-placement^="bottom"] .popper__arrow::after {
top: 1px; top: 1px;
margin-left: -6px; margin-left: -4px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #FFFFFF; } border-bottom-color: #FFFFFF; }
.el-popper[x-placement^="right"] { .el-popper[x-placement^="right"] {
margin-left: 12px; } margin-left: 4px; }
.el-popper[x-placement^="right"] .popper__arrow { .el-popper[x-placement^="right"] .popper__arrow {
top: 50%; top: 50%;
left: -6px; left: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-color: #EBEBEB; border-right-color: #EBEBEB;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="right"] .popper__arrow::after { .el-popper[x-placement^="right"] .popper__arrow::after {
bottom: -6px; bottom: -4px;
left: 1px; left: 1px;
border-right-color: #FFFFFF; border-right-color: #FFFFFF;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="left"] { .el-popper[x-placement^="left"] {
margin-right: 12px; } margin-right: 4px; }
.el-popper[x-placement^="left"] .popper__arrow { .el-popper[x-placement^="left"] .popper__arrow {
top: 50%; top: 50%;
right: -6px; right: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-width: 0; border-right-width: 0;
border-left-color: #EBEBEB; } border-left-color: #EBEBEB; }
.el-popper[x-placement^="left"] .popper__arrow::after { .el-popper[x-placement^="left"] .popper__arrow::after {
right: 1px; right: 1px;
bottom: -6px; bottom: -4px;
margin-left: -6px; margin-left: -4px;
border-right-width: 0; border-right-width: 0;
border-left-color: #FFFFFF; } border-left-color: #FFFFFF; }
.el-select-dropdown { .el-select-dropdown {
position: absolute; position: absolute;
z-index: 1001; z-index: 1001;
border: solid 1px #D0D0D0; border: solid 1px #B3B5BA;
border-radius: 3px; border-radius: 3px;
background-color: #FFFFFF; background-color: #FFFFFF;
-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);
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
margin: 5px 0; } margin: 4px 0; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected { .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
color: #0994DC; color: #0994DC;
background-color: #FFFFFF; } background-color: #D1ECFF; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover { .el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover {
background-color: #F6F6F6; } background-color: #EDF6FC;
color: #0885C6; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after { .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after {
position: absolute; position: absolute;
right: 20px; right: 20px;
...@@ -1162,7 +1153,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1162,7 +1153,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
padding: 0; } padding: 0; }
.el-select-dropdown__empty { .el-select-dropdown__empty {
padding: 10px 0; padding: 4px 0;
margin: 0; margin: 0;
text-align: center; text-align: center;
color: #999; color: #999;
...@@ -1173,7 +1164,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1173,7 +1164,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-select-dropdown__list { .el-select-dropdown__list {
list-style: none; list-style: none;
padding: 6px 0; padding: 4px 0;
margin: 0; margin: 0;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
...@@ -1451,7 +1442,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1451,7 +1442,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-textarea__inner { .el-textarea__inner {
display: block; display: block;
resize: vertical; resize: vertical;
padding: 5px 15px; padding: 5px 8px;
line-height: 1.5; line-height: 1.5;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -1560,7 +1551,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1560,7 +1551,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
outline: none; outline: none;
padding: 0 15px; padding: 0 8px;
-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);
width: 100%; } width: 100%; }
...@@ -1576,7 +1567,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1576,7 +1567,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: #B3B5BA; } border-color: #B3B5BA; }
.el-input__inner:focus { .el-input__inner:focus {
outline: none; outline: none;
border-color: #0885C6; } border-color: #0885C6;
-webkit-box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2);
box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2); }
.el-input__suffix { .el-input__suffix {
position: absolute; position: absolute;
height: 100%; height: 100%;
...@@ -1600,7 +1593,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1600,7 +1593,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
transition: all .3s; } transition: all .3s; }
.el-input__icon { .el-input__icon {
height: 100%; height: 100%;
width: 25px; width: 17px;
text-align: center; text-align: center;
-webkit-transition: all .3s; -webkit-transition: all .3s;
transition: all .3s; transition: all .3s;
...@@ -1671,14 +1664,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1671,14 +1664,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
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: #F6F6F6; background-color: #F8F8F8;
color: #00BBF2; color: #666666;
vertical-align: middle; vertical-align: middle;
display: table-cell; display: table-cell;
position: relative; position: relative;
border: 1px solid #E4E4E4; border: 1px solid #E4E4E4;
border-radius: 3px; border-radius: 3px;
padding: 0 20px;
width: 1px; width: 1px;
white-space: nowrap; } white-space: nowrap; }
.el-input-group__append:focus, .el-input-group__prepend:focus { .el-input-group__append:focus, .el-input-group__prepend:focus {
...@@ -1695,21 +1687,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1695,21 +1687,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-input-group__prepend div.el-select:hover .el-input__inner { .el-input-group__prepend div.el-select:hover .el-input__inner {
border-color: transparent; border-color: transparent;
background-color: transparent; background-color: transparent;
color: inherit; color: #666666;
border-top: 0; border-top: 0;
border-bottom: 0; } border-bottom: 0; }
.el-input-group__append .el-button, .el-input-group__append .el-button, .el-input-group__append .el-input, .el-input-group__prepend .el-button, .el-input-group__prepend .el-input {
.el-input-group__append .el-input, .el-input-group__prepend .el-button, font-size: 14px; }
.el-input-group__prepend .el-input {
font-size: inherit; }
.el-input-group__prepend { .el-input-group__prepend {
border-right: 0; border-right: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; } border-bottom-right-radius: 0;
padding: 0 8px;
font-size: 12px; }
.el-input-group__append { .el-input-group__append {
border-left: 0; border-left: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0;
padding: 0 16px; }
.el-input-group__append:hover {
border-color: #0885C6;
background-color: #EDF6FC;
color: #0885C6; }
.el-input-group--prepend .el-input__inner { .el-input-group--prepend .el-input__inner {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0; }
...@@ -2470,14 +2467,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2470,14 +2467,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
--------------------------*/ --------------------------*/
.el-select-dropdown__item { .el-select-dropdown__item {
font-size: 14px; font-size: 14px;
padding: 0 20px; padding: 0 8px;
position: relative; position: relative;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: #666666; color: #666666;
height: 34px; height: 28px;
line-height: 34px; line-height: 28px;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
cursor: pointer; } cursor: pointer; }
...@@ -2487,10 +2484,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2487,10 +2484,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-select-dropdown__item.is-disabled:hover { .el-select-dropdown__item.is-disabled:hover {
background-color: #FFFFFF; } background-color: #FFFFFF; }
.el-select-dropdown__item.hover, .el-select-dropdown__item:hover { .el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
background-color: #F6F6F6; } background-color: #EDF6FC;
color: #0885C6; }
.el-select-dropdown__item.selected { .el-select-dropdown__item.selected {
color: #0994DC; background-color: #D1ECFF;
font-weight: bold; } color: #0994DC; }
/* BEM support Func /* BEM support Func
-------------------------- */ -------------------------- */
...@@ -2770,18 +2768,18 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2770,18 +2768,18 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
content: ''; content: '';
position: absolute; position: absolute;
display: block; display: block;
left: 20px; left: 8px;
right: 20px; right: 8px;
bottom: 12px; bottom: 12px;
height: 1px; height: 1px;
background: #D0D0D0; } background: #D0D0D0; }
.el-select-group__title { .el-select-group__title {
padding-left: 20px; padding-left: 8px;
font-size: 12px; font-size: 14px;
color: #00BBF2; color: #00BBF2;
line-height: 30px; } line-height: 30px; }
.el-select-group .el-select-dropdown__item { .el-select-group .el-select-dropdown__item {
padding-left: 20px; } padding-left: 8px; }
/* BEM support Func /* BEM support Func
-------------------------- */ -------------------------- */
...@@ -3076,21 +3074,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3076,21 +3074,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: rgba(153, 153, 153, 0.5); } background-color: rgba(153, 153, 153, 0.5); }
.el-scrollbar__bar { .el-scrollbar__bar {
position: absolute; position: absolute;
right: 2px; right: 4px;
bottom: 2px; bottom: 4px;
z-index: 1; z-index: 1;
border-radius: 4px; border-radius: 4px;
opacity: 0; opacity: 0;
-webkit-transition: opacity 120ms ease-out; -webkit-transition: opacity 120ms ease-out;
transition: opacity 120ms ease-out; } transition: opacity 120ms ease-out; }
.el-scrollbar__bar.is-vertical { .el-scrollbar__bar.is-vertical {
width: 6px; width: 4px;
top: 2px; } top: 4px; }
.el-scrollbar__bar.is-vertical > div { .el-scrollbar__bar.is-vertical > div {
width: 100%; } width: 100%; }
.el-scrollbar__bar.is-horizontal { .el-scrollbar__bar.is-horizontal {
height: 6px; height: 4px;
left: 2px; } left: 8px; }
.el-scrollbar__bar.is-horizontal > div { .el-scrollbar__bar.is-horizontal > div {
height: 100%; } height: 100%; }
......
theme/popover.css
View file @ b537749d
...@@ -526,8 +526,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -526,8 +526,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
--------------------------*/ --------------------------*/
/* Break-point /* Break-point
--------------------------*/ --------------------------*/
.el-popper .popper__arrow, .el-popper .popper__arrow {
.el-popper .popper__arrow::after {
position: absolute; position: absolute;
display: block; display: block;
width: 0; width: 0;
...@@ -535,73 +534,64 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -535,73 +534,64 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: transparent; border-color: transparent;
border-style: solid; } border-style: solid; }
.el-popper .popper__arrow {
border-width: 6px;
-webkit-filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03)); }
.el-popper .popper__arrow::after {
content: " ";
border-width: 6px; }
.el-popper[x-placement^="top"] { .el-popper[x-placement^="top"] {
margin-bottom: 12px; } margin-bottom: 4px; }
.el-popper[x-placement^="top"] .popper__arrow { .el-popper[x-placement^="top"] .popper__arrow {
bottom: -6px; bottom: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-color: #EBEBEB; border-top-color: #EBEBEB;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="top"] .popper__arrow::after { .el-popper[x-placement^="top"] .popper__arrow::after {
bottom: 1px; bottom: 1px;
margin-left: -6px; margin-left: -4px;
border-top-color: #FFFFFF; border-top-color: #FFFFFF;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="bottom"] { .el-popper[x-placement^="bottom"] {
margin-top: 12px; } margin-top: 4px; }
.el-popper[x-placement^="bottom"] .popper__arrow { .el-popper[x-placement^="bottom"] .popper__arrow {
top: -6px; top: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #EBEBEB; } border-bottom-color: #EBEBEB; }
.el-popper[x-placement^="bottom"] .popper__arrow::after { .el-popper[x-placement^="bottom"] .popper__arrow::after {
top: 1px; top: 1px;
margin-left: -6px; margin-left: -4px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #FFFFFF; } border-bottom-color: #FFFFFF; }
.el-popper[x-placement^="right"] { .el-popper[x-placement^="right"] {
margin-left: 12px; } margin-left: 4px; }
.el-popper[x-placement^="right"] .popper__arrow { .el-popper[x-placement^="right"] .popper__arrow {
top: 50%; top: 50%;
left: -6px; left: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-color: #EBEBEB; border-right-color: #EBEBEB;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="right"] .popper__arrow::after { .el-popper[x-placement^="right"] .popper__arrow::after {
bottom: -6px; bottom: -4px;
left: 1px; left: 1px;
border-right-color: #FFFFFF; border-right-color: #FFFFFF;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="left"] { .el-popper[x-placement^="left"] {
margin-right: 12px; } margin-right: 4px; }
.el-popper[x-placement^="left"] .popper__arrow { .el-popper[x-placement^="left"] .popper__arrow {
top: 50%; top: 50%;
right: -6px; right: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-width: 0; border-right-width: 0;
border-left-color: #EBEBEB; } border-left-color: #EBEBEB; }
.el-popper[x-placement^="left"] .popper__arrow::after { .el-popper[x-placement^="left"] .popper__arrow::after {
right: 1px; right: 1px;
bottom: -6px; bottom: -4px;
margin-left: -6px; margin-left: -4px;
border-right-width: 0; border-right-width: 0;
border-left-color: #FFFFFF; } border-left-color: #FFFFFF; }
......
theme/popper.css
View file @ b537749d
...@@ -262,8 +262,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -262,8 +262,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
--------------------------*/ --------------------------*/
/* Break-point /* Break-point
--------------------------*/ --------------------------*/
.el-popper .popper__arrow, .el-popper .popper__arrow {
.el-popper .popper__arrow::after {
position: absolute; position: absolute;
display: block; display: block;
width: 0; width: 0;
...@@ -271,72 +270,63 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -271,72 +270,63 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: transparent; border-color: transparent;
border-style: solid; } border-style: solid; }
.el-popper .popper__arrow {
border-width: 6px;
-webkit-filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03)); }
.el-popper .popper__arrow::after {
content: " ";
border-width: 6px; }
.el-popper[x-placement^="top"] { .el-popper[x-placement^="top"] {
margin-bottom: 12px; } margin-bottom: 4px; }
.el-popper[x-placement^="top"] .popper__arrow { .el-popper[x-placement^="top"] .popper__arrow {
bottom: -6px; bottom: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-color: #EBEBEB; border-top-color: #EBEBEB;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="top"] .popper__arrow::after { .el-popper[x-placement^="top"] .popper__arrow::after {
bottom: 1px; bottom: 1px;
margin-left: -6px; margin-left: -4px;
border-top-color: #FFFFFF; border-top-color: #FFFFFF;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="bottom"] { .el-popper[x-placement^="bottom"] {
margin-top: 12px; } margin-top: 4px; }
.el-popper[x-placement^="bottom"] .popper__arrow { .el-popper[x-placement^="bottom"] .popper__arrow {
top: -6px; top: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #EBEBEB; } border-bottom-color: #EBEBEB; }
.el-popper[x-placement^="bottom"] .popper__arrow::after { .el-popper[x-placement^="bottom"] .popper__arrow::after {
top: 1px; top: 1px;
margin-left: -6px; margin-left: -4px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #FFFFFF; } border-bottom-color: #FFFFFF; }
.el-popper[x-placement^="right"] { .el-popper[x-placement^="right"] {
margin-left: 12px; } margin-left: 4px; }
.el-popper[x-placement^="right"] .popper__arrow { .el-popper[x-placement^="right"] .popper__arrow {
top: 50%; top: 50%;
left: -6px; left: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-color: #EBEBEB; border-right-color: #EBEBEB;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="right"] .popper__arrow::after { .el-popper[x-placement^="right"] .popper__arrow::after {
bottom: -6px; bottom: -4px;
left: 1px; left: 1px;
border-right-color: #FFFFFF; border-right-color: #FFFFFF;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="left"] { .el-popper[x-placement^="left"] {
margin-right: 12px; } margin-right: 4px; }
.el-popper[x-placement^="left"] .popper__arrow { .el-popper[x-placement^="left"] .popper__arrow {
top: 50%; top: 50%;
right: -6px; right: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-width: 0; border-right-width: 0;
border-left-color: #EBEBEB; } border-left-color: #EBEBEB; }
.el-popper[x-placement^="left"] .popper__arrow::after { .el-popper[x-placement^="left"] .popper__arrow::after {
right: 1px; right: 1px;
bottom: -6px; bottom: -4px;
margin-left: -6px; margin-left: -4px;
border-right-width: 0; border-right-width: 0;
border-left-color: #FFFFFF; } border-left-color: #FFFFFF; }
theme/radio.css
View file @ b537749d
...@@ -468,16 +468,17 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -468,16 +468,17 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: #F8F8F8; background-color: #F8F8F8;
border-color: #EBEBEB; } border-color: #EBEBEB; }
.el-radio__input.is-disabled.is-checked .el-radio__inner::after { .el-radio__input.is-disabled.is-checked .el-radio__inner::after {
background-color: #CCCCCC; } border-color: #CCCCCC;
background-color: #F8F8F8; }
.el-radio__input.is-disabled + span.el-radio__label { .el-radio__input.is-disabled + span.el-radio__label {
color: #CCCCCC; color: #333333;
cursor: not-allowed; } cursor: not-allowed; }
.el-radio__input.is-checked .el-radio__inner { .el-radio__input.is-checked .el-radio__inner {
border-color: #0994DC; border-color: #0994DC;
background: #0994DC; } background: #0994DC; }
.el-radio__input.is-checked .el-radio__inner::after { .el-radio__input.is-checked .el-radio__inner::after {
-webkit-transform: translate(-50%, -50%) scale(1); -webkit-transform: rotate(45deg) scaleY(1);
transform: translate(-50%, -50%) scale(1); } transform: rotate(45deg) scaleY(1); }
.el-radio__input.is-checked + .el-radio__label { .el-radio__input.is-checked + .el-radio__label {
color: #333333; } color: #333333; }
.el-radio__input.is-focus .el-radio__inner { .el-radio__input.is-focus .el-radio__inner {
...@@ -496,20 +497,25 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -496,20 +497,25 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-radio__inner:hover { .el-radio__inner:hover {
border-color: #0885C6; } border-color: #0885C6; }
.el-radio__inner::after { .el-radio__inner::after {
width: 4px; -webkit-box-sizing: content-box;
height: 4px; box-sizing: content-box;
border-radius: 100%;
background-color: #FFFFFF;
content: ""; content: "";
border: 1px solid #FFFFFF;
border-left: 0;
border-top: 0;
height: 7px;
left: 5px;
position: absolute; position: absolute;
left: 50%; top: 2px;
top: 50%; -webkit-transform: rotate(45deg) scaleY(0);
-webkit-transform: translate(-50%, -50%) scale(0); transform: rotate(45deg) scaleY(0);
transform: translate(-50%, -50%) scale(0); width: 3px;
-webkit-transition: -webkit-transform .15s ease-in; -webkit-transition: -webkit-transform .15s ease-in .05s;
transition: -webkit-transform .15s ease-in; transition: -webkit-transform .15s ease-in .05s;
transition: transform .15s ease-in; transition: transform .15s ease-in .05s;
transition: transform .15s ease-in, -webkit-transform .15s ease-in; } transition: transform .15s ease-in .05s, -webkit-transform .15s ease-in .05s;
-webkit-transform-origin: center;
transform-origin: center; }
.el-radio__original { .el-radio__original {
opacity: 0; opacity: 0;
outline: none; outline: none;
...@@ -527,4 +533,4 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -527,4 +533,4 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
box-shadow: 0 0 2px 2px #0885C6; } box-shadow: 0 0 2px 2px #0885C6; }
.el-radio__label { .el-radio__label {
font-size: 14px; font-size: 14px;
padding-left: 10px; } padding-left: 8px; }
theme/scrollbar.css
View file @ b537749d
...@@ -291,20 +291,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -291,20 +291,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: rgba(153, 153, 153, 0.5); } background-color: rgba(153, 153, 153, 0.5); }
.el-scrollbar__bar { .el-scrollbar__bar {
position: absolute; position: absolute;
right: 2px; right: 4px;
bottom: 2px; bottom: 4px;
z-index: 1; z-index: 1;
border-radius: 4px; border-radius: 4px;
opacity: 0; opacity: 0;
-webkit-transition: opacity 120ms ease-out; -webkit-transition: opacity 120ms ease-out;
transition: opacity 120ms ease-out; } transition: opacity 120ms ease-out; }
.el-scrollbar__bar.is-vertical { .el-scrollbar__bar.is-vertical {
width: 6px; width: 4px;
top: 2px; } top: 4px; }
.el-scrollbar__bar.is-vertical > div { .el-scrollbar__bar.is-vertical > div {
width: 100%; } width: 100%; }
.el-scrollbar__bar.is-horizontal { .el-scrollbar__bar.is-horizontal {
height: 6px; height: 4px;
left: 2px; } left: 8px; }
.el-scrollbar__bar.is-horizontal > div { .el-scrollbar__bar.is-horizontal > div {
height: 100%; } height: 100%; }
theme/select-dropdown.css
View file @ b537749d
...@@ -526,8 +526,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -526,8 +526,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
--------------------------*/ --------------------------*/
/* Break-point /* Break-point
--------------------------*/ --------------------------*/
.el-popper .popper__arrow, .el-popper .popper__arrow {
.el-popper .popper__arrow::after {
position: absolute; position: absolute;
display: block; display: block;
width: 0; width: 0;
...@@ -535,92 +534,84 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -535,92 +534,84 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: transparent; border-color: transparent;
border-style: solid; } border-style: solid; }
.el-popper .popper__arrow {
border-width: 6px;
-webkit-filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03)); }
.el-popper .popper__arrow::after {
content: " ";
border-width: 6px; }
.el-popper[x-placement^="top"] { .el-popper[x-placement^="top"] {
margin-bottom: 12px; } margin-bottom: 4px; }
.el-popper[x-placement^="top"] .popper__arrow { .el-popper[x-placement^="top"] .popper__arrow {
bottom: -6px; bottom: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-color: #EBEBEB; border-top-color: #EBEBEB;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="top"] .popper__arrow::after { .el-popper[x-placement^="top"] .popper__arrow::after {
bottom: 1px; bottom: 1px;
margin-left: -6px; margin-left: -4px;
border-top-color: #FFFFFF; border-top-color: #FFFFFF;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="bottom"] { .el-popper[x-placement^="bottom"] {
margin-top: 12px; } margin-top: 4px; }
.el-popper[x-placement^="bottom"] .popper__arrow { .el-popper[x-placement^="bottom"] .popper__arrow {
top: -6px; top: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #EBEBEB; } border-bottom-color: #EBEBEB; }
.el-popper[x-placement^="bottom"] .popper__arrow::after { .el-popper[x-placement^="bottom"] .popper__arrow::after {
top: 1px; top: 1px;
margin-left: -6px; margin-left: -4px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #FFFFFF; } border-bottom-color: #FFFFFF; }
.el-popper[x-placement^="right"] { .el-popper[x-placement^="right"] {
margin-left: 12px; } margin-left: 4px; }
.el-popper[x-placement^="right"] .popper__arrow { .el-popper[x-placement^="right"] .popper__arrow {
top: 50%; top: 50%;
left: -6px; left: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-color: #EBEBEB; border-right-color: #EBEBEB;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="right"] .popper__arrow::after { .el-popper[x-placement^="right"] .popper__arrow::after {
bottom: -6px; bottom: -4px;
left: 1px; left: 1px;
border-right-color: #FFFFFF; border-right-color: #FFFFFF;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="left"] { .el-popper[x-placement^="left"] {
margin-right: 12px; } margin-right: 4px; }
.el-popper[x-placement^="left"] .popper__arrow { .el-popper[x-placement^="left"] .popper__arrow {
top: 50%; top: 50%;
right: -6px; right: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-width: 0; border-right-width: 0;
border-left-color: #EBEBEB; } border-left-color: #EBEBEB; }
.el-popper[x-placement^="left"] .popper__arrow::after { .el-popper[x-placement^="left"] .popper__arrow::after {
right: 1px; right: 1px;
bottom: -6px; bottom: -4px;
margin-left: -6px; margin-left: -4px;
border-right-width: 0; border-right-width: 0;
border-left-color: #FFFFFF; } border-left-color: #FFFFFF; }
.el-select-dropdown { .el-select-dropdown {
position: absolute; position: absolute;
z-index: 1001; z-index: 1001;
border: solid 1px #D0D0D0; border: solid 1px #B3B5BA;
border-radius: 3px; border-radius: 3px;
background-color: #FFFFFF; background-color: #FFFFFF;
-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);
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
margin: 5px 0; } margin: 4px 0; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected { .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
color: #0994DC; color: #0994DC;
background-color: #FFFFFF; } background-color: #D1ECFF; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover { .el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover {
background-color: #F6F6F6; } background-color: #EDF6FC;
color: #0885C6; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after { .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after {
position: absolute; position: absolute;
right: 20px; right: 20px;
...@@ -634,7 +625,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -634,7 +625,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
padding: 0; } padding: 0; }
.el-select-dropdown__empty { .el-select-dropdown__empty {
padding: 10px 0; padding: 4px 0;
margin: 0; margin: 0;
text-align: center; text-align: center;
color: #999; color: #999;
...@@ -645,7 +636,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -645,7 +636,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-select-dropdown__list { .el-select-dropdown__list {
list-style: none; list-style: none;
padding: 6px 0; padding: 4px 0;
margin: 0; margin: 0;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
theme/select.css
View file @ b537749d
...@@ -790,8 +790,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -790,8 +790,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
--------------------------*/ --------------------------*/
/* Break-point /* Break-point
--------------------------*/ --------------------------*/
.el-popper .popper__arrow, .el-popper .popper__arrow {
.el-popper .popper__arrow::after {
position: absolute; position: absolute;
display: block; display: block;
width: 0; width: 0;
...@@ -799,92 +798,84 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -799,92 +798,84 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: transparent; border-color: transparent;
border-style: solid; } border-style: solid; }
.el-popper .popper__arrow {
border-width: 6px;
-webkit-filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03)); }
.el-popper .popper__arrow::after {
content: " ";
border-width: 6px; }
.el-popper[x-placement^="top"] { .el-popper[x-placement^="top"] {
margin-bottom: 12px; } margin-bottom: 4px; }
.el-popper[x-placement^="top"] .popper__arrow { .el-popper[x-placement^="top"] .popper__arrow {
bottom: -6px; bottom: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-color: #EBEBEB; border-top-color: #EBEBEB;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="top"] .popper__arrow::after { .el-popper[x-placement^="top"] .popper__arrow::after {
bottom: 1px; bottom: 1px;
margin-left: -6px; margin-left: -4px;
border-top-color: #FFFFFF; border-top-color: #FFFFFF;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="bottom"] { .el-popper[x-placement^="bottom"] {
margin-top: 12px; } margin-top: 4px; }
.el-popper[x-placement^="bottom"] .popper__arrow { .el-popper[x-placement^="bottom"] .popper__arrow {
top: -6px; top: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #EBEBEB; } border-bottom-color: #EBEBEB; }
.el-popper[x-placement^="bottom"] .popper__arrow::after { .el-popper[x-placement^="bottom"] .popper__arrow::after {
top: 1px; top: 1px;
margin-left: -6px; margin-left: -4px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #FFFFFF; } border-bottom-color: #FFFFFF; }
.el-popper[x-placement^="right"] { .el-popper[x-placement^="right"] {
margin-left: 12px; } margin-left: 4px; }
.el-popper[x-placement^="right"] .popper__arrow { .el-popper[x-placement^="right"] .popper__arrow {
top: 50%; top: 50%;
left: -6px; left: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-color: #EBEBEB; border-right-color: #EBEBEB;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="right"] .popper__arrow::after { .el-popper[x-placement^="right"] .popper__arrow::after {
bottom: -6px; bottom: -4px;
left: 1px; left: 1px;
border-right-color: #FFFFFF; border-right-color: #FFFFFF;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="left"] { .el-popper[x-placement^="left"] {
margin-right: 12px; } margin-right: 4px; }
.el-popper[x-placement^="left"] .popper__arrow { .el-popper[x-placement^="left"] .popper__arrow {
top: 50%; top: 50%;
right: -6px; right: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-width: 0; border-right-width: 0;
border-left-color: #EBEBEB; } border-left-color: #EBEBEB; }
.el-popper[x-placement^="left"] .popper__arrow::after { .el-popper[x-placement^="left"] .popper__arrow::after {
right: 1px; right: 1px;
bottom: -6px; bottom: -4px;
margin-left: -6px; margin-left: -4px;
border-right-width: 0; border-right-width: 0;
border-left-color: #FFFFFF; } border-left-color: #FFFFFF; }
.el-select-dropdown { .el-select-dropdown {
position: absolute; position: absolute;
z-index: 1001; z-index: 1001;
border: solid 1px #D0D0D0; border: solid 1px #B3B5BA;
border-radius: 3px; border-radius: 3px;
background-color: #FFFFFF; background-color: #FFFFFF;
-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);
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
margin: 5px 0; } margin: 4px 0; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected { .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
color: #0994DC; color: #0994DC;
background-color: #FFFFFF; } background-color: #D1ECFF; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover { .el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover {
background-color: #F6F6F6; } background-color: #EDF6FC;
color: #0885C6; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after { .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after {
position: absolute; position: absolute;
right: 20px; right: 20px;
...@@ -898,7 +889,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -898,7 +889,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
padding: 0; } padding: 0; }
.el-select-dropdown__empty { .el-select-dropdown__empty {
padding: 10px 0; padding: 4px 0;
margin: 0; margin: 0;
text-align: center; text-align: center;
color: #999; color: #999;
...@@ -909,7 +900,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -909,7 +900,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-select-dropdown__list { .el-select-dropdown__list {
list-style: none; list-style: none;
padding: 6px 0; padding: 4px 0;
margin: 0; margin: 0;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
...@@ -1187,7 +1178,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1187,7 +1178,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-textarea__inner { .el-textarea__inner {
display: block; display: block;
resize: vertical; resize: vertical;
padding: 5px 15px; padding: 5px 8px;
line-height: 1.5; line-height: 1.5;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -1296,7 +1287,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1296,7 +1287,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
outline: none; outline: none;
padding: 0 15px; padding: 0 8px;
-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);
width: 100%; } width: 100%; }
...@@ -1312,7 +1303,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1312,7 +1303,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: #B3B5BA; } border-color: #B3B5BA; }
.el-input__inner:focus { .el-input__inner:focus {
outline: none; outline: none;
border-color: #0885C6; } border-color: #0885C6;
-webkit-box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2);
box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2); }
.el-input__suffix { .el-input__suffix {
position: absolute; position: absolute;
height: 100%; height: 100%;
...@@ -1336,7 +1329,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1336,7 +1329,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
transition: all .3s; } transition: all .3s; }
.el-input__icon { .el-input__icon {
height: 100%; height: 100%;
width: 25px; width: 17px;
text-align: center; text-align: center;
-webkit-transition: all .3s; -webkit-transition: all .3s;
transition: all .3s; transition: all .3s;
...@@ -1407,14 +1400,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1407,14 +1400,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
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: #F6F6F6; background-color: #F8F8F8;
color: #00BBF2; color: #666666;
vertical-align: middle; vertical-align: middle;
display: table-cell; display: table-cell;
position: relative; position: relative;
border: 1px solid #E4E4E4; border: 1px solid #E4E4E4;
border-radius: 3px; border-radius: 3px;
padding: 0 20px;
width: 1px; width: 1px;
white-space: nowrap; } white-space: nowrap; }
.el-input-group__append:focus, .el-input-group__prepend:focus { .el-input-group__append:focus, .el-input-group__prepend:focus {
...@@ -1431,21 +1423,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1431,21 +1423,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-input-group__prepend div.el-select:hover .el-input__inner { .el-input-group__prepend div.el-select:hover .el-input__inner {
border-color: transparent; border-color: transparent;
background-color: transparent; background-color: transparent;
color: inherit; color: #666666;
border-top: 0; border-top: 0;
border-bottom: 0; } border-bottom: 0; }
.el-input-group__append .el-button, .el-input-group__append .el-button, .el-input-group__append .el-input, .el-input-group__prepend .el-button, .el-input-group__prepend .el-input {
.el-input-group__append .el-input, .el-input-group__prepend .el-button, font-size: 14px; }
.el-input-group__prepend .el-input {
font-size: inherit; }
.el-input-group__prepend { .el-input-group__prepend {
border-right: 0; border-right: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; } border-bottom-right-radius: 0;
padding: 0 8px;
font-size: 12px; }
.el-input-group__append { .el-input-group__append {
border-left: 0; border-left: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0;
padding: 0 16px; }
.el-input-group__append:hover {
border-color: #0885C6;
background-color: #EDF6FC;
color: #0885C6; }
.el-input-group--prepend .el-input__inner { .el-input-group--prepend .el-input__inner {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0; }
...@@ -2206,14 +2203,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2206,14 +2203,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
--------------------------*/ --------------------------*/
.el-select-dropdown__item { .el-select-dropdown__item {
font-size: 14px; font-size: 14px;
padding: 0 20px; padding: 0 8px;
position: relative; position: relative;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
color: #666666; color: #666666;
height: 34px; height: 28px;
line-height: 34px; line-height: 28px;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
cursor: pointer; } cursor: pointer; }
...@@ -2223,10 +2220,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2223,10 +2220,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-select-dropdown__item.is-disabled:hover { .el-select-dropdown__item.is-disabled:hover {
background-color: #FFFFFF; } background-color: #FFFFFF; }
.el-select-dropdown__item.hover, .el-select-dropdown__item:hover { .el-select-dropdown__item.hover, .el-select-dropdown__item:hover {
background-color: #F6F6F6; } background-color: #EDF6FC;
color: #0885C6; }
.el-select-dropdown__item.selected { .el-select-dropdown__item.selected {
color: #0994DC; background-color: #D1ECFF;
font-weight: bold; } color: #0994DC; }
/* BEM support Func /* BEM support Func
-------------------------- */ -------------------------- */
...@@ -2506,18 +2504,18 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2506,18 +2504,18 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
content: ''; content: '';
position: absolute; position: absolute;
display: block; display: block;
left: 20px; left: 8px;
right: 20px; right: 8px;
bottom: 12px; bottom: 12px;
height: 1px; height: 1px;
background: #D0D0D0; } background: #D0D0D0; }
.el-select-group__title { .el-select-group__title {
padding-left: 20px; padding-left: 8px;
font-size: 12px; font-size: 14px;
color: #00BBF2; color: #00BBF2;
line-height: 30px; } line-height: 30px; }
.el-select-group .el-select-dropdown__item { .el-select-group .el-select-dropdown__item {
padding-left: 20px; } padding-left: 8px; }
/* BEM support Func /* BEM support Func
-------------------------- */ -------------------------- */
...@@ -2812,21 +2810,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2812,21 +2810,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: rgba(153, 153, 153, 0.5); } background-color: rgba(153, 153, 153, 0.5); }
.el-scrollbar__bar { .el-scrollbar__bar {
position: absolute; position: absolute;
right: 2px; right: 4px;
bottom: 2px; bottom: 4px;
z-index: 1; z-index: 1;
border-radius: 4px; border-radius: 4px;
opacity: 0; opacity: 0;
-webkit-transition: opacity 120ms ease-out; -webkit-transition: opacity 120ms ease-out;
transition: opacity 120ms ease-out; } transition: opacity 120ms ease-out; }
.el-scrollbar__bar.is-vertical { .el-scrollbar__bar.is-vertical {
width: 6px; width: 4px;
top: 2px; } top: 4px; }
.el-scrollbar__bar.is-vertical > div { .el-scrollbar__bar.is-vertical > div {
width: 100%; } width: 100%; }
.el-scrollbar__bar.is-horizontal { .el-scrollbar__bar.is-horizontal {
height: 6px; height: 4px;
left: 2px; } left: 8px; }
.el-scrollbar__bar.is-horizontal > div { .el-scrollbar__bar.is-horizontal > div {
height: 100%; } height: 100%; }
......
theme/slider.css
View file @ b537749d
...@@ -672,7 +672,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -672,7 +672,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-textarea__inner { .el-textarea__inner {
display: block; display: block;
resize: vertical; resize: vertical;
padding: 5px 15px; padding: 5px 8px;
line-height: 1.5; line-height: 1.5;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -781,7 +781,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -781,7 +781,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
outline: none; outline: none;
padding: 0 15px; padding: 0 8px;
-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);
width: 100%; } width: 100%; }
...@@ -797,7 +797,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -797,7 +797,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: #B3B5BA; } border-color: #B3B5BA; }
.el-input__inner:focus { .el-input__inner:focus {
outline: none; outline: none;
border-color: #0885C6; } border-color: #0885C6;
-webkit-box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2);
box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2); }
.el-input__suffix { .el-input__suffix {
position: absolute; position: absolute;
height: 100%; height: 100%;
...@@ -821,7 +823,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -821,7 +823,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
transition: all .3s; } transition: all .3s; }
.el-input__icon { .el-input__icon {
height: 100%; height: 100%;
width: 25px; width: 17px;
text-align: center; text-align: center;
-webkit-transition: all .3s; -webkit-transition: all .3s;
transition: all .3s; transition: all .3s;
...@@ -892,14 +894,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -892,14 +894,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
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: #F6F6F6; background-color: #F8F8F8;
color: #00BBF2; color: #666666;
vertical-align: middle; vertical-align: middle;
display: table-cell; display: table-cell;
position: relative; position: relative;
border: 1px solid #E4E4E4; border: 1px solid #E4E4E4;
border-radius: 3px; border-radius: 3px;
padding: 0 20px;
width: 1px; width: 1px;
white-space: nowrap; } white-space: nowrap; }
.el-input-group__append:focus, .el-input-group__prepend:focus { .el-input-group__append:focus, .el-input-group__prepend:focus {
...@@ -916,21 +917,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -916,21 +917,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-input-group__prepend div.el-select:hover .el-input__inner { .el-input-group__prepend div.el-select:hover .el-input__inner {
border-color: transparent; border-color: transparent;
background-color: transparent; background-color: transparent;
color: inherit; color: #666666;
border-top: 0; border-top: 0;
border-bottom: 0; } border-bottom: 0; }
.el-input-group__append .el-button, .el-input-group__append .el-button, .el-input-group__append .el-input, .el-input-group__prepend .el-button, .el-input-group__prepend .el-input {
.el-input-group__append .el-input, .el-input-group__prepend .el-button, font-size: 14px; }
.el-input-group__prepend .el-input {
font-size: inherit; }
.el-input-group__prepend { .el-input-group__prepend {
border-right: 0; border-right: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; } border-bottom-right-radius: 0;
padding: 0 8px;
font-size: 12px; }
.el-input-group__append { .el-input-group__append {
border-left: 0; border-left: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0;
padding: 0 16px; }
.el-input-group__append:hover {
border-color: #0885C6;
background-color: #EDF6FC;
color: #0885C6; }
.el-input-group--prepend .el-input__inner { .el-input-group--prepend .el-input__inner {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0; }
......
theme/table-column.css
View file @ b537749d
...@@ -620,7 +620,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -620,7 +620,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: #CCCCCC; background-color: #CCCCCC;
border-color: #CCCCCC; } border-color: #CCCCCC; }
.el-checkbox__input.is-disabled + span.el-checkbox__label { .el-checkbox__input.is-disabled + span.el-checkbox__label {
color: #CCCCCC; color: #333333;
cursor: not-allowed; } cursor: not-allowed; }
.el-checkbox__input.is-checked .el-checkbox__inner { .el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #0994DC; background-color: #0994DC;
...@@ -673,9 +673,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -673,9 +673,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-left: 0; border-left: 0;
border-top: 0; border-top: 0;
height: 7px; height: 7px;
left: 4px; left: 5px;
position: absolute; position: absolute;
top: 1px; top: 2px;
-webkit-transform: rotate(45deg) scaleY(0); -webkit-transform: rotate(45deg) scaleY(0);
transform: rotate(45deg) scaleY(0); transform: rotate(45deg) scaleY(0);
width: 3px; width: 3px;
...@@ -695,7 +695,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -695,7 +695,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
z-index: -1; } z-index: -1; }
.el-checkbox__label { .el-checkbox__label {
display: inline-block; display: inline-block;
padding-left: 10px; padding-left: 8px;
line-height: 19px; line-height: 19px;
font-size: 14px; } font-size: 14px; }
.el-checkbox:last-of-type { .el-checkbox:last-of-type {
......
theme/table.css
View file @ b537749d
...@@ -620,7 +620,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -620,7 +620,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: #CCCCCC; background-color: #CCCCCC;
border-color: #CCCCCC; } border-color: #CCCCCC; }
.el-checkbox__input.is-disabled + span.el-checkbox__label { .el-checkbox__input.is-disabled + span.el-checkbox__label {
color: #CCCCCC; color: #333333;
cursor: not-allowed; } cursor: not-allowed; }
.el-checkbox__input.is-checked .el-checkbox__inner { .el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #0994DC; background-color: #0994DC;
...@@ -673,9 +673,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -673,9 +673,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-left: 0; border-left: 0;
border-top: 0; border-top: 0;
height: 7px; height: 7px;
left: 4px; left: 5px;
position: absolute; position: absolute;
top: 1px; top: 2px;
-webkit-transform: rotate(45deg) scaleY(0); -webkit-transform: rotate(45deg) scaleY(0);
transform: rotate(45deg) scaleY(0); transform: rotate(45deg) scaleY(0);
width: 3px; width: 3px;
...@@ -695,7 +695,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -695,7 +695,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
z-index: -1; } z-index: -1; }
.el-checkbox__label { .el-checkbox__label {
display: inline-block; display: inline-block;
padding-left: 10px; padding-left: 8px;
line-height: 19px; line-height: 19px;
font-size: 14px; } font-size: 14px; }
.el-checkbox:last-of-type { .el-checkbox:last-of-type {
......
theme/time-picker.css
View file @ b537749d
...@@ -1683,7 +1683,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1683,7 +1683,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-textarea__inner { .el-textarea__inner {
display: block; display: block;
resize: vertical; resize: vertical;
padding: 5px 15px; padding: 5px 8px;
line-height: 1.5; line-height: 1.5;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
...@@ -1792,7 +1792,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1792,7 +1792,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
outline: none; outline: none;
padding: 0 15px; padding: 0 8px;
-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);
width: 100%; } width: 100%; }
...@@ -1808,7 +1808,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1808,7 +1808,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: #B3B5BA; } border-color: #B3B5BA; }
.el-input__inner:focus { .el-input__inner:focus {
outline: none; outline: none;
border-color: #0885C6; } border-color: #0885C6;
-webkit-box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2);
box-shadow: 0 2px 3px rgba(8, 133, 198, 0.2); }
.el-input__suffix { .el-input__suffix {
position: absolute; position: absolute;
height: 100%; height: 100%;
...@@ -1832,7 +1834,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1832,7 +1834,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
transition: all .3s; } transition: all .3s; }
.el-input__icon { .el-input__icon {
height: 100%; height: 100%;
width: 25px; width: 17px;
text-align: center; text-align: center;
-webkit-transition: all .3s; -webkit-transition: all .3s;
transition: all .3s; transition: all .3s;
...@@ -1903,14 +1905,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1903,14 +1905,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
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: #F6F6F6; background-color: #F8F8F8;
color: #00BBF2; color: #666666;
vertical-align: middle; vertical-align: middle;
display: table-cell; display: table-cell;
position: relative; position: relative;
border: 1px solid #E4E4E4; border: 1px solid #E4E4E4;
border-radius: 3px; border-radius: 3px;
padding: 0 20px;
width: 1px; width: 1px;
white-space: nowrap; } white-space: nowrap; }
.el-input-group__append:focus, .el-input-group__prepend:focus { .el-input-group__append:focus, .el-input-group__prepend:focus {
...@@ -1927,21 +1928,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1927,21 +1928,26 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-input-group__prepend div.el-select:hover .el-input__inner { .el-input-group__prepend div.el-select:hover .el-input__inner {
border-color: transparent; border-color: transparent;
background-color: transparent; background-color: transparent;
color: inherit; color: #666666;
border-top: 0; border-top: 0;
border-bottom: 0; } border-bottom: 0; }
.el-input-group__append .el-button, .el-input-group__append .el-button, .el-input-group__append .el-input, .el-input-group__prepend .el-button, .el-input-group__prepend .el-input {
.el-input-group__append .el-input, .el-input-group__prepend .el-button, font-size: 14px; }
.el-input-group__prepend .el-input {
font-size: inherit; }
.el-input-group__prepend { .el-input-group__prepend {
border-right: 0; border-right: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; } border-bottom-right-radius: 0;
padding: 0 8px;
font-size: 12px; }
.el-input-group__append { .el-input-group__append {
border-left: 0; border-left: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0;
padding: 0 16px; }
.el-input-group__append:hover {
border-color: #0885C6;
background-color: #EDF6FC;
color: #0885C6; }
.el-input-group--prepend .el-input__inner { .el-input-group--prepend .el-input__inner {
border-top-left-radius: 0; border-top-left-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0; }
...@@ -2252,21 +2258,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2252,21 +2258,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: rgba(153, 153, 153, 0.5); } background-color: rgba(153, 153, 153, 0.5); }
.el-scrollbar__bar { .el-scrollbar__bar {
position: absolute; position: absolute;
right: 2px; right: 4px;
bottom: 2px; bottom: 4px;
z-index: 1; z-index: 1;
border-radius: 4px; border-radius: 4px;
opacity: 0; opacity: 0;
-webkit-transition: opacity 120ms ease-out; -webkit-transition: opacity 120ms ease-out;
transition: opacity 120ms ease-out; } transition: opacity 120ms ease-out; }
.el-scrollbar__bar.is-vertical { .el-scrollbar__bar.is-vertical {
width: 6px; width: 4px;
top: 2px; } top: 4px; }
.el-scrollbar__bar.is-vertical > div { .el-scrollbar__bar.is-vertical > div {
width: 100%; } width: 100%; }
.el-scrollbar__bar.is-horizontal { .el-scrollbar__bar.is-horizontal {
height: 6px; height: 4px;
left: 2px; } left: 8px; }
.el-scrollbar__bar.is-horizontal > div { .el-scrollbar__bar.is-horizontal > div {
height: 100%; } height: 100%; }
...@@ -2534,8 +2540,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2534,8 +2540,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
--------------------------*/ --------------------------*/
/* Break-point /* Break-point
--------------------------*/ --------------------------*/
.el-popper .popper__arrow, .el-popper .popper__arrow {
.el-popper .popper__arrow::after {
position: absolute; position: absolute;
display: block; display: block;
width: 0; width: 0;
...@@ -2543,72 +2548,63 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2543,72 +2548,63 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: transparent; border-color: transparent;
border-style: solid; } border-style: solid; }
.el-popper .popper__arrow {
border-width: 6px;
-webkit-filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03)); }
.el-popper .popper__arrow::after {
content: " ";
border-width: 6px; }
.el-popper[x-placement^="top"] { .el-popper[x-placement^="top"] {
margin-bottom: 12px; } margin-bottom: 4px; }
.el-popper[x-placement^="top"] .popper__arrow { .el-popper[x-placement^="top"] .popper__arrow {
bottom: -6px; bottom: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-color: #EBEBEB; border-top-color: #EBEBEB;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="top"] .popper__arrow::after { .el-popper[x-placement^="top"] .popper__arrow::after {
bottom: 1px; bottom: 1px;
margin-left: -6px; margin-left: -4px;
border-top-color: #FFFFFF; border-top-color: #FFFFFF;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="bottom"] { .el-popper[x-placement^="bottom"] {
margin-top: 12px; } margin-top: 4px; }
.el-popper[x-placement^="bottom"] .popper__arrow { .el-popper[x-placement^="bottom"] .popper__arrow {
top: -6px; top: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #EBEBEB; } border-bottom-color: #EBEBEB; }
.el-popper[x-placement^="bottom"] .popper__arrow::after { .el-popper[x-placement^="bottom"] .popper__arrow::after {
top: 1px; top: 1px;
margin-left: -6px; margin-left: -4px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #FFFFFF; } border-bottom-color: #FFFFFF; }
.el-popper[x-placement^="right"] { .el-popper[x-placement^="right"] {
margin-left: 12px; } margin-left: 4px; }
.el-popper[x-placement^="right"] .popper__arrow { .el-popper[x-placement^="right"] .popper__arrow {
top: 50%; top: 50%;
left: -6px; left: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-color: #EBEBEB; border-right-color: #EBEBEB;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="right"] .popper__arrow::after { .el-popper[x-placement^="right"] .popper__arrow::after {
bottom: -6px; bottom: -4px;
left: 1px; left: 1px;
border-right-color: #FFFFFF; border-right-color: #FFFFFF;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="left"] { .el-popper[x-placement^="left"] {
margin-right: 12px; } margin-right: 4px; }
.el-popper[x-placement^="left"] .popper__arrow { .el-popper[x-placement^="left"] .popper__arrow {
top: 50%; top: 50%;
right: -6px; right: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-width: 0; border-right-width: 0;
border-left-color: #EBEBEB; } border-left-color: #EBEBEB; }
.el-popper[x-placement^="left"] .popper__arrow::after { .el-popper[x-placement^="left"] .popper__arrow::after {
right: 1px; right: 1px;
bottom: -6px; bottom: -4px;
margin-left: -6px; margin-left: -4px;
border-right-width: 0; border-right-width: 0;
border-left-color: #FFFFFF; } border-left-color: #FFFFFF; }
theme/time-select.css
View file @ b537749d
...@@ -1607,21 +1607,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1607,21 +1607,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: rgba(153, 153, 153, 0.5); } background-color: rgba(153, 153, 153, 0.5); }
.el-scrollbar__bar { .el-scrollbar__bar {
position: absolute; position: absolute;
right: 2px; right: 4px;
bottom: 2px; bottom: 4px;
z-index: 1; z-index: 1;
border-radius: 4px; border-radius: 4px;
opacity: 0; opacity: 0;
-webkit-transition: opacity 120ms ease-out; -webkit-transition: opacity 120ms ease-out;
transition: opacity 120ms ease-out; } transition: opacity 120ms ease-out; }
.el-scrollbar__bar.is-vertical { .el-scrollbar__bar.is-vertical {
width: 6px; width: 4px;
top: 2px; } top: 4px; }
.el-scrollbar__bar.is-vertical > div { .el-scrollbar__bar.is-vertical > div {
width: 100%; } width: 100%; }
.el-scrollbar__bar.is-horizontal { .el-scrollbar__bar.is-horizontal {
height: 6px; height: 4px;
left: 2px; } left: 8px; }
.el-scrollbar__bar.is-horizontal > div { .el-scrollbar__bar.is-horizontal > div {
height: 100%; } height: 100%; }
...@@ -1889,8 +1889,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1889,8 +1889,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
--------------------------*/ --------------------------*/
/* Break-point /* Break-point
--------------------------*/ --------------------------*/
.el-popper .popper__arrow, .el-popper .popper__arrow {
.el-popper .popper__arrow::after {
position: absolute; position: absolute;
display: block; display: block;
width: 0; width: 0;
...@@ -1898,73 +1897,64 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1898,73 +1897,64 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: transparent; border-color: transparent;
border-style: solid; } border-style: solid; }
.el-popper .popper__arrow {
border-width: 6px;
-webkit-filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03)); }
.el-popper .popper__arrow::after {
content: " ";
border-width: 6px; }
.el-popper[x-placement^="top"] { .el-popper[x-placement^="top"] {
margin-bottom: 12px; } margin-bottom: 4px; }
.el-popper[x-placement^="top"] .popper__arrow { .el-popper[x-placement^="top"] .popper__arrow {
bottom: -6px; bottom: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-color: #EBEBEB; border-top-color: #EBEBEB;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="top"] .popper__arrow::after { .el-popper[x-placement^="top"] .popper__arrow::after {
bottom: 1px; bottom: 1px;
margin-left: -6px; margin-left: -4px;
border-top-color: #FFFFFF; border-top-color: #FFFFFF;
border-bottom-width: 0; } border-bottom-width: 0; }
.el-popper[x-placement^="bottom"] { .el-popper[x-placement^="bottom"] {
margin-top: 12px; } margin-top: 4px; }
.el-popper[x-placement^="bottom"] .popper__arrow { .el-popper[x-placement^="bottom"] .popper__arrow {
top: -6px; top: -4px;
left: 50%; left: 50%;
margin-right: 3px; margin-right: 3px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #EBEBEB; } border-bottom-color: #EBEBEB; }
.el-popper[x-placement^="bottom"] .popper__arrow::after { .el-popper[x-placement^="bottom"] .popper__arrow::after {
top: 1px; top: 1px;
margin-left: -6px; margin-left: -4px;
border-top-width: 0; border-top-width: 0;
border-bottom-color: #FFFFFF; } border-bottom-color: #FFFFFF; }
.el-popper[x-placement^="right"] { .el-popper[x-placement^="right"] {
margin-left: 12px; } margin-left: 4px; }
.el-popper[x-placement^="right"] .popper__arrow { .el-popper[x-placement^="right"] .popper__arrow {
top: 50%; top: 50%;
left: -6px; left: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-color: #EBEBEB; border-right-color: #EBEBEB;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="right"] .popper__arrow::after { .el-popper[x-placement^="right"] .popper__arrow::after {
bottom: -6px; bottom: -4px;
left: 1px; left: 1px;
border-right-color: #FFFFFF; border-right-color: #FFFFFF;
border-left-width: 0; } border-left-width: 0; }
.el-popper[x-placement^="left"] { .el-popper[x-placement^="left"] {
margin-right: 12px; } margin-right: 4px; }
.el-popper[x-placement^="left"] .popper__arrow { .el-popper[x-placement^="left"] .popper__arrow {
top: 50%; top: 50%;
right: -6px; right: -4px;
margin-bottom: 3px; margin-bottom: 3px;
border-right-width: 0; border-right-width: 0;
border-left-color: #EBEBEB; } border-left-color: #EBEBEB; }
.el-popper[x-placement^="left"] .popper__arrow::after { .el-popper[x-placement^="left"] .popper__arrow::after {
right: 1px; right: 1px;
bottom: -6px; bottom: -4px;
margin-left: -6px; margin-left: -4px;
border-right-width: 0; border-right-width: 0;
border-left-color: #FFFFFF; } border-left-color: #FFFFFF; }
......
theme/transfer.css
View file @ b537749d
This diff is collapsed.
theme/tree.css
View file @ b537749d
...@@ -990,7 +990,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -990,7 +990,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
background-color: #CCCCCC; background-color: #CCCCCC;
border-color: #CCCCCC; } border-color: #CCCCCC; }
.el-checkbox__input.is-disabled + span.el-checkbox__label { .el-checkbox__input.is-disabled + span.el-checkbox__label {
color: #CCCCCC; color: #333333;
cursor: not-allowed; } cursor: not-allowed; }
.el-checkbox__input.is-checked .el-checkbox__inner { .el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #0994DC; background-color: #0994DC;
...@@ -1043,9 +1043,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1043,9 +1043,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-left: 0; border-left: 0;
border-top: 0; border-top: 0;
height: 7px; height: 7px;
left: 4px; left: 5px;
position: absolute; position: absolute;
top: 1px; top: 2px;
-webkit-transform: rotate(45deg) scaleY(0); -webkit-transform: rotate(45deg) scaleY(0);
transform: rotate(45deg) scaleY(0); transform: rotate(45deg) scaleY(0);
width: 3px; width: 3px;
...@@ -1065,7 +1065,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1065,7 +1065,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
z-index: -1; } z-index: -1; }
.el-checkbox__label { .el-checkbox__label {
display: inline-block; display: inline-block;
padding-left: 10px; padding-left: 8px;
line-height: 19px; line-height: 19px;
font-size: 14px; } font-size: 14px; }
.el-checkbox:last-of-type { .el-checkbox:last-of-type {
...@@ -1167,7 +1167,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1167,7 +1167,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
position: relative; position: relative;
cursor: default; cursor: default;
background: #FFFFFF; background: #FFFFFF;
color: #666666; } color: #333333; }
.el-tree__empty-block { .el-tree__empty-block {
position: relative; position: relative;
min-height: 60px; min-height: 60px;
...@@ -1195,7 +1195,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1195,7 +1195,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tree-node:focus { .el-tree-node:focus {
/* focus */ } /* focus */ }
.el-tree-node:focus > .el-tree-node__content { .el-tree-node:focus > .el-tree-node__content {
background-color: #F6F6F6; } background-color: #EDF6FC; }
.el-tree-node.is-drop-inner > .el-tree-node__content .el-tree-node__label { .el-tree-node.is-drop-inner > .el-tree-node__content .el-tree-node__label {
background-color: #0994DC; background-color: #0994DC;
color: #fff; } color: #fff; }
...@@ -1206,14 +1206,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1206,14 +1206,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-align: center; -webkit-box-align: center;
-ms-flex-align: center; -ms-flex-align: center;
align-items: center; align-items: center;
height: 26px; height: 28px;
cursor: pointer; } cursor: pointer; }
.el-tree-node__content > .el-tree-node__expand-icon { .el-tree-node__content > .el-tree-node__expand-icon {
padding: 6px; } padding: 6px; }
.el-tree-node__content > label.el-checkbox { .el-tree-node__content > label.el-checkbox {
margin-right: 8px; } margin-right: 8px; }
.el-tree-node__content:hover { .el-tree-node__content:hover {
background-color: #F6F6F6; } background-color: #EDF6FC; }
.el-tree.is-dragging .el-tree-node__content { .el-tree.is-dragging .el-tree-node__content {
cursor: move; } cursor: move; }
.el-tree.is-dragging .el-tree-node__content * { .el-tree.is-dragging .el-tree-node__content * {
......
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