Skip to content

S
style_tool
Commit 26a0f731 authored by 于广洋's avatar 于广洋
Browse files
Options

Merge branch 'master' into 'master' 

调整分页、警告

See merge request !1
parents 6509bedf 1155135b
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 32 deletions
node_module/element-theme-chalk/src/alert.scss
View file @ 26a0f731
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
@include b(alert) { @include b(alert) {
width: 100%; width: 100%;
padding: $--alert-padding; padding: 8px;
margin: 0; margin: 0;
box-sizing: border-box; box-sizing: border-box;
border-radius: $--alert-border-radius; border-radius: $--alert-border-radius;
...@@ -14,6 +14,12 @@ ...@@ -14,6 +14,12 @@
display: flex; display: flex;
align-items: center; align-items: center;
transition: opacity .2s; transition: opacity .2s;
border-width: 1px;
border-style: solid;
.el-alert__icon{
font-size: 16px!important;
width: 16px!important;
}
@include when(light) { @include when(light) {
.el-alert__closebtn { .el-alert__closebtn {
...@@ -36,9 +42,9 @@ ...@@ -36,9 +42,9 @@
@include m(success) { @include m(success) {
&.is-light { &.is-light {
background-color: $--alert-success-color; background-color: #EBF8F2;
color: $--color-success; border-color: #CFEFDF;
color: #4EC87C;
.el-alert__description { .el-alert__description {
color: $--color-success; color: $--color-success;
} }
...@@ -52,8 +58,9 @@ ...@@ -52,8 +58,9 @@
@include m(info) { @include m(info) {
&.is-light { &.is-light {
background-color: $--alert-info-color; background-color: #FFF9E1;
color: $--color-info; border-color: #FFE3BE;
color: #FFBF00;
} }
&.is-dark { &.is-dark {
...@@ -68,8 +75,9 @@ ...@@ -68,8 +75,9 @@
@include m(warning) { @include m(warning) {
&.is-light { &.is-light {
background-color: $--alert-warning-color; background-color: #FFF5E6;
color: $--color-warning; border-color: #F8DDC0;
color: #FFA533;
.el-alert__description { .el-alert__description {
color: $--color-warning; color: $--color-warning;
...@@ -84,8 +92,9 @@ ...@@ -84,8 +92,9 @@
@include m(error) { @include m(error) {
&.is-light { &.is-light {
background-color: $--alert-danger-color; background-color: #FCEEED;
color: $--color-danger; border-color: #FCDDDC;
color: #FF3D33;
.el-alert__description { .el-alert__description {
color: $--color-danger; color: $--color-danger;
...@@ -98,9 +107,30 @@ ...@@ -98,9 +107,30 @@
} }
} }
@include m(notice) {
&.is-light {
background-color: #EAF4FF;
border-color: #D5E8FC;
color: #666666;
.el-alert__description {
color: #666666;
}
.el-icon-info{
color: #00BBF2
}
}
&.is-dark {
background-color: $--color-danger;
color: $--color-white;
}
}
@include e(content) { @include e(content) {
display: table-cell; display: table-cell;
padding: 0 8px; padding: 0 8px;
text-align: left;
} }
@include e(icon) { @include e(icon) {
...@@ -113,7 +143,7 @@ ...@@ -113,7 +143,7 @@
} }
@include e(title) { @include e(title) {
font-size: $--alert-title-font-size; font-size: 14px;
line-height: 18px; line-height: 18px;
@include when(bold) { @include when(bold) {
font-weight: bold; font-weight: bold;
...@@ -130,7 +160,7 @@ ...@@ -130,7 +160,7 @@
opacity: 1; opacity: 1;
position: absolute; position: absolute;
top: 12px; top: 12px;
right: 15px; right: 8px;
cursor: pointer; cursor: pointer;
@include when(customed) { @include when(customed) {
......
node_module/element-theme-chalk/src/notification.scss
View file @ 26a0f731
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
border: 1px solid $--notification-border-color; border: 1px solid $--notification-border-color;
position: fixed; position: fixed;
background-color: $--color-white; background-color: $--color-white;
box-shadow: $--notification-shadow; // box-shadow: $--notification-shadow;
box-shadow: 0 1px 6px rgba(0,0,0,1);
transition: opacity .3s, transform .3s, left .3s, right .3s, top 0.4s, bottom .3s; transition: opacity .3s, transform .3s, left .3s, right .3s, top 0.4s, bottom .3s;
overflow: hidden; overflow: hidden;
...@@ -30,7 +31,8 @@ ...@@ -30,7 +31,8 @@
@include e(title) { @include e(title) {
font-weight: bold; font-weight: bold;
font-size: $--notification-title-font-size; font-size: $--notification-title-font-size;
color: $--notification-title-color; // color: $--notification-title-color;
color: #333;
margin: 0; margin: 0;
} }
...@@ -38,12 +40,19 @@ ...@@ -38,12 +40,19 @@
font-size: $--notification-content-font-size; font-size: $--notification-content-font-size;
line-height: 21px; line-height: 21px;
margin: 6px 0 0 0; margin: 6px 0 0 0;
color: $--notification-content-color; // color: $--notification-content-color;
color: #999;
text-align: justify; text-align: justify;
p { p {
margin: 0; margin: 0;
} }
@include e(notice) {
.el-icon-info{
color: #00BBF2
}
}
} }
@include e(icon) { @include e(icon) {
...@@ -80,6 +89,9 @@ ...@@ -80,6 +89,9 @@
.el-icon-warning { .el-icon-warning {
color: $--notification-warning-icon-color; color: $--notification-warning-icon-color;
} }
.el-icon-notice {
color: #00BBF2;
}
} }
.el-notification-fade-enter { .el-notification-fade-enter {
......
node_module/element-theme-chalk/src/pagination.scss
View file @ 26a0f731
...@@ -13,10 +13,14 @@ ...@@ -13,10 +13,14 @@
span:not([class*=suffix]), span:not([class*=suffix]),
button { button {
display: inline-block; display: inline-block;
font-size: $--pagination-font-size; // font-size: $--pagination-font-size;
min-width: $--pagination-button-width; // min-width: $--pagination-button-width;
height: $--pagination-button-height; // height: $--pagination-button-height;
line-height: $--pagination-button-height; // line-height: $--pagination-button-height;
font-size: 14px;
min-width: 32px;
height: 32px;
line-height: 32px;
vertical-align: top; vertical-align: top;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -44,7 +48,11 @@ ...@@ -44,7 +48,11 @@
} }
button { button {
border: none; // border: none;
border-width: 1px;
border-style: solid;
border-color: #E4E4E4;
border-radius: 3px;
padding: 0 6px; padding: 0 6px;
background: transparent; background: transparent;
...@@ -57,8 +65,11 @@ ...@@ -57,8 +65,11 @@
} }
&:disabled { &:disabled {
// color: $--pagination-button-disabled-color;
// background-color: $--pagination-button-disabled-background-color;
color: $--pagination-button-disabled-color; color: $--pagination-button-disabled-color;
background-color: $--pagination-button-disabled-background-color; background-color: #F8F8F8;
border-color: #EBEBEB;
cursor: not-allowed; cursor: not-allowed;
} }
} }
...@@ -81,10 +92,13 @@ ...@@ -81,10 +92,13 @@
.btn-prev { .btn-prev {
padding-right: 12px; padding-right: 12px;
margin-right: 8px;
} }
.btn-next { .btn-next {
padding-left: 12px; padding-left: 12px;
margin-left: 4px;
margin-right: 12px;
} }
.el-pager li.disabled { .el-pager li.disabled {
...@@ -145,13 +159,13 @@ ...@@ -145,13 +159,13 @@
} }
@include e(total) { @include e(total) {
margin-right: 10px; margin: 0 12px;
font-weight: normal; font-weight: normal;
color: $--color-text-regular; color: $--color-text-regular;
} }
@include e(jump) { @include e(jump) {
margin-left: 24px; margin: 0 12px;
font-weight: normal; font-weight: normal;
color: $--color-text-regular; color: $--color-text-regular;
...@@ -248,19 +262,28 @@ ...@@ -248,19 +262,28 @@
} }
li { li {
padding: 0 4px; // padding: 0 4px;
background: $--pagination-background-color; background: $--pagination-background-color;
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
font-size: $--pagination-font-size; // font-size: $--pagination-font-size;
min-width: $--pagination-button-width; // min-width: $--pagination-button-width;
height: $--pagination-button-height; // height: $--pagination-button-height;
line-height: $--pagination-button-height; // line-height: $--pagination-button-height;
padding: 0 8px;
font-size: 14px;
color: #333333;
min-width: 32px;
height: 32px;
line-height: 32px;
cursor: pointer; cursor: pointer;
box-sizing: border-box; box-sizing: border-box;
text-align: center; text-align: center;
margin: 0; margin: 0 4px;
border-width: 1px;
border-style: solid;
border-color: #E4E4E4;
border-radius: 3px;
&.btn-quicknext, &.btn-quicknext,
&.btn-quickprev { &.btn-quickprev {
line-height: 28px; line-height: 28px;
...@@ -280,16 +303,33 @@ ...@@ -280,16 +303,33 @@
} }
&.active + li { &.active + li {
border-left: 0; // border-left: 0;
} }
&:hover { &:hover {
color: $--pagination-hover-color; // color: $--pagination-hover-color;
color: #0885C6;
background-color: #EDF6FC;
border-color: #0885C6;
} }
&.active { &.active {
color: $--pagination-hover-color; color: $--pagination-hover-color;
cursor: default; cursor: default;
border: none;
}
&.active:hover {
border-color: #0885C6;
border-width: 1px;
border-style: solid;
} }
} }
.more{
border: none
}
.more:hover {
border-color: #0885C6;
border-width: 1px;
border-style: solid;
}
} }
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