Commit 4745fc7a authored by luohua's avatar luohua

统一改样式

parent 8b4e5127
......@@ -110,7 +110,7 @@ $--color-text-placeholder: #CCCCCC !default;
/// color|1|Border Color|3
$--border-color-base: #E4E4E4 !default;
/// color|1|Border Color|3
$--border-color-light: #D0D0D0 !default;
$--border-color-light: #B6B9BA !default;
/// color|1|Border Color|3
$--border-color-lighter: #EBEBEB !default;
/// color|1|Border Color|3
......
......@@ -3,7 +3,7 @@
@import "common/var";
@include b(breadcrumb) {
font-size: 14px;
font-size: 12px;
line-height: 1;
@include utils-clearfix;
& i.el-icon-location{
......@@ -28,7 +28,7 @@
float: left;
@include e(inner) {
color: $--color-text-regular;
color: $--color-text-secondary;
&.is-link, & a {
font-weight: normal;
......@@ -45,6 +45,7 @@
}
&:last-child {
color: $--color-text-primary;
.el-breadcrumb__inner,
.el-breadcrumb__inner a {
&, &:hover {
......
......@@ -76,16 +76,15 @@
@include e(item) {
list-style: none;
line-height: 36px;
padding: 0 20px;
margin: 0;
line-height: 16px;
padding: 0 10px;
margin: 0 10px;
font-size: $--font-size-base;
color: $--color-text-regular;
color: $--color-text-primary;
cursor: pointer;
outline: none;
&:not(.is-disabled):hover, &:focus {
background-color: $--dropdown-menuItem-hover-fill;
color: $--dropdown-menuItem-hover-color;
color: $--color-primary-hover;
}
i {
......
......@@ -130,7 +130,7 @@
}
}
@include m(collapse) {
width: 64px;
width: 46px;
> .el-menu-item,
> .el-submenu > .el-submenu__title {
......
......@@ -13,10 +13,10 @@
white-space: nowrap;
vertical-align: middle;
background: $--button-default-background-color;
border: $--border-base;
border: $--border-width-base $--border-style-base $--border-color-light;
font-weight: $--button-font-weight;
border-left: 0;
color: $--button-default-font-color;
color: $--color-text-primary;
-webkit-appearance: none;
text-align: center;
box-sizing: border-box;
......@@ -29,7 +29,8 @@
@include button-size($--button-padding-vertical, $--button-padding-horizontal, $--button-font-size, 0);
&:hover {
color: $--color-primary;
color: $--color-primary-hover;
background-color: rgba(9, 148, 220, 0.1);
}
& [class*="el-icon-"] {
......
......@@ -104,7 +104,7 @@
font-weight: 500;
color: $--color-text-primary;
position: relative;
border: 1px solid $--color-default-text-plain;
border: 1px solid $--border-color-light;
margin-left: 20px;
border-radius: 4px 4px 0 0;
background: #E6E8ED;
......@@ -129,7 +129,7 @@
}
&:hover {
background-color: $--color-text-placeholder;
background-color: #EFF2F7;
color: $--color-white;
}
}
......
......@@ -1470,7 +1470,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-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);
border-radius: 3px;
border: 1px solid #D0D0D0;
border: 1px solid #B6B9BA;
-webkit-box-sizing: border-box;
box-sizing: border-box;
background-color: #FFFFFF; }
......
......@@ -263,7 +263,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
/* Break-point
--------------------------*/
.el-breadcrumb {
font-size: 14px;
font-size: 12px;
line-height: 1; }
.el-breadcrumb::before,
.el-breadcrumb::after {
......@@ -287,7 +287,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-breadcrumb__item {
float: left; }
.el-breadcrumb__inner {
color: #666666; }
color: #999999; }
.el-breadcrumb__inner.is-link, .el-breadcrumb__inner a {
font-weight: normal;
text-decoration: none;
......@@ -298,11 +298,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
color: #0885C6;
cursor: pointer;
text-decoration: underline; }
.el-breadcrumb__item:last-child .el-breadcrumb__inner, .el-breadcrumb__item:last-child .el-breadcrumb__inner:hover,
.el-breadcrumb__item:last-child .el-breadcrumb__inner a,
.el-breadcrumb__item:last-child .el-breadcrumb__inner a:hover {
font-weight: normal;
color: #666666;
cursor: text; }
.el-breadcrumb__item:last-child .el-breadcrumb__separator {
display: none; }
.el-breadcrumb__item:last-child {
color: #333333; }
.el-breadcrumb__item:last-child .el-breadcrumb__inner, .el-breadcrumb__item:last-child .el-breadcrumb__inner:hover,
.el-breadcrumb__item:last-child .el-breadcrumb__inner a,
.el-breadcrumb__item:last-child .el-breadcrumb__inner a:hover {
font-weight: normal;
color: #666666;
cursor: text; }
.el-breadcrumb__item:last-child .el-breadcrumb__separator {
display: none; }
......@@ -1774,7 +1774,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-radius: 3px;
font-size: 12px; }
.el-cascader-panel.is-bordered {
border: solid 1px #D0D0D0;
border: solid 1px #B6B9BA;
border-radius: 3px; }
.el-cascader-menu {
......@@ -1782,7 +1782,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
color: #666666;
border-right: solid 1px #D0D0D0; }
border-right: solid 1px #B6B9BA; }
.el-cascader-menu:last-child {
border-right: none; }
.el-cascader-menu:last-child .el-cascader-node {
......
......@@ -3403,7 +3403,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-radius: 3px;
font-size: 12px; }
.el-cascader-panel.is-bordered {
border: solid 1px #D0D0D0;
border: solid 1px #B6B9BA;
border-radius: 3px; }
.el-cascader-menu {
......@@ -3411,7 +3411,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
color: #666666;
border-right: solid 1px #D0D0D0; }
border-right: solid 1px #B6B9BA; }
.el-cascader-menu:last-child {
border-right: none; }
.el-cascader-menu:last-child .el-cascader-node {
......@@ -3533,7 +3533,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
margin: 5px 0;
font-size: 12px;
background: #FFFFFF;
border: solid 1px #D0D0D0;
border: solid 1px #B6B9BA;
border-radius: 3px; }
.el-cascader__tags {
position: absolute;
......
......@@ -2599,8 +2599,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
box-sizing: border-box;
padding-top: 6px;
text-align: left;
border-top: 1px solid #D0D0D0;
border-bottom: 1px solid #D0D0D0; }
border-top: 1px solid #B6B9BA;
border-bottom: 1px solid #B6B9BA; }
.el-time-panel__content::after {
left: 50%;
margin-left: 12%;
......
......@@ -1454,16 +1454,15 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); }
.el-dropdown-menu__item {
list-style: none;
line-height: 36px;
padding: 0 20px;
margin: 0;
line-height: 16px;
padding: 0 10px;
margin: 0 10px;
font-size: 12px;
color: #666666;
color: #333333;
cursor: pointer;
outline: none; }
.el-dropdown-menu__item:not(.is-disabled):hover, .el-dropdown-menu__item:focus {
background-color: #e6f4fc;
color: #3aa9e3; }
color: #0885C6; }
.el-dropdown-menu__item i {
margin-right: 5px; }
.el-dropdown-menu__item--divided {
......
This diff is collapsed.
......@@ -574,7 +574,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-bottom: 2px solid #0994DC;
color: #333333; }
.el-menu--collapse {
width: 64px; }
width: 46px; }
.el-menu--collapse > .el-menu-item [class^="el-icon-"],
.el-menu--collapse > .el-submenu > .el-submenu__title [class^="el-icon-"] {
margin: 0;
......@@ -603,7 +603,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
top: 0;
left: 100%;
z-index: 10;
border: 1px solid #D0D0D0;
border: 1px solid #B6B9BA;
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); }
......
......@@ -280,7 +280,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
right: 8px;
bottom: 12px;
height: 1px;
background: #D0D0D0; }
background: #B6B9BA; }
.el-select-group__title {
padding-left: 8px;
font-size: 14px;
......
......@@ -2771,7 +2771,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
right: 8px;
bottom: 12px;
height: 1px;
background: #D0D0D0; }
background: #B6B9BA; }
.el-select-group__title {
padding-left: 8px;
font-size: 14px;
......
......@@ -400,10 +400,10 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
white-space: nowrap;
vertical-align: middle;
background: #FFFFFF;
border: 1px solid #E4E4E4;
border: 1px solid #B6B9BA;
font-weight: 500;
border-left: 0;
color: #0994DC;
color: #333333;
-webkit-appearance: none;
text-align: center;
-webkit-box-sizing: border-box;
......@@ -420,7 +420,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-radio-button__inner.is-round {
padding: 10px 16px; }
.el-radio-button__inner:hover {
color: #0994DC; }
color: #0885C6;
background-color: rgba(9, 148, 220, 0.1); }
.el-radio-button__inner [class*="el-icon-"] {
line-height: 0.9; }
.el-radio-button__inner [class*="el-icon-"] + span {
......
......@@ -2507,7 +2507,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
right: 8px;
bottom: 12px;
height: 1px;
background: #D0D0D0; }
background: #B6B9BA; }
.el-select-group__title {
padding-left: 8px;
font-size: 14px;
......
......@@ -1555,7 +1555,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
width: 100%;
height: 6px;
margin: 16px 0;
background-color: #D0D0D0;
background-color: #B6B9BA;
border-radius: 3px;
position: relative;
cursor: pointer;
......
......@@ -311,7 +311,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
bottom: 0;
width: 100%;
height: 2px;
background-color: #D0D0D0;
background-color: #B6B9BA;
z-index: 1; }
.el-tabs__nav-wrap.is-scrollable {
padding: 0 20px;
......@@ -367,7 +367,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
font-weight: 500;
color: #333333;
position: relative;
border: 1px solid #999999;
border: 1px solid #B6B9BA;
margin-left: 20px;
border-radius: 4px 4px 0 0;
background: #E6E8ED; }
......@@ -388,7 +388,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
transform: scale(0.9);
display: inline-block; }
.el-tabs__item .el-icon-close:hover {
background-color: #CCCCCC;
background-color: #EFF2F7;
color: #FFFFFF; }
.el-tabs__item.is-active {
color: #0994DC;
......@@ -405,13 +405,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
position: relative; }
.el-tabs--card > .el-tabs__header {
border-bottom: 1px solid #D0D0D0; }
border-bottom: 1px solid #B6B9BA; }
.el-tabs--card > .el-tabs__header .el-tabs__nav-wrap::after {
content: none; }
.el-tabs--card > .el-tabs__header .el-tabs__nav {
border: 1px solid #D0D0D0;
border: 1px solid #B6B9BA;
border-bottom: none;
border-radius: 4px 4px 0 0;
-webkit-box-sizing: border-box;
......@@ -459,7 +459,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
padding: 15px; }
.el-tabs--border-card > .el-tabs__header {
background-color: #F6F6F6;
border-bottom: 1px solid #D0D0D0;
border-bottom: 1px solid #B6B9BA;
margin: 0; }
.el-tabs--border-card > .el-tabs__header .el-tabs__nav-wrap::after {
content: none; }
......@@ -620,17 +620,17 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tabs--left.el-tabs--card .el-tabs__item.is-left {
border-left: none;
border-right: 1px solid #D0D0D0;
border-right: 1px solid #B6B9BA;
border-bottom: none;
border-top: 1px solid #D0D0D0;
border-top: 1px solid #B6B9BA;
text-align: left; }
.el-tabs--left.el-tabs--card .el-tabs__item.is-left:first-child {
border-right: 1px solid #D0D0D0;
border-right: 1px solid #B6B9BA;
border-top: none; }
.el-tabs--left.el-tabs--card .el-tabs__item.is-left.is-active {
border: 1px solid #D0D0D0;
border: 1px solid #B6B9BA;
border-right-color: #fff;
border-left: none;
border-bottom: none; }
......@@ -641,7 +641,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tabs--left.el-tabs--card .el-tabs__nav {
border-radius: 4px 0 0 4px;
border-bottom: 1px solid #D0D0D0;
border-bottom: 1px solid #B6B9BA;
border-right: none; }
.el-tabs--left.el-tabs--card .el-tabs__new-tab {
......@@ -677,14 +677,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tabs--right.el-tabs--card .el-tabs__item.is-right {
border-bottom: none;
border-top: 1px solid #D0D0D0; }
border-top: 1px solid #B6B9BA; }
.el-tabs--right.el-tabs--card .el-tabs__item.is-right:first-child {
border-left: 1px solid #D0D0D0;
border-left: 1px solid #B6B9BA;
border-top: none; }
.el-tabs--right.el-tabs--card .el-tabs__item.is-right.is-active {
border: 1px solid #D0D0D0;
border: 1px solid #B6B9BA;
border-left-color: #fff;
border-right: none;
border-bottom: none; }
......@@ -695,7 +695,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-tabs--right.el-tabs--card .el-tabs__nav {
border-radius: 0 4px 4px 0;
border-bottom: 1px solid #D0D0D0;
border-bottom: 1px solid #B6B9BA;
border-left: none; }
.el-tabs--right.el-tabs--border-card .el-tabs__header.is-right {
......
......@@ -1225,8 +1225,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
box-sizing: border-box;
padding-top: 6px;
text-align: left;
border-top: 1px solid #D0D0D0;
border-bottom: 1px solid #D0D0D0; }
border-top: 1px solid #B6B9BA;
border-bottom: 1px solid #B6B9BA; }
.el-time-panel__content::after {
left: 50%;
margin-left: 12%;
......
......@@ -273,13 +273,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
position: absolute;
left: 4px;
height: 100%;
border-left: 2px solid #D0D0D0; }
border-left: 2px solid #B6B9BA; }
.el-timeline-item__icon {
color: #FFFFFF;
font-size: 13px; }
.el-timeline-item__node {
position: absolute;
background-color: #D0D0D0;
background-color: #B6B9BA;
border-radius: 50%;
display: -webkit-box;
display: -ms-flexbox;
......
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