Commit bcbd29e0 authored by cyh's avatar cyh

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

parents 05377a59 3f432020
......@@ -21,7 +21,7 @@
color: $--color-primary-hover;
}
&::after {
/*&::after {
position: absolute;
right: 20px;
font-family: 'element-icons';
......@@ -30,7 +30,7 @@
font-weight: bold;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
}*/
}
}
......
......@@ -11,27 +11,27 @@
}
.el-tag__close {
color: mix($--tag-primary-color, $--color-white, $fontColorWeight);
color: $--color-white;
&:hover {
color: $--color-white;
background-color: mix($--tag-primary-color, $--color-white, $hoverColorWeight);
background-color: $--color-text-placeholder;
}
}
&.el-tag--info {
background-color: mix($--tag-info-color, $--color-white, $backgroundColorWeight);
border-color: mix($--tag-info-color, $--color-white, $borderColorWeight);
color: mix($--tag-info-color, $--color-white, $fontColorWeight);
background-color: $--background-color-lighter;
border-color: $--border-color-base;
color: $--color-text-regular;
@include when(hit) {
border-color: $--tag-info-color;
}
.el-tag__close {
color: mix($--tag-info-color, $--color-white, $fontColorWeight);
color: $--color-white;
&:hover {
color: $--color-white;
background-color: mix($--tag-info-color, $--color-white, $hoverColorWeight);
background-color: $--color-text-placeholder;
}
}
}
......
......@@ -1434,21 +1434,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag.is-hit {
border-color: #0994DC; }
.el-tag .el-tag__close {
color: #0994dc; }
color: #FFFFFF; }
.el-tag .el-tag__close:hover {
color: #FFFFFF;
background-color: #0994dc; }
background-color: #CCCCCC; }
.el-tag.el-tag--info {
background-color: #e6f8fe;
border-color: #ccf1fc;
color: #00bbf2; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag.el-tag--info .el-tag__close {
color: #00bbf2; }
color: #FFFFFF; }
.el-tag.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #00bbf2; }
background-color: #CCCCCC; }
.el-tag.el-tag--success {
background-color: #edfaf2;
border-color: #dcf4e5;
......@@ -1503,21 +1503,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag--dark.is-hit {
border-color: #0994DC; }
.el-tag--dark .el-tag__close {
color: white; }
color: #FFFFFF; }
.el-tag--dark .el-tag__close:hover {
color: #FFFFFF;
background-color: #3aa9e3; }
background-color: #CCCCCC; }
.el-tag--dark.el-tag--info {
background-color: #00bbf2;
border-color: #00bbf2;
color: white; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag--dark.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag--dark.el-tag--info .el-tag__close {
color: white; }
color: #FFFFFF; }
.el-tag--dark.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #33c9f5; }
background-color: #CCCCCC; }
.el-tag--dark.el-tag--success {
background-color: #4ec87c;
border-color: #4ec87c;
......@@ -1558,21 +1558,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag--plain.is-hit {
border-color: #0994DC; }
.el-tag--plain .el-tag__close {
color: #0994dc; }
color: #FFFFFF; }
.el-tag--plain .el-tag__close:hover {
color: #FFFFFF;
background-color: #0994dc; }
background-color: #CCCCCC; }
.el-tag--plain.el-tag--info {
background-color: white;
border-color: #99e4fa;
color: #00bbf2; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag--plain.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag--plain.el-tag--info .el-tag__close {
color: #00bbf2; }
color: #FFFFFF; }
.el-tag--plain.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #00bbf2; }
background-color: #CCCCCC; }
.el-tag--plain.el-tag--success {
background-color: white;
border-color: #b8e9cb;
......
This diff is collapsed.
......@@ -1134,11 +1134,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
margin: 4px 0; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
color: #0994DC;
background-color: #D1ECFF; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover {
background-color: #EDF6FC;
color: #0885C6; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after {
background-color: #D1ECFF;
/*&::after {
position: absolute;
right: 20px;
font-family: 'element-icons';
......@@ -1146,7 +1143,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
font-size: 12px;
font-weight: bold;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; }
-moz-osx-font-smoothing: grayscale;
}*/ }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover {
background-color: #EDF6FC;
color: #0885C6; }
.el-select-dropdown .el-scrollbar.is-empty .el-select-dropdown__list {
padding: 0; }
......@@ -2005,21 +2006,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag.is-hit {
border-color: #0994DC; }
.el-tag .el-tag__close {
color: #0994dc; }
color: #FFFFFF; }
.el-tag .el-tag__close:hover {
color: #FFFFFF;
background-color: #0994dc; }
background-color: #CCCCCC; }
.el-tag.el-tag--info {
background-color: #e6f8fe;
border-color: #ccf1fc;
color: #00bbf2; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag.el-tag--info .el-tag__close {
color: #00bbf2; }
color: #FFFFFF; }
.el-tag.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #00bbf2; }
background-color: #CCCCCC; }
.el-tag.el-tag--success {
background-color: #edfaf2;
border-color: #dcf4e5;
......@@ -2074,21 +2075,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag--dark.is-hit {
border-color: #0994DC; }
.el-tag--dark .el-tag__close {
color: white; }
color: #FFFFFF; }
.el-tag--dark .el-tag__close:hover {
color: #FFFFFF;
background-color: #3aa9e3; }
background-color: #CCCCCC; }
.el-tag--dark.el-tag--info {
background-color: #00bbf2;
border-color: #00bbf2;
color: white; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag--dark.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag--dark.el-tag--info .el-tag__close {
color: white; }
color: #FFFFFF; }
.el-tag--dark.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #33c9f5; }
background-color: #CCCCCC; }
.el-tag--dark.el-tag--success {
background-color: #4ec87c;
border-color: #4ec87c;
......@@ -2129,21 +2130,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag--plain.is-hit {
border-color: #0994DC; }
.el-tag--plain .el-tag__close {
color: #0994dc; }
color: #FFFFFF; }
.el-tag--plain .el-tag__close:hover {
color: #FFFFFF;
background-color: #0994dc; }
background-color: #CCCCCC; }
.el-tag--plain.el-tag--info {
background-color: white;
border-color: #99e4fa;
color: #00bbf2; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag--plain.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag--plain.el-tag--info .el-tag__close {
color: #00bbf2; }
color: #FFFFFF; }
.el-tag--plain.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #00bbf2; }
background-color: #CCCCCC; }
.el-tag--plain.el-tag--success {
background-color: white;
border-color: #b8e9cb;
......
......@@ -606,11 +606,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
margin: 4px 0; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
color: #0994DC;
background-color: #D1ECFF; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover {
background-color: #EDF6FC;
color: #0885C6; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after {
background-color: #D1ECFF;
/*&::after {
position: absolute;
right: 20px;
font-family: 'element-icons';
......@@ -618,7 +615,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
font-size: 12px;
font-weight: bold;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; }
-moz-osx-font-smoothing: grayscale;
}*/ }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover {
background-color: #EDF6FC;
color: #0885C6; }
.el-select-dropdown .el-scrollbar.is-empty .el-select-dropdown__list {
padding: 0; }
......
......@@ -870,11 +870,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
margin: 4px 0; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
color: #0994DC;
background-color: #D1ECFF; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover {
background-color: #EDF6FC;
color: #0885C6; }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after {
background-color: #D1ECFF;
/*&::after {
position: absolute;
right: 20px;
font-family: 'element-icons';
......@@ -882,7 +879,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
font-size: 12px;
font-weight: bold;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; }
-moz-osx-font-smoothing: grayscale;
}*/ }
.el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover {
background-color: #EDF6FC;
color: #0885C6; }
.el-select-dropdown .el-scrollbar.is-empty .el-select-dropdown__list {
padding: 0; }
......@@ -1741,21 +1742,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag.is-hit {
border-color: #0994DC; }
.el-tag .el-tag__close {
color: #0994dc; }
color: #FFFFFF; }
.el-tag .el-tag__close:hover {
color: #FFFFFF;
background-color: #0994dc; }
background-color: #CCCCCC; }
.el-tag.el-tag--info {
background-color: #e6f8fe;
border-color: #ccf1fc;
color: #00bbf2; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag.el-tag--info .el-tag__close {
color: #00bbf2; }
color: #FFFFFF; }
.el-tag.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #00bbf2; }
background-color: #CCCCCC; }
.el-tag.el-tag--success {
background-color: #edfaf2;
border-color: #dcf4e5;
......@@ -1810,21 +1811,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag--dark.is-hit {
border-color: #0994DC; }
.el-tag--dark .el-tag__close {
color: white; }
color: #FFFFFF; }
.el-tag--dark .el-tag__close:hover {
color: #FFFFFF;
background-color: #3aa9e3; }
background-color: #CCCCCC; }
.el-tag--dark.el-tag--info {
background-color: #00bbf2;
border-color: #00bbf2;
color: white; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag--dark.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag--dark.el-tag--info .el-tag__close {
color: white; }
color: #FFFFFF; }
.el-tag--dark.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #33c9f5; }
background-color: #CCCCCC; }
.el-tag--dark.el-tag--success {
background-color: #4ec87c;
border-color: #4ec87c;
......@@ -1865,21 +1866,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag--plain.is-hit {
border-color: #0994DC; }
.el-tag--plain .el-tag__close {
color: #0994dc; }
color: #FFFFFF; }
.el-tag--plain .el-tag__close:hover {
color: #FFFFFF;
background-color: #0994dc; }
background-color: #CCCCCC; }
.el-tag--plain.el-tag--info {
background-color: white;
border-color: #99e4fa;
color: #00bbf2; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag--plain.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag--plain.el-tag--info .el-tag__close {
color: #00bbf2; }
color: #FFFFFF; }
.el-tag--plain.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #00bbf2; }
background-color: #CCCCCC; }
.el-tag--plain.el-tag--success {
background-color: white;
border-color: #b8e9cb;
......
......@@ -1076,21 +1076,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag.is-hit {
border-color: #0994DC; }
.el-tag .el-tag__close {
color: #0994dc; }
color: #FFFFFF; }
.el-tag .el-tag__close:hover {
color: #FFFFFF;
background-color: #0994dc; }
background-color: #CCCCCC; }
.el-tag.el-tag--info {
background-color: #e6f8fe;
border-color: #ccf1fc;
color: #00bbf2; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag.el-tag--info .el-tag__close {
color: #00bbf2; }
color: #FFFFFF; }
.el-tag.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #00bbf2; }
background-color: #CCCCCC; }
.el-tag.el-tag--success {
background-color: #edfaf2;
border-color: #dcf4e5;
......@@ -1145,21 +1145,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag--dark.is-hit {
border-color: #0994DC; }
.el-tag--dark .el-tag__close {
color: white; }
color: #FFFFFF; }
.el-tag--dark .el-tag__close:hover {
color: #FFFFFF;
background-color: #3aa9e3; }
background-color: #CCCCCC; }
.el-tag--dark.el-tag--info {
background-color: #00bbf2;
border-color: #00bbf2;
color: white; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag--dark.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag--dark.el-tag--info .el-tag__close {
color: white; }
color: #FFFFFF; }
.el-tag--dark.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #33c9f5; }
background-color: #CCCCCC; }
.el-tag--dark.el-tag--success {
background-color: #4ec87c;
border-color: #4ec87c;
......@@ -1200,21 +1200,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag--plain.is-hit {
border-color: #0994DC; }
.el-tag--plain .el-tag__close {
color: #0994dc; }
color: #FFFFFF; }
.el-tag--plain .el-tag__close:hover {
color: #FFFFFF;
background-color: #0994dc; }
background-color: #CCCCCC; }
.el-tag--plain.el-tag--info {
background-color: white;
border-color: #99e4fa;
color: #00bbf2; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag--plain.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag--plain.el-tag--info .el-tag__close {
color: #00bbf2; }
color: #FFFFFF; }
.el-tag--plain.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #00bbf2; }
background-color: #CCCCCC; }
.el-tag--plain.el-tag--success {
background-color: white;
border-color: #b8e9cb;
......
......@@ -1076,21 +1076,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag.is-hit {
border-color: #0994DC; }
.el-tag .el-tag__close {
color: #0994dc; }
color: #FFFFFF; }
.el-tag .el-tag__close:hover {
color: #FFFFFF;
background-color: #0994dc; }
background-color: #CCCCCC; }
.el-tag.el-tag--info {
background-color: #e6f8fe;
border-color: #ccf1fc;
color: #00bbf2; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag.el-tag--info .el-tag__close {
color: #00bbf2; }
color: #FFFFFF; }
.el-tag.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #00bbf2; }
background-color: #CCCCCC; }
.el-tag.el-tag--success {
background-color: #edfaf2;
border-color: #dcf4e5;
......@@ -1145,21 +1145,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag--dark.is-hit {
border-color: #0994DC; }
.el-tag--dark .el-tag__close {
color: white; }
color: #FFFFFF; }
.el-tag--dark .el-tag__close:hover {
color: #FFFFFF;
background-color: #3aa9e3; }
background-color: #CCCCCC; }
.el-tag--dark.el-tag--info {
background-color: #00bbf2;
border-color: #00bbf2;
color: white; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag--dark.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag--dark.el-tag--info .el-tag__close {
color: white; }
color: #FFFFFF; }
.el-tag--dark.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #33c9f5; }
background-color: #CCCCCC; }
.el-tag--dark.el-tag--success {
background-color: #4ec87c;
border-color: #4ec87c;
......@@ -1200,21 +1200,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag--plain.is-hit {
border-color: #0994DC; }
.el-tag--plain .el-tag__close {
color: #0994dc; }
color: #FFFFFF; }
.el-tag--plain .el-tag__close:hover {
color: #FFFFFF;
background-color: #0994dc; }
background-color: #CCCCCC; }
.el-tag--plain.el-tag--info {
background-color: white;
border-color: #99e4fa;
color: #00bbf2; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag--plain.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag--plain.el-tag--info .el-tag__close {
color: #00bbf2; }
color: #FFFFFF; }
.el-tag--plain.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #00bbf2; }
background-color: #CCCCCC; }
.el-tag--plain.el-tag--success {
background-color: white;
border-color: #b8e9cb;
......
......@@ -281,21 +281,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag.is-hit {
border-color: #0994DC; }
.el-tag .el-tag__close {
color: #0994dc; }
color: #FFFFFF; }
.el-tag .el-tag__close:hover {
color: #FFFFFF;
background-color: #0994dc; }
background-color: #CCCCCC; }
.el-tag.el-tag--info {
background-color: #e6f8fe;
border-color: #ccf1fc;
color: #00bbf2; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag.el-tag--info .el-tag__close {
color: #00bbf2; }
color: #FFFFFF; }
.el-tag.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #00bbf2; }
background-color: #CCCCCC; }
.el-tag.el-tag--success {
background-color: #edfaf2;
border-color: #dcf4e5;
......@@ -350,21 +350,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag--dark.is-hit {
border-color: #0994DC; }
.el-tag--dark .el-tag__close {
color: white; }
color: #FFFFFF; }
.el-tag--dark .el-tag__close:hover {
color: #FFFFFF;
background-color: #3aa9e3; }
background-color: #CCCCCC; }
.el-tag--dark.el-tag--info {
background-color: #00bbf2;
border-color: #00bbf2;
color: white; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag--dark.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag--dark.el-tag--info .el-tag__close {
color: white; }
color: #FFFFFF; }
.el-tag--dark.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #33c9f5; }
background-color: #CCCCCC; }
.el-tag--dark.el-tag--success {
background-color: #4ec87c;
border-color: #4ec87c;
......@@ -405,21 +405,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tag--plain.is-hit {
border-color: #0994DC; }
.el-tag--plain .el-tag__close {
color: #0994dc; }
color: #FFFFFF; }
.el-tag--plain .el-tag__close:hover {
color: #FFFFFF;
background-color: #0994dc; }
background-color: #CCCCCC; }
.el-tag--plain.el-tag--info {
background-color: white;
border-color: #99e4fa;
color: #00bbf2; }
background-color: #F8F8F8;
border-color: #E4E4E4;
color: #666666; }
.el-tag--plain.el-tag--info.is-hit {
border-color: #00BBF2; }
.el-tag--plain.el-tag--info .el-tag__close {
color: #00bbf2; }
color: #FFFFFF; }
.el-tag--plain.el-tag--info .el-tag__close:hover {
color: #FFFFFF;
background-color: #00bbf2; }
background-color: #CCCCCC; }
.el-tag--plain.el-tag--success {
background-color: white;
border-color: #b8e9cb;
......
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