Skip to content

S
style_tool
Commit c0ce7ab3 authored by 刘安琪's avatar 刘安琪
Browse files
Options

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

parents 1c5a3101 41d88d46
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 33 deletions
node_module/element-theme-chalk/src/form.scss
View file @ c0ce7ab3
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
} }
} }
@include b(form-item) { @include b(form-item) {
margin-bottom: 22px; margin-bottom: 12px;
@include utils-clearfix; @include utils-clearfix;
& .el-form-item { & .el-form-item {
...@@ -98,14 +98,18 @@ ...@@ -98,14 +98,18 @@
float: left; float: left;
font-size: $--form-label-font-size; font-size: $--form-label-font-size;
color: $--color-text-regular; color: $--color-text-regular;
line-height: 40px; line-height: 32px;
padding: 0 12px 0 0; padding: 0 8px 0 0;
box-sizing: border-box; box-sizing: border-box;
} }
@include e(content) { @include e(content) {
line-height: 40px; line-height: 32px;
min-height: 32px;
position: relative; position: relative;
font-size: 14px; font-size: 14px;
display: flex;
display: -webkit-flex;
align-items:center;
@include utils-clearfix; @include utils-clearfix;
.el-input-group { .el-input-group {
...@@ -115,11 +119,13 @@ ...@@ -115,11 +119,13 @@
@include e(error) { @include e(error) {
color: $--color-danger; color: $--color-danger;
font-size: 12px; font-size: 12px;
line-height: 1; line-height: 32px;
padding-top: 4px; height: 32px;
position: absolute; white-space:nowrap;
top: 100%; margin-left:28px;
left: 0; // position: absolute;
// top: 100%;
// left: 0;
@include m(inline) { @include m(inline) {
position: relative; position: relative;
...@@ -156,6 +162,8 @@ ...@@ -156,6 +162,8 @@
} }
.el-input__validateIcon { .el-input__validateIcon {
color: $--color-danger; color: $--color-danger;
position: relative;
right:-28px;
} }
} }
...@@ -164,4 +172,8 @@ ...@@ -164,4 +172,8 @@
display: inline-block; display: inline-block;
} }
} }
.el-form-item__content .el-button{
margin-top:40px;
margin-left:16px;
}
} }
theme/form.css
View file @ c0ce7ab3
...@@ -288,7 +288,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -288,7 +288,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
display: block; } display: block; }
.el-form-item { .el-form-item {
margin-bottom: 22px; } margin-bottom: 12px; }
.el-form-item::before, .el-form-item::before,
.el-form-item::after { .el-form-item::after {
display: table; display: table;
...@@ -330,14 +330,22 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -330,14 +330,22 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
float: left; float: left;
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;
line-height: 40px; line-height: 32px;
padding: 0 12px 0 0; padding: 0 8px 0 0;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
.el-form-item__content { .el-form-item__content {
line-height: 40px; line-height: 32px;
min-height: 32px;
position: relative; position: relative;
font-size: 14px; } font-size: 14px;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
display: -webkit-flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center; }
.el-form-item__content::before, .el-form-item__content::before,
.el-form-item__content::after { .el-form-item__content::after {
display: table; display: table;
...@@ -349,11 +357,10 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -349,11 +357,10 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-form-item__error { .el-form-item__error {
color: #FF3D33; color: #FF3D33;
font-size: 12px; font-size: 12px;
line-height: 1; line-height: 32px;
padding-top: 4px; height: 32px;
position: absolute; white-space: nowrap;
top: 100%; margin-left: 28px; }
left: 0; }
.el-form-item__error--inline { .el-form-item__error--inline {
position: relative; position: relative;
top: auto; top: auto;
...@@ -373,6 +380,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -373,6 +380,11 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-form-item.is-error .el-input-group__prepend .el-input__inner { .el-form-item.is-error .el-input-group__prepend .el-input__inner {
border-color: transparent; } border-color: transparent; }
.el-form-item.is-error .el-input__validateIcon { .el-form-item.is-error .el-input__validateIcon {
color: #FF3D33; } color: #FF3D33;
position: relative;
right: -28px; }
.el-form-item--feedback .el-input__validateIcon { .el-form-item--feedback .el-input__validateIcon {
display: inline-block; } display: inline-block; }
.el-form-item .el-form-item__content .el-button {
margin-top: 40px;
margin-left: 16px; }
theme/index.css
View file @ c0ce7ab3
...@@ -31589,7 +31589,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -31589,7 +31589,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-message-box__content { .el-message-box__content {
padding: 10px 24px; padding: 10px 24px;
color: #333333; color: #333333;
font-size: 14px; } font-size: 14px;
position: relative; }
.el-message-box__container { .el-message-box__container {
position: relative; } position: relative; }
.el-message-box__input { .el-message-box__input {
...@@ -32307,7 +32308,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -32307,7 +32308,7 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
display: block; } display: block; }
.el-form-item { .el-form-item {
margin-bottom: 22px; } margin-bottom: 12px; }
.el-form-item::before, .el-form-item::before,
.el-form-item::after { .el-form-item::after {
display: table; display: table;
...@@ -32349,14 +32350,22 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -32349,14 +32350,22 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
float: left; float: left;
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;
line-height: 40px; line-height: 32px;
padding: 0 12px 0 0; padding: 0 8px 0 0;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
.el-form-item__content { .el-form-item__content {
line-height: 40px; line-height: 32px;
min-height: 32px;
position: relative; position: relative;
font-size: 14px; } font-size: 14px;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
display: -webkit-flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center; }
.el-form-item__content::before, .el-form-item__content::before,
.el-form-item__content::after { .el-form-item__content::after {
display: table; display: table;
...@@ -32368,11 +32377,10 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -32368,11 +32377,10 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-form-item__error { .el-form-item__error {
color: #FF3D33; color: #FF3D33;
font-size: 12px; font-size: 12px;
line-height: 1; line-height: 32px;
padding-top: 4px; height: 32px;
position: absolute; white-space: nowrap;
top: 100%; margin-left: 28px; }
left: 0; }
.el-form-item__error--inline { .el-form-item__error--inline {
position: relative; position: relative;
top: auto; top: auto;
...@@ -32392,9 +32400,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -32392,9 +32400,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-form-item.is-error .el-input-group__prepend .el-input__inner { .el-form-item.is-error .el-input-group__prepend .el-input__inner {
border-color: transparent; } border-color: transparent; }
.el-form-item.is-error .el-input__validateIcon { .el-form-item.is-error .el-input__validateIcon {
color: #FF3D33; } color: #FF3D33;
position: relative;
right: -28px; }
.el-form-item--feedback .el-input__validateIcon { .el-form-item--feedback .el-input__validateIcon {
display: inline-block; } display: inline-block; }
.el-form-item .el-form-item__content .el-button {
margin-top: 40px;
margin-left: 16px; }
/* BEM support Func /* BEM support Func
-------------------------- */ -------------------------- */
theme/message-box.css
View file @ c0ce7ab3
...@@ -1985,7 +1985,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -1985,7 +1985,8 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
.el-message-box__content { .el-message-box__content {
padding: 10px 24px; padding: 10px 24px;
color: #333333; color: #333333;
font-size: 14px; } font-size: 14px;
position: relative; }
.el-message-box__container { .el-message-box__container {
position: relative; } position: relative; }
.el-message-box__input { .el-message-box__input {
......
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