Skip to content

S
style_tool
Commit a1baa17d authored by luohua's avatar luohua
Browse files
Options

统一改样式

parent 4745fc7a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 229 additions and 168 deletions
element-variables.scss
View file @ a1baa17d
......@@ -594,7 +594,7 @@ $--button-medium-font-size: $--font-size-base !default;
/// borderRadius||Border|2
$--button-medium-border-radius: $--border-radius-base !default;
/// padding||Spacing|3
$--button-medium-padding-vertical: 8px !default;
$--button-medium-padding-vertical: 9px !default;
/// padding||Spacing|3
$--button-medium-padding-horizontal: 16px !default;
......
node_module/element-theme-chalk/src/menu.scss
View file @ a1baa17d
......@@ -131,9 +131,12 @@
}
@include m(collapse) {
width: 46px;
> .el-menu-item,
> .el-submenu > .el-submenu__title {
padding: 0 10px !important;
.el-tooltip{
padding: 0 10px !important;
}
[class^="el-icon-"] {
margin: 0;
vertical-align: middle;
......
node_module/element-theme-chalk/src/message-box.scss
View file @ a1baa17d
......@@ -6,7 +6,7 @@
@include b(message-box) {
display: inline-block;
width: $--msgbox-width;
width: 280px;
padding-bottom: 24px;
vertical-align: middle;
background-color: $--color-white;
......@@ -14,7 +14,7 @@
border: 1px solid $--border-color-lighter;
font-size: $--messagebox-font-size;
box-shadow: $--box-shadow-heavy;
text-align: left;
text-align: center;
overflow: hidden;
backface-visibility: hidden;
......@@ -38,22 +38,25 @@
@include e(header) {
position: relative;
padding:$--msgbox-header-padding-primary;
padding-bottom: 8px;
padding-top: 8px;
padding-bottom: 6px;
padding-top: 6px;
background-color: #EFF2F7;
border-bottom: 1px solid #D0D0D0;
}
@include e(title) {
padding-left: 0;
margin-bottom: 0;
font-size: $--messagebox-font-size;
line-height: 36px;
height: 36px;
font-size: $--size-base;
line-height: 20px;
text-align: left;
height: 20px;
color: $--messagebox-title-color;
}
@include e(headerbtn) {
position: absolute;
top: $--msgbox-header-padding-primary;
top: 8px;
right: 12px;
padding: 0;
border: none;
......@@ -75,7 +78,7 @@
}
@include e(content) {
padding: 0px $--msgbox-padding-primary;
padding: $--dialog-padding-primary;
color: $--messagebox-content-color;
font-size: $--messagebox-content-font-size;
position: relative;
......@@ -100,7 +103,7 @@
position: absolute;
top: 50%;
transform: translateY(-50%);
font-size: 24px !important;
font-size: 20px !important;
&::before {
// 防止图标切割
......@@ -108,7 +111,7 @@
}
+ .el-message-box__message {
padding-left: 32px;
padding-left: 34px;
padding-right: 8px;
}
......@@ -131,10 +134,17 @@
@include e(message) {
margin: 0;
display: inline-block;
& p {
margin: 0;
text-align: left;
line-height: 24px;
& .mes {
line-height: 32px;display: block; font-size: 14px; color: #333;
}
& .tip {
line-height: 24px;display: block; font-size: 12px; color: #999;
}
}
}
......@@ -146,15 +156,20 @@
}
@include e(btns) {
padding: 24px 16px 0;
text-align: right;
padding: 0 16px;
display: inline-block;
& button{
padding: 9px 15px;
font-size: 12px;
border-radius: 3px;
margin: 0;
}
& button:nth-child(1) {
color: $--color-text-secondary;
background-color: $--color-white;
border-color: $--color-text-placeholder;
float: right;
margin-left: 8px;
margin-left: 16px;
&:focus, &:hover {
color:$--color-primary-text-plain-hover;
background-color: $--color-primary-background-plain-hover;
......@@ -175,14 +190,13 @@
padding-bottom: 30px;
@include e(header) {
padding-top: 30px;
}
@include e(title) {
position: relative;
background-color: #EFF2F7;
display: flex;
align-items: center;
justify-content: center;
}
@include e(status) {
......
node_module/element-theme-chalk/src/table.scss
View file @ a1baa17d
......@@ -12,7 +12,7 @@
width: 100%;
max-width: 100%;
background-color: $--color-white;
font-size: 14px;
font-size: 12px;
color: $--table-font-color;
// 数据为空
......@@ -109,11 +109,11 @@
thead {
color: $--table-header-font-color;
th{
font-weight: 500;
font-weight: bold;
}
&.is-group {
th {
background: $--background-color-base;
background: $--background-color-light;
}
}
}
......@@ -487,7 +487,7 @@
& .el-table__body {
& tr.el-table__row--striped {
td {
background: #FAFAFA;
background: #FBFBFB;
}
&.current-row td {
......
theme/button.css
View file @ a1baa17d
......@@ -688,13 +688,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: #EBEBEB;
color: #CCCCCC; }
.el-button--medium {
padding: 8px 16px;
padding: 9px 16px;
font-size: 12px;
border-radius: 3px; }
.el-button--medium.is-round {
padding: 8px 16px; }
padding: 9px 16px; }
.el-button--medium.is-circle {
padding: 8px; }
padding: 9px; }
.el-button--small {
padding: 6px 16px;
font-size: 12px;
......
theme/calendar.css
View file @ a1baa17d
......@@ -952,13 +952,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: #EBEBEB;
color: #CCCCCC; }
.el-button--medium {
padding: 8px 16px;
padding: 9px 16px;
font-size: 12px;
border-radius: 3px; }
.el-button--medium.is-round {
padding: 8px 16px; }
padding: 9px 16px; }
.el-button--medium.is-circle {
padding: 8px; }
padding: 9px; }
.el-button--small {
padding: 6px 16px;
font-size: 12px;
......
theme/cascader-panel.css
View file @ a1baa17d
......@@ -899,11 +899,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-checkbox-button:last-child .el-checkbox-button__inner {
border-radius: 0 3px 3px 0; }
.el-checkbox-button--medium .el-checkbox-button__inner {
padding: 8px 16px;
padding: 9px 16px;
font-size: 12px;
border-radius: 0; }
.el-checkbox-button--medium .el-checkbox-button__inner.is-round {
padding: 8px 16px; }
padding: 9px 16px; }
.el-checkbox-button--small .el-checkbox-button__inner {
padding: 6px 16px;
font-size: 12px;
......
theme/cascader.css
View file @ a1baa17d
......@@ -2528,11 +2528,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-checkbox-button:last-child .el-checkbox-button__inner {
border-radius: 0 3px 3px 0; }
.el-checkbox-button--medium .el-checkbox-button__inner {
padding: 8px 16px;
padding: 9px 16px;
font-size: 12px;
border-radius: 0; }
.el-checkbox-button--medium .el-checkbox-button__inner.is-round {
padding: 8px 16px; }
padding: 9px 16px; }
.el-checkbox-button--small .el-checkbox-button__inner {
padding: 6px 16px;
font-size: 12px;
......
theme/checkbox.css
View file @ a1baa17d
......@@ -635,11 +635,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-checkbox-button:last-child .el-checkbox-button__inner {
border-radius: 0 3px 3px 0; }
.el-checkbox-button--medium .el-checkbox-button__inner {
padding: 8px 16px;
padding: 9px 16px;
font-size: 12px;
border-radius: 0; }
.el-checkbox-button--medium .el-checkbox-button__inner.is-round {
padding: 8px 16px; }
padding: 9px 16px; }
.el-checkbox-button--small .el-checkbox-button__inner {
padding: 6px 16px;
font-size: 12px;
......
theme/dropdown.css
View file @ a1baa17d
......@@ -952,13 +952,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: #EBEBEB;
color: #CCCCCC; }
.el-button--medium {
padding: 8px 16px;
padding: 9px 16px;
font-size: 12px;
border-radius: 3px; }
.el-button--medium.is-round {
padding: 8px 16px; }
padding: 9px 16px; }
.el-button--medium.is-circle {
padding: 8px; }
padding: 9px; }
.el-button--small {
padding: 6px 16px;
font-size: 12px;
......
theme/index.css
View file @ a1baa17d
This diff is collapsed.
theme/menu.css
View file @ a1baa17d
......@@ -575,22 +575,28 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
color: #333333; }
.el-menu--collapse {
width: 46px; }
.el-menu--collapse > .el-menu-item [class^="el-icon-"],
.el-menu--collapse > .el-submenu > .el-submenu__title [class^="el-icon-"] {
margin: 0;
vertical-align: middle;
width: 24px;
text-align: center; }
.el-menu--collapse > .el-menu-item .el-submenu__icon-arrow,
.el-menu--collapse > .el-submenu > .el-submenu__title .el-submenu__icon-arrow {
display: none; }
.el-menu--collapse > .el-menu-item span,
.el-menu--collapse > .el-submenu > .el-submenu__title span {
height: 0;
width: 0;
overflow: hidden;
visibility: hidden;
display: inline-block; }
.el-menu--collapse > .el-menu-item,
.el-menu--collapse > .el-submenu > .el-submenu__title {
padding: 0 10px !important; }
.el-menu--collapse > .el-menu-item .el-tooltip,
.el-menu--collapse > .el-submenu > .el-submenu__title .el-tooltip {
padding: 0 10px !important; }
.el-menu--collapse > .el-menu-item [class^="el-icon-"],
.el-menu--collapse > .el-submenu > .el-submenu__title [class^="el-icon-"] {
margin: 0;
vertical-align: middle;
width: 24px;
text-align: center; }
.el-menu--collapse > .el-menu-item .el-submenu__icon-arrow,
.el-menu--collapse > .el-submenu > .el-submenu__title .el-submenu__icon-arrow {
display: none; }
.el-menu--collapse > .el-menu-item span,
.el-menu--collapse > .el-submenu > .el-submenu__title span {
height: 0;
width: 0;
overflow: hidden;
visibility: hidden;
display: inline-block; }
.el-menu--collapse > .el-menu-item.is-active i {
color: inherit; }
.el-menu--collapse .el-menu .el-submenu {
......
theme/message-box.css
View file @ a1baa17d
......@@ -1256,13 +1256,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: #EBEBEB;
color: #CCCCCC; }
.el-button--medium {
padding: 8px 16px;
padding: 9px 16px;
font-size: 12px;
border-radius: 3px; }
.el-button--medium.is-round {
padding: 8px 16px; }
padding: 9px 16px; }
.el-button--medium.is-circle {
padding: 8px; }
padding: 9px; }
.el-button--small {
padding: 6px 16px;
font-size: 12px;
......@@ -1932,7 +1932,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-message-box {
display: inline-block;
width: 420px;
width: 280px;
padding-bottom: 24px;
vertical-align: middle;
background-color: #FFFFFF;
......@@ -1941,7 +1941,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
font-size: 18px;
-webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.2);
text-align: left;
text-align: center;
overflow: hidden;
-webkit-backface-visibility: hidden;
backface-visibility: hidden; }
......@@ -1961,18 +1961,21 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-message-box__header {
position: relative;
padding: 16px;
padding-bottom: 8px;
padding-top: 8px; }
padding-bottom: 6px;
padding-top: 6px;
background-color: #EFF2F7;
border-bottom: 1px solid #D0D0D0; }
.el-message-box__title {
padding-left: 0;
margin-bottom: 0;
font-size: 18px;
line-height: 36px;
height: 36px;
font-size: 14px;
line-height: 20px;
text-align: left;
height: 20px;
color: #333333; }
.el-message-box__headerbtn {
position: absolute;
top: 16px;
top: 8px;
right: 12px;
padding: 0;
border: none;
......@@ -1985,7 +1988,7 @@ $--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 {
color: #0994DC; }
.el-message-box__content {
padding: 0px 24px;
padding: 20px;
color: #333333;
font-size: 12px;
position: relative; }
......@@ -2002,11 +2005,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
top: 50%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
font-size: 24px !important; }
font-size: 20px !important; }
.el-message-box__status::before {
padding-left: 1px; }
.el-message-box__status + .el-message-box__message {
padding-left: 32px;
padding-left: 34px;
padding-right: 8px; }
.el-message-box__status.el-icon-success {
color: #4EC87C; }
......@@ -2017,24 +2020,41 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-message-box__status.el-icon-error {
color: #FF3D33; }
.el-message-box__message {
margin: 0; }
margin: 0;
display: inline-block; }
.el-message-box__message p {
margin: 0;
text-align: left;
line-height: 24px; }
.el-message-box__message p .mes {
line-height: 32px;
display: block;
font-size: 14px;
color: #333; }
.el-message-box__message p .tip {
line-height: 24px;
display: block;
font-size: 12px;
color: #999; }
.el-message-box__errormsg {
color: #FF3D33;
font-size: 12px;
min-height: 18px;
margin-top: 2px; }
.el-message-box__btns {
padding: 24px 16px 0;
text-align: right; }
padding: 0 16px;
display: inline-block; }
.el-message-box__btns button {
padding: 9px 15px;
font-size: 12px;
border-radius: 3px;
margin: 0; }
.el-message-box__btns button:nth-child(1) {
color: #999999;
background-color: #FFFFFF;
border-color: #CCCCCC;
float: right;
margin-left: 8px; }
margin-left: 16px; }
.el-message-box__btns button:nth-child(1):focus, .el-message-box__btns button:nth-child(1):hover {
color: #0885C6;
background-color: #EDF6FC;
......@@ -2046,19 +2066,15 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
flex-direction: row-reverse; }
.el-message-box--center {
padding-bottom: 30px; }
.el-message-box--center .el-message-box__header {
padding-top: 30px; }
.el-message-box--center .el-message-box__title {
position: relative;
background-color: #EFF2F7;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center; }
align-items: center; }
.el-message-box--center .el-message-box__status {
position: relative;
top: auto;
......
theme/radio-button.css
View file @ a1baa17d
......@@ -457,11 +457,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-radio-button:first-child:last-child .el-radio-button__inner {
border-radius: 3px; }
.el-radio-button--medium .el-radio-button__inner {
padding: 8px 16px;
padding: 9px 16px;
font-size: 12px;
border-radius: 0; }
.el-radio-button--medium .el-radio-button__inner.is-round {
padding: 8px 16px; }
padding: 9px 16px; }
.el-radio-button--small .el-radio-button__inner {
padding: 6px 16px;
font-size: 12px;
......
theme/table-column.css
View file @ a1baa17d
......@@ -772,11 +772,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-checkbox-button:last-child .el-checkbox-button__inner {
border-radius: 0 3px 3px 0; }
.el-checkbox-button--medium .el-checkbox-button__inner {
padding: 8px 16px;
padding: 9px 16px;
font-size: 12px;
border-radius: 0; }
.el-checkbox-button--medium .el-checkbox-button__inner.is-round {
padding: 8px 16px; }
padding: 9px 16px; }
.el-checkbox-button--small .el-checkbox-button__inner {
padding: 6px 16px;
font-size: 12px;
......
theme/table.css
View file @ a1baa17d
......@@ -772,11 +772,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-checkbox-button:last-child .el-checkbox-button__inner {
border-radius: 0 3px 3px 0; }
.el-checkbox-button--medium .el-checkbox-button__inner {
padding: 8px 16px;
padding: 9px 16px;
font-size: 12px;
border-radius: 0; }
.el-checkbox-button--medium .el-checkbox-button__inner.is-round {
padding: 8px 16px; }
padding: 9px 16px; }
.el-checkbox-button--small .el-checkbox-button__inner {
padding: 6px 16px;
font-size: 12px;
......@@ -1765,7 +1765,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
width: 100%;
max-width: 100%;
background-color: #FFFFFF;
font-size: 14px;
font-size: 12px;
color: #666666; }
.el-table__empty-block {
min-height: 60px;
......@@ -1829,9 +1829,9 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-table thead {
color: #333333; }
.el-table thead th {
font-weight: 500; }
font-weight: bold; }
.el-table thead.is-group th {
background: #F6F6F6; }
background: #F5F6F7; }
.el-table th, .el-table td {
min-width: 0;
-webkit-box-sizing: border-box;
......@@ -2073,7 +2073,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
position: absolute;
z-index: -1; }
.el-table--striped .el-table__body tr.el-table__row--striped td {
background: #FAFAFA; }
background: #FBFBFB; }
.el-table--striped .el-table__body tr.el-table__row--striped.current-row td {
background-color: #D1ECFF; }
.el-table__body tr.hover-row > td, .el-table__body tr.hover-row.current-row > td, .el-table__body tr.hover-row.el-table__row--striped > td, .el-table__body tr.hover-row.el-table__row--striped.current-row > td {
......
theme/transfer.css
View file @ a1baa17d
......@@ -1508,13 +1508,13 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
border-color: #EBEBEB;
color: #CCCCCC; }
.el-button--medium {
padding: 8px 16px;
padding: 9px 16px;
font-size: 12px;
border-radius: 3px; }
.el-button--medium.is-round {
padding: 8px 16px; }
padding: 9px 16px; }
.el-button--medium.is-circle {
padding: 8px; }
padding: 9px; }
.el-button--small {
padding: 6px 16px;
font-size: 12px;
......@@ -2263,11 +2263,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-checkbox-button:last-child .el-checkbox-button__inner {
border-radius: 0 3px 3px 0; }
.el-checkbox-button--medium .el-checkbox-button__inner {
padding: 8px 16px;
padding: 9px 16px;
font-size: 12px;
border-radius: 0; }
.el-checkbox-button--medium .el-checkbox-button__inner.is-round {
padding: 8px 16px; }
padding: 9px 16px; }
.el-checkbox-button--small .el-checkbox-button__inner {
padding: 6px 16px;
font-size: 12px;
......
theme/tree.css
View file @ a1baa17d
......@@ -1142,11 +1142,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-checkbox-button:last-child .el-checkbox-button__inner {
border-radius: 0 3px 3px 0; }
.el-checkbox-button--medium .el-checkbox-button__inner {
padding: 8px 16px;
padding: 9px 16px;
font-size: 12px;
border-radius: 0; }
.el-checkbox-button--medium .el-checkbox-button__inner.is-round {
padding: 8px 16px; }
padding: 9px 16px; }
.el-checkbox-button--small .el-checkbox-button__inner {
padding: 6px 16px;
font-size: 12px;
......
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