Commit be6e8f63 authored by 刘安琪's avatar 刘安琪

修改cascader样式

parent 331557b2
...@@ -546,7 +546,7 @@ $--cascader-menu-font-size: $--font-size-base !default; ...@@ -546,7 +546,7 @@ $--cascader-menu-font-size: $--font-size-base !default;
$--cascader-menu-radius: $--border-radius-base !default; $--cascader-menu-radius: $--border-radius-base !default;
$--cascader-menu-border: solid 1px $--border-color-light !default; $--cascader-menu-border: solid 1px $--border-color-light !default;
$--cascader-menu-shadow: $--box-shadow-light !default; $--cascader-menu-shadow: $--box-shadow-light !default;
$--cascader-node-background-hover: $--background-color-base !default; $--cascader-node-background-hover: $--color-primary-background-plain-hover !default;
$--cascader-node-color-disabled:$--color-text-placeholder !default; $--cascader-node-color-disabled:$--color-text-placeholder !default;
$--cascader-color-empty:$--color-text-placeholder !default; $--cascader-color-empty:$--color-text-placeholder !default;
$--cascader-tag-background: #f0f2f5; $--cascader-tag-background: #f0f2f5;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
&:last-child { &:last-child {
border-right: none; border-right: none;
.el-cascader-node { .el-cascader-node {
padding-right: 20px; padding-right: 8px;
} }
} }
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
position: relative; position: relative;
min-height: 100%; min-height: 100%;
margin: 0; margin: 0;
padding: 6px 0; padding: 4px 0;
list-style: none; list-style: none;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -64,9 +64,9 @@ ...@@ -64,9 +64,9 @@
position: relative; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0 30px 0 20px; padding: 0 8px;
height: 34px; height: 28px;
line-height: 34px; line-height: 28px;
outline: none; outline: none;
&.is-selectable.in-active-path { &.is-selectable.in-active-path {
...@@ -77,13 +77,14 @@ ...@@ -77,13 +77,14 @@
&.is-selectable.in-checked-path, &.is-selectable.in-checked-path,
&.is-active { &.is-active {
color: $--cascader-menu-selected-font-color; color: $--cascader-menu-selected-font-color;
font-weight: bold; background: $--background-select-checked;
} }
&:not(.is-disabled) { &:not(.is-disabled) {
cursor: pointer; cursor: pointer;
&:hover, &:focus { &:hover, &:focus {
background: $--cascader-node-background-hover; background: $--cascader-node-background-hover;
color: $--color-primary-hover;
} }
} }
...@@ -104,7 +105,7 @@ ...@@ -104,7 +105,7 @@
@include e(label) { @include e(label) {
flex: 1; flex: 1;
padding: 0 10px; padding: 0 8px 0 0;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -114,7 +115,11 @@ ...@@ -114,7 +115,11 @@
margin-right: 0; margin-right: 0;
.el-radio__label { .el-radio__label {
padding-left: 0; padding-left: 8px;
} }
} }
> .el-checkbox {
margin-right: 8px;
}
} }
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
background: $--cascader-menu-fill; background: $--cascader-menu-fill;
border: $--cascader-menu-border; border: $--cascader-menu-border;
border-radius: $--cascader-menu-radius; border-radius: $--cascader-menu-radius;
box-shadow: $--cascader-menu-shadow;
} }
@include e(tags) { @include e(tags) {
...@@ -129,7 +128,7 @@ ...@@ -129,7 +128,7 @@
@include e(suggestion-list) { @include e(suggestion-list) {
max-height: 204px; max-height: 204px;
margin: 0; margin: 0;
padding: 6px 0; padding: 4px 0;
font-size: $--font-size-base; font-size: $--font-size-base;
color: $--cascader-menu-font-color; color: $--cascader-menu-font-color;
text-align: center; text-align: center;
...@@ -139,8 +138,8 @@ ...@@ -139,8 +138,8 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 34px; height: 28px;
padding: 0 15px; padding: 0 8px;
text-align: left; text-align: left;
outline: none; outline: none;
cursor: pointer; cursor: pointer;
...@@ -155,7 +154,7 @@ ...@@ -155,7 +154,7 @@
} }
> span { > span {
margin-right: 10px; margin-right: 8px;
} }
} }
......
...@@ -1786,14 +1786,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1786,14 +1786,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-cascader-menu:last-child { .el-cascader-menu:last-child {
border-right: none; } border-right: none; }
.el-cascader-menu:last-child .el-cascader-node { .el-cascader-menu:last-child .el-cascader-node {
padding-right: 20px; } padding-right: 8px; }
.el-cascader-menu__wrap { .el-cascader-menu__wrap {
height: 204px; } height: 204px; }
.el-cascader-menu__list { .el-cascader-menu__list {
position: relative; position: relative;
min-height: 100%; min-height: 100%;
margin: 0; margin: 0;
padding: 6px 0; padding: 4px 0;
list-style: none; list-style: none;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
...@@ -1821,19 +1821,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1821,19 +1821,20 @@ $--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;
padding: 0 30px 0 20px; padding: 0 8px;
height: 34px; height: 28px;
line-height: 34px; line-height: 28px;
outline: none; } outline: none; }
.el-cascader-node.is-selectable.in-active-path { .el-cascader-node.is-selectable.in-active-path {
color: #666666; } color: #666666; }
.el-cascader-node.in-active-path, .el-cascader-node.is-selectable.in-checked-path, .el-cascader-node.is-active { .el-cascader-node.in-active-path, .el-cascader-node.is-selectable.in-checked-path, .el-cascader-node.is-active {
color: #0994DC; color: #0994DC;
font-weight: bold; } background: #D1ECFF; }
.el-cascader-node:not(.is-disabled) { .el-cascader-node:not(.is-disabled) {
cursor: pointer; } cursor: pointer; }
.el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus { .el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus {
background: #F6F6F6; } background: #EDF6FC;
color: #0885C6; }
.el-cascader-node.is-disabled { .el-cascader-node.is-disabled {
color: #CCCCCC; color: #CCCCCC;
cursor: not-allowed; } cursor: not-allowed; }
...@@ -1847,11 +1848,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1847,11 +1848,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-flex: 1; -webkit-box-flex: 1;
-ms-flex: 1; -ms-flex: 1;
flex: 1; flex: 1;
padding: 0 10px; padding: 0 8px 0 0;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; } text-overflow: ellipsis; }
.el-cascader-node > .el-radio { .el-cascader-node > .el-radio {
margin-right: 0; } margin-right: 0; }
.el-cascader-node > .el-radio .el-radio__label { .el-cascader-node > .el-radio .el-radio__label {
padding-left: 0; } padding-left: 8px; }
.el-cascader-node > .el-checkbox {
margin-right: 8px; }
...@@ -3415,14 +3415,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3415,14 +3415,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-cascader-menu:last-child { .el-cascader-menu:last-child {
border-right: none; } border-right: none; }
.el-cascader-menu:last-child .el-cascader-node { .el-cascader-menu:last-child .el-cascader-node {
padding-right: 20px; } padding-right: 8px; }
.el-cascader-menu__wrap { .el-cascader-menu__wrap {
height: 204px; } height: 204px; }
.el-cascader-menu__list { .el-cascader-menu__list {
position: relative; position: relative;
min-height: 100%; min-height: 100%;
margin: 0; margin: 0;
padding: 6px 0; padding: 4px 0;
list-style: none; list-style: none;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
...@@ -3450,19 +3450,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3450,19 +3450,20 @@ $--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;
padding: 0 30px 0 20px; padding: 0 8px;
height: 34px; height: 28px;
line-height: 34px; line-height: 28px;
outline: none; } outline: none; }
.el-cascader-node.is-selectable.in-active-path { .el-cascader-node.is-selectable.in-active-path {
color: #666666; } color: #666666; }
.el-cascader-node.in-active-path, .el-cascader-node.is-selectable.in-checked-path, .el-cascader-node.is-active { .el-cascader-node.in-active-path, .el-cascader-node.is-selectable.in-checked-path, .el-cascader-node.is-active {
color: #0994DC; color: #0994DC;
font-weight: bold; } background: #D1ECFF; }
.el-cascader-node:not(.is-disabled) { .el-cascader-node:not(.is-disabled) {
cursor: pointer; } cursor: pointer; }
.el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus { .el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus {
background: #F6F6F6; } background: #EDF6FC;
color: #0885C6; }
.el-cascader-node.is-disabled { .el-cascader-node.is-disabled {
color: #CCCCCC; color: #CCCCCC;
cursor: not-allowed; } cursor: not-allowed; }
...@@ -3476,14 +3477,16 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3476,14 +3477,16 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-flex: 1; -webkit-box-flex: 1;
-ms-flex: 1; -ms-flex: 1;
flex: 1; flex: 1;
padding: 0 10px; padding: 0 8px 0 0;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; } text-overflow: ellipsis; }
.el-cascader-node > .el-radio { .el-cascader-node > .el-radio {
margin-right: 0; } margin-right: 0; }
.el-cascader-node > .el-radio .el-radio__label { .el-cascader-node > .el-radio .el-radio__label {
padding-left: 0; } padding-left: 8px; }
.el-cascader-node > .el-checkbox {
margin-right: 8px; }
.el-cascader { .el-cascader {
display: inline-block; display: inline-block;
...@@ -3529,9 +3532,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3529,9 +3532,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
font-size: 14px; font-size: 14px;
background: #FFFFFF; background: #FFFFFF;
border: solid 1px #D0D0D0; border: solid 1px #D0D0D0;
border-radius: 3px; border-radius: 3px; }
-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); }
.el-cascader__tags { .el-cascader__tags {
position: absolute; position: absolute;
left: 0; left: 0;
...@@ -3580,7 +3581,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3580,7 +3581,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-cascader__suggestion-list { .el-cascader__suggestion-list {
max-height: 204px; max-height: 204px;
margin: 0; margin: 0;
padding: 6px 0; padding: 4px 0;
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;
text-align: center; } text-align: center; }
...@@ -3594,18 +3595,18 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -3594,18 +3595,18 @@ $--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: 34px; height: 28px;
padding: 0 15px; padding: 0 8px;
text-align: left; text-align: left;
outline: none; outline: none;
cursor: pointer; } cursor: pointer; }
.el-cascader__suggestion-item:hover, .el-cascader__suggestion-item:focus { .el-cascader__suggestion-item:hover, .el-cascader__suggestion-item:focus {
background: #F6F6F6; } background: #EDF6FC; }
.el-cascader__suggestion-item.is-checked { .el-cascader__suggestion-item.is-checked {
color: #0994DC; color: #0994DC;
font-weight: bold; } font-weight: bold; }
.el-cascader__suggestion-item > span { .el-cascader__suggestion-item > span {
margin-right: 10px; } margin-right: 8px; }
.el-cascader__empty-text { .el-cascader__empty-text {
margin: 10px 0; margin: 10px 0;
color: #CCCCCC; } color: #CCCCCC; }
......
...@@ -560,7 +560,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -560,7 +560,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 0.5; opacity: 0.4;
background: #000000; } background: #000000; }
.el-popup-parent--hidden { .el-popup-parent--hidden {
...@@ -591,12 +591,12 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -591,12 +591,12 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
overflow: auto; overflow: auto;
margin: 0; } margin: 0; }
.el-dialog__header { .el-dialog__header {
padding: 20px; padding: 24px;
padding-bottom: 10px; } padding-bottom: 10px; }
.el-dialog__headerbtn { .el-dialog__headerbtn {
position: absolute; position: absolute;
top: 20px; top: 24px;
right: 20px; right: 24px;
padding: 0; padding: 0;
background: transparent; background: transparent;
border: none; border: none;
...@@ -612,12 +612,12 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -612,12 +612,12 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
font-size: 18px; font-size: 18px;
color: #333333; } color: #333333; }
.el-dialog__body { .el-dialog__body {
padding: 30px 20px; padding: 34px 24px;
color: #666666; color: #666666;
font-size: 14px; font-size: 14px;
word-break: break-all; } word-break: break-all; }
.el-dialog__footer { .el-dialog__footer {
padding: 20px; padding: 24px;
padding-top: 10px; padding-top: 10px;
text-align: right; text-align: right;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
...@@ -626,7 +626,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -626,7 +626,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
text-align: center; } text-align: center; }
.el-dialog--center .el-dialog__body { .el-dialog--center .el-dialog__body {
text-align: initial; text-align: initial;
padding: 25px 25px 30px; } padding: 25px 29px 30px; }
.el-dialog--center .el-dialog__footer { .el-dialog--center .el-dialog__footer {
text-align: inherit; } text-align: inherit; }
......
...@@ -457,7 +457,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -457,7 +457,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
margin-bottom: 32px; margin-bottom: 32px;
padding: 20px; padding: 24px;
padding-bottom: 0; } padding-bottom: 0; }
.el-drawer__header > :first-child { .el-drawer__header > :first-child {
-webkit-box-flex: 1; -webkit-box-flex: 1;
......
...@@ -5218,7 +5218,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -5218,7 +5218,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 0.5; opacity: 0.4;
background: #000000; } background: #000000; }
.el-popup-parent--hidden { .el-popup-parent--hidden {
...@@ -5249,12 +5249,12 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -5249,12 +5249,12 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
overflow: auto; overflow: auto;
margin: 0; } margin: 0; }
.el-dialog__header { .el-dialog__header {
padding: 20px; padding: 24px;
padding-bottom: 10px; } padding-bottom: 10px; }
.el-dialog__headerbtn { .el-dialog__headerbtn {
position: absolute; position: absolute;
top: 20px; top: 24px;
right: 20px; right: 24px;
padding: 0; padding: 0;
background: transparent; background: transparent;
border: none; border: none;
...@@ -5270,12 +5270,12 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -5270,12 +5270,12 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
font-size: 18px; font-size: 18px;
color: #333333; } color: #333333; }
.el-dialog__body { .el-dialog__body {
padding: 30px 20px; padding: 34px 24px;
color: #666666; color: #666666;
font-size: 14px; font-size: 14px;
word-break: break-all; } word-break: break-all; }
.el-dialog__footer { .el-dialog__footer {
padding: 20px; padding: 24px;
padding-top: 10px; padding-top: 10px;
text-align: right; text-align: right;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
...@@ -5284,7 +5284,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -5284,7 +5284,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
text-align: center; } text-align: center; }
.el-dialog--center .el-dialog__body { .el-dialog--center .el-dialog__body {
text-align: initial; text-align: initial;
padding: 25px 25px 30px; } padding: 25px 29px 30px; }
.el-dialog--center .el-dialog__footer { .el-dialog--center .el-dialog__footer {
text-align: inherit; } text-align: inherit; }
...@@ -30164,7 +30164,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -30164,7 +30164,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 0.5; opacity: 0.4;
background: #000000; } background: #000000; }
.el-popup-parent--hidden { .el-popup-parent--hidden {
...@@ -31540,7 +31540,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -31540,7 +31540,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
padding-bottom: 10px; padding-bottom: 10px;
vertical-align: middle; vertical-align: middle;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 4px; border-radius: 6px;
border: 1px solid #EBEBEB; border: 1px solid #EBEBEB;
font-size: 18px; font-size: 18px;
-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);
...@@ -31564,7 +31564,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -31564,7 +31564,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
vertical-align: middle; } vertical-align: middle; }
.el-message-box__header { .el-message-box__header {
position: relative; position: relative;
padding: 15px; padding: 24px;
padding-bottom: 10px; } padding-bottom: 10px; }
.el-message-box__title { .el-message-box__title {
padding-left: 0; padding-left: 0;
...@@ -31574,8 +31574,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -31574,8 +31574,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
color: #333333; } color: #333333; }
.el-message-box__headerbtn { .el-message-box__headerbtn {
position: absolute; position: absolute;
top: 15px; top: 24px;
right: 15px; right: 24px;
padding: 0; padding: 0;
border: none; border: none;
outline: none; outline: none;
...@@ -31587,8 +31587,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -31587,8 +31587,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-message-box__headerbtn:focus .el-message-box__close, .el-message-box__headerbtn:hover .el-message-box__close { .el-message-box__headerbtn:focus .el-message-box__close, .el-message-box__headerbtn:hover .el-message-box__close {
color: #0994DC; } color: #0994DC; }
.el-message-box__content { .el-message-box__content {
padding: 10px 15px; padding: 10px 24px;
color: #666666; color: #333333;
font-size: 14px; } font-size: 14px; }
.el-message-box__container { .el-message-box__container {
position: relative; } position: relative; }
...@@ -31664,8 +31664,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -31664,8 +31664,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-message-box--center .el-message-box__btns, .el-message-box--center .el-message-box__content { .el-message-box--center .el-message-box__btns, .el-message-box--center .el-message-box__content {
text-align: center; } text-align: center; }
.el-message-box--center .el-message-box__content { .el-message-box--center .el-message-box__content {
padding-left: 27px; padding-left: 36px;
padding-right: 27px; } padding-right: 36px; }
.msgbox-fade-enter-active { .msgbox-fade-enter-active {
-webkit-animation: msgbox-fade-in .3s; -webkit-animation: msgbox-fade-in .3s;
...@@ -48446,14 +48446,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -48446,14 +48446,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-cascader-menu:last-child { .el-cascader-menu:last-child {
border-right: none; } border-right: none; }
.el-cascader-menu:last-child .el-cascader-node { .el-cascader-menu:last-child .el-cascader-node {
padding-right: 20px; } padding-right: 8px; }
.el-cascader-menu__wrap { .el-cascader-menu__wrap {
height: 204px; } height: 204px; }
.el-cascader-menu__list { .el-cascader-menu__list {
position: relative; position: relative;
min-height: 100%; min-height: 100%;
margin: 0; margin: 0;
padding: 6px 0; padding: 4px 0;
list-style: none; list-style: none;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
...@@ -48481,19 +48481,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -48481,19 +48481,20 @@ $--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;
padding: 0 30px 0 20px; padding: 0 8px;
height: 34px; height: 28px;
line-height: 34px; line-height: 28px;
outline: none; } outline: none; }
.el-cascader-node.is-selectable.in-active-path { .el-cascader-node.is-selectable.in-active-path {
color: #666666; } color: #666666; }
.el-cascader-node.in-active-path, .el-cascader-node.is-selectable.in-checked-path, .el-cascader-node.is-active { .el-cascader-node.in-active-path, .el-cascader-node.is-selectable.in-checked-path, .el-cascader-node.is-active {
color: #0994DC; color: #0994DC;
font-weight: bold; } background: #D1ECFF; }
.el-cascader-node:not(.is-disabled) { .el-cascader-node:not(.is-disabled) {
cursor: pointer; } cursor: pointer; }
.el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus { .el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus {
background: #F6F6F6; } background: #EDF6FC;
color: #0885C6; }
.el-cascader-node.is-disabled { .el-cascader-node.is-disabled {
color: #CCCCCC; color: #CCCCCC;
cursor: not-allowed; } cursor: not-allowed; }
...@@ -48507,14 +48508,16 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -48507,14 +48508,16 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-flex: 1; -webkit-box-flex: 1;
-ms-flex: 1; -ms-flex: 1;
flex: 1; flex: 1;
padding: 0 10px; padding: 0 8px 0 0;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; } text-overflow: ellipsis; }
.el-cascader-node > .el-radio { .el-cascader-node > .el-radio {
margin-right: 0; } margin-right: 0; }
.el-cascader-node > .el-radio .el-radio__label { .el-cascader-node > .el-radio .el-radio__label {
padding-left: 0; } padding-left: 8px; }
.el-cascader-node > .el-checkbox {
margin-right: 8px; }
.el-cascader { .el-cascader {
display: inline-block; display: inline-block;
...@@ -48560,9 +48563,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -48560,9 +48563,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
font-size: 14px; font-size: 14px;
background: #FFFFFF; background: #FFFFFF;
border: solid 1px #D0D0D0; border: solid 1px #D0D0D0;
border-radius: 3px; border-radius: 3px; }
-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); }
.el-cascader__tags { .el-cascader__tags {
position: absolute; position: absolute;
left: 0; left: 0;
...@@ -48611,7 +48612,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -48611,7 +48612,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-cascader__suggestion-list { .el-cascader__suggestion-list {
max-height: 204px; max-height: 204px;
margin: 0; margin: 0;
padding: 6px 0; padding: 4px 0;
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;
text-align: center; } text-align: center; }
...@@ -48625,18 +48626,18 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -48625,18 +48626,18 @@ $--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: 34px; height: 28px;
padding: 0 15px; padding: 0 8px;
text-align: left; text-align: left;
outline: none; outline: none;
cursor: pointer; } cursor: pointer; }
.el-cascader__suggestion-item:hover, .el-cascader__suggestion-item:focus { .el-cascader__suggestion-item:hover, .el-cascader__suggestion-item:focus {
background: #F6F6F6; } background: #EDF6FC; }
.el-cascader__suggestion-item.is-checked { .el-cascader__suggestion-item.is-checked {
color: #0994DC; color: #0994DC;
font-weight: bold; } font-weight: bold; }
.el-cascader__suggestion-item > span { .el-cascader__suggestion-item > span {
margin-right: 10px; } margin-right: 8px; }
.el-cascader__empty-text { .el-cascader__empty-text {
margin: 10px 0; margin: 10px 0;
color: #CCCCCC; } color: #CCCCCC; }
...@@ -58011,14 +58012,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -58011,14 +58012,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-cascader-menu:last-child { .el-cascader-menu:last-child {
border-right: none; } border-right: none; }
.el-cascader-menu:last-child .el-cascader-node { .el-cascader-menu:last-child .el-cascader-node {
padding-right: 20px; } padding-right: 8px; }
.el-cascader-menu__wrap { .el-cascader-menu__wrap {
height: 204px; } height: 204px; }
.el-cascader-menu__list { .el-cascader-menu__list {
position: relative; position: relative;
min-height: 100%; min-height: 100%;
margin: 0; margin: 0;
padding: 6px 0; padding: 4px 0;
list-style: none; list-style: none;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
...@@ -58046,19 +58047,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -58046,19 +58047,20 @@ $--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;
padding: 0 30px 0 20px; padding: 0 8px;
height: 34px; height: 28px;
line-height: 34px; line-height: 28px;
outline: none; } outline: none; }
.el-cascader-node.is-selectable.in-active-path { .el-cascader-node.is-selectable.in-active-path {
color: #666666; } color: #666666; }
.el-cascader-node.in-active-path, .el-cascader-node.is-selectable.in-checked-path, .el-cascader-node.is-active { .el-cascader-node.in-active-path, .el-cascader-node.is-selectable.in-checked-path, .el-cascader-node.is-active {
color: #0994DC; color: #0994DC;
font-weight: bold; } background: #D1ECFF; }
.el-cascader-node:not(.is-disabled) { .el-cascader-node:not(.is-disabled) {
cursor: pointer; } cursor: pointer; }
.el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus { .el-cascader-node:not(.is-disabled):hover, .el-cascader-node:not(.is-disabled):focus {
background: #F6F6F6; } background: #EDF6FC;
color: #0885C6; }
.el-cascader-node.is-disabled { .el-cascader-node.is-disabled {
color: #CCCCCC; color: #CCCCCC;
cursor: not-allowed; } cursor: not-allowed; }
...@@ -58072,14 +58074,16 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -58072,14 +58074,16 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-flex: 1; -webkit-box-flex: 1;
-ms-flex: 1; -ms-flex: 1;
flex: 1; flex: 1;
padding: 0 10px; padding: 0 8px 0 0;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; } text-overflow: ellipsis; }
.el-cascader-node > .el-radio { .el-cascader-node > .el-radio {
margin-right: 0; } margin-right: 0; }
.el-cascader-node > .el-radio .el-radio__label { .el-cascader-node > .el-radio .el-radio__label {
padding-left: 0; } padding-left: 8px; }
.el-cascader-node > .el-checkbox {
margin-right: 8px; }
/* BEM support Func /* BEM support Func
-------------------------- */ -------------------------- */
...@@ -58839,7 +58843,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -58839,7 +58843,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
display: -ms-flexbox; display: -ms-flexbox;
display: flex; display: flex;
margin-bottom: 32px; margin-bottom: 32px;
padding: 20px; padding: 24px;
padding-bottom: 0; } padding-bottom: 0; }
.el-drawer__header > :first-child { .el-drawer__header > :first-child {
-webkit-box-flex: 1; -webkit-box-flex: 1;
...@@ -560,7 +560,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -560,7 +560,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
opacity: 0.5; opacity: 0.4;
background: #000000; } background: #000000; }
.el-popup-parent--hidden { .el-popup-parent--hidden {
...@@ -1936,7 +1936,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1936,7 +1936,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
padding-bottom: 10px; padding-bottom: 10px;
vertical-align: middle; vertical-align: middle;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 4px; border-radius: 6px;
border: 1px solid #EBEBEB; border: 1px solid #EBEBEB;
font-size: 18px; font-size: 18px;
-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);
...@@ -1960,7 +1960,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1960,7 +1960,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
vertical-align: middle; } vertical-align: middle; }
.el-message-box__header { .el-message-box__header {
position: relative; position: relative;
padding: 15px; padding: 24px;
padding-bottom: 10px; } padding-bottom: 10px; }
.el-message-box__title { .el-message-box__title {
padding-left: 0; padding-left: 0;
...@@ -1970,8 +1970,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1970,8 +1970,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
color: #333333; } color: #333333; }
.el-message-box__headerbtn { .el-message-box__headerbtn {
position: absolute; position: absolute;
top: 15px; top: 24px;
right: 15px; right: 24px;
padding: 0; padding: 0;
border: none; border: none;
outline: none; outline: none;
...@@ -1983,8 +1983,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1983,8 +1983,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-message-box__headerbtn:focus .el-message-box__close, .el-message-box__headerbtn:hover .el-message-box__close { .el-message-box__headerbtn:focus .el-message-box__close, .el-message-box__headerbtn:hover .el-message-box__close {
color: #0994DC; } color: #0994DC; }
.el-message-box__content { .el-message-box__content {
padding: 10px 15px; padding: 10px 24px;
color: #666666; color: #333333;
font-size: 14px; } font-size: 14px; }
.el-message-box__container { .el-message-box__container {
position: relative; } position: relative; }
...@@ -2060,8 +2060,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -2060,8 +2060,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-message-box--center .el-message-box__btns, .el-message-box--center .el-message-box__content { .el-message-box--center .el-message-box__btns, .el-message-box--center .el-message-box__content {
text-align: center; } text-align: center; }
.el-message-box--center .el-message-box__content { .el-message-box--center .el-message-box__content {
padding-left: 27px; padding-left: 36px;
padding-right: 27px; } padding-right: 36px; }
.msgbox-fade-enter-active { .msgbox-fade-enter-active {
-webkit-animation: msgbox-fade-in .3s; -webkit-animation: msgbox-fade-in .3s;
......
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