Skip to content

S
style_tool
Commit ba18d88d authored by cyh's avatar cyh
Browse files
Options

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

parents 94a77da6 8702ac79
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 46 deletions
node_module/element-theme-chalk/src/input-number.scss
View file @ ba18d88d
...@@ -23,13 +23,14 @@ ...@@ -23,13 +23,14 @@
position: absolute; position: absolute;
z-index: 1; z-index: 1;
top: 1px; top: 1px;
width: $--input-height; width: 14px;
height: auto; height: auto;
text-align: center; text-align: center;
background: $--background-color-base; background: $--background-color-base;
color: $--color-text-regular; color: $--color-text-regular;
cursor: pointer; cursor: pointer;
font-size: 13px; font-size: 14px;
padding: 0 16px;
&:hover { &:hover {
color: $--color-primary; color: $--color-primary;
...@@ -70,11 +71,11 @@ ...@@ -70,11 +71,11 @@
} }
@include m(medium) { @include m(medium) {
width: 200px; width: 180px;
line-height: #{$--input-medium-height - 2}; line-height: #{$--input-medium-height - 2};
@include e((increase, decrease)) { @include e((increase, decrease)) {
width: $--input-medium-height; width: 14px;
font-size: $--input-medium-font-size; font-size: $--input-medium-font-size;
} }
...@@ -85,16 +86,12 @@ ...@@ -85,16 +86,12 @@
} }
@include m(small) { @include m(small) {
width: 130px; width: 180px;
line-height: #{$--input-small-height - 2}; line-height: #{$--input-small-height - 2};
@include e((increase, decrease)) { @include e((increase, decrease)) {
width: $--input-small-height; width: 14px;
font-size: $--input-small-font-size; font-size: $--input-small-font-size;
[class*=el-icon] {
transform: scale(.9);
}
} }
.el-input__inner { .el-input__inner {
......
theme/index.css
View file @ ba18d88d
...@@ -10502,13 +10502,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -10502,13 +10502,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
position: absolute; position: absolute;
z-index: 1; z-index: 1;
top: 1px; top: 1px;
width: 36px; width: 14px;
height: auto; height: auto;
text-align: center; text-align: center;
background: #F6F6F6; background: #F6F6F6;
color: #666666; color: #666666;
cursor: pointer; cursor: pointer;
font-size: 13px; } font-size: 14px;
padding: 0 16px; }
.el-input-number__increase:hover, .el-input-number__decrease:hover { .el-input-number__increase:hover, .el-input-number__decrease:hover {
color: #0994DC; } color: #0994DC; }
.el-input-number__increase:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled), .el-input-number__decrease:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled) { .el-input-number__increase:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled), .el-input-number__decrease:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled) {
...@@ -10531,23 +10532,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -10531,23 +10532,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
color: #EBEBEB; color: #EBEBEB;
cursor: not-allowed; } cursor: not-allowed; }
.el-input-number--medium { .el-input-number--medium {
width: 200px; width: 180px;
line-height: 30px; } line-height: 30px; }
.el-input-number--medium .el-input-number__increase, .el-input-number--medium .el-input-number__decrease { .el-input-number--medium .el-input-number__increase, .el-input-number--medium .el-input-number__decrease {
width: 32px; width: 14px;
font-size: 14px; } font-size: 14px; }
.el-input-number--medium .el-input__inner { .el-input-number--medium .el-input__inner {
padding-left: 39px; padding-left: 39px;
padding-right: 39px; } padding-right: 39px; }
.el-input-number--small { .el-input-number--small {
width: 130px; width: 180px;
line-height: 26px; } line-height: 26px; }
.el-input-number--small .el-input-number__increase, .el-input-number--small .el-input-number__decrease { .el-input-number--small .el-input-number__increase, .el-input-number--small .el-input-number__decrease {
width: 28px; width: 14px;
font-size: 14px; } font-size: 14px; }
.el-input-number--small .el-input-number__increase [class*=el-icon], .el-input-number--small .el-input-number__decrease [class*=el-icon] {
-webkit-transform: scale(0.9);
transform: scale(0.9); }
.el-input-number--small .el-input__inner { .el-input-number--small .el-input__inner {
padding-left: 35px; padding-left: 35px;
padding-right: 35px; } padding-right: 35px; }
...@@ -36640,13 +36638,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -36640,13 +36638,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
position: absolute; position: absolute;
z-index: 1; z-index: 1;
top: 1px; top: 1px;
width: 36px; width: 14px;
height: auto; height: auto;
text-align: center; text-align: center;
background: #F6F6F6; background: #F6F6F6;
color: #666666; color: #666666;
cursor: pointer; cursor: pointer;
font-size: 13px; } font-size: 14px;
padding: 0 16px; }
.el-input-number__increase:hover, .el-input-number__decrease:hover { .el-input-number__increase:hover, .el-input-number__decrease:hover {
color: #0994DC; } color: #0994DC; }
.el-input-number__increase:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled), .el-input-number__decrease:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled) { .el-input-number__increase:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled), .el-input-number__decrease:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled) {
...@@ -36669,23 +36668,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -36669,23 +36668,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
color: #EBEBEB; color: #EBEBEB;
cursor: not-allowed; } cursor: not-allowed; }
.el-input-number--medium { .el-input-number--medium {
width: 200px; width: 180px;
line-height: 30px; } line-height: 30px; }
.el-input-number--medium .el-input-number__increase, .el-input-number--medium .el-input-number__decrease { .el-input-number--medium .el-input-number__increase, .el-input-number--medium .el-input-number__decrease {
width: 32px; width: 14px;
font-size: 14px; } font-size: 14px; }
.el-input-number--medium .el-input__inner { .el-input-number--medium .el-input__inner {
padding-left: 39px; padding-left: 39px;
padding-right: 39px; } padding-right: 39px; }
.el-input-number--small { .el-input-number--small {
width: 130px; width: 180px;
line-height: 26px; } line-height: 26px; }
.el-input-number--small .el-input-number__increase, .el-input-number--small .el-input-number__decrease { .el-input-number--small .el-input-number__increase, .el-input-number--small .el-input-number__decrease {
width: 28px; width: 14px;
font-size: 14px; } font-size: 14px; }
.el-input-number--small .el-input-number__increase [class*=el-icon], .el-input-number--small .el-input-number__decrease [class*=el-icon] {
-webkit-transform: scale(0.9);
transform: scale(0.9); }
.el-input-number--small .el-input__inner { .el-input-number--small .el-input__inner {
padding-left: 35px; padding-left: 35px;
padding-right: 35px; } padding-right: 35px; }
theme/input-number.css
View file @ ba18d88d
...@@ -833,13 +833,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -833,13 +833,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
position: absolute; position: absolute;
z-index: 1; z-index: 1;
top: 1px; top: 1px;
width: 36px; width: 14px;
height: auto; height: auto;
text-align: center; text-align: center;
background: #F6F6F6; background: #F6F6F6;
color: #666666; color: #666666;
cursor: pointer; cursor: pointer;
font-size: 13px; } font-size: 14px;
padding: 0 16px; }
.el-input-number__increase:hover, .el-input-number__decrease:hover { .el-input-number__increase:hover, .el-input-number__decrease:hover {
color: #0994DC; } color: #0994DC; }
.el-input-number__increase:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled), .el-input-number__decrease:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled) { .el-input-number__increase:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled), .el-input-number__decrease:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled) {
...@@ -862,23 +863,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -862,23 +863,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
color: #EBEBEB; color: #EBEBEB;
cursor: not-allowed; } cursor: not-allowed; }
.el-input-number--medium { .el-input-number--medium {
width: 200px; width: 180px;
line-height: 30px; } line-height: 30px; }
.el-input-number--medium .el-input-number__increase, .el-input-number--medium .el-input-number__decrease { .el-input-number--medium .el-input-number__increase, .el-input-number--medium .el-input-number__decrease {
width: 32px; width: 14px;
font-size: 14px; } font-size: 14px; }
.el-input-number--medium .el-input__inner { .el-input-number--medium .el-input__inner {
padding-left: 39px; padding-left: 39px;
padding-right: 39px; } padding-right: 39px; }
.el-input-number--small { .el-input-number--small {
width: 130px; width: 180px;
line-height: 26px; } line-height: 26px; }
.el-input-number--small .el-input-number__increase, .el-input-number--small .el-input-number__decrease { .el-input-number--small .el-input-number__increase, .el-input-number--small .el-input-number__decrease {
width: 28px; width: 14px;
font-size: 14px; } font-size: 14px; }
.el-input-number--small .el-input-number__increase [class*=el-icon], .el-input-number--small .el-input-number__decrease [class*=el-icon] {
-webkit-transform: scale(0.9);
transform: scale(0.9); }
.el-input-number--small .el-input__inner { .el-input-number--small .el-input__inner {
padding-left: 35px; padding-left: 35px;
padding-right: 35px; } padding-right: 35px; }
......
theme/slider.css
View file @ ba18d88d
...@@ -970,13 +970,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -970,13 +970,14 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
position: absolute; position: absolute;
z-index: 1; z-index: 1;
top: 1px; top: 1px;
width: 36px; width: 14px;
height: auto; height: auto;
text-align: center; text-align: center;
background: #F6F6F6; background: #F6F6F6;
color: #666666; color: #666666;
cursor: pointer; cursor: pointer;
font-size: 13px; } font-size: 14px;
padding: 0 16px; }
.el-input-number__increase:hover, .el-input-number__decrease:hover { .el-input-number__increase:hover, .el-input-number__decrease:hover {
color: #0994DC; } color: #0994DC; }
.el-input-number__increase:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled), .el-input-number__decrease:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled) { .el-input-number__increase:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled), .el-input-number__decrease:hover:not(.is-disabled) ~ .el-input .el-input__inner:not(.is-disabled) {
...@@ -999,23 +1000,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/ ...@@ -999,23 +1000,20 @@ $--checkbox-disabled-checked-icon-color: $--disabled-fill-base !default;*/
color: #EBEBEB; color: #EBEBEB;
cursor: not-allowed; } cursor: not-allowed; }
.el-input-number--medium { .el-input-number--medium {
width: 200px; width: 180px;
line-height: 30px; } line-height: 30px; }
.el-input-number--medium .el-input-number__increase, .el-input-number--medium .el-input-number__decrease { .el-input-number--medium .el-input-number__increase, .el-input-number--medium .el-input-number__decrease {
width: 32px; width: 14px;
font-size: 14px; } font-size: 14px; }
.el-input-number--medium .el-input__inner { .el-input-number--medium .el-input__inner {
padding-left: 39px; padding-left: 39px;
padding-right: 39px; } padding-right: 39px; }
.el-input-number--small { .el-input-number--small {
width: 130px; width: 180px;
line-height: 26px; } line-height: 26px; }
.el-input-number--small .el-input-number__increase, .el-input-number--small .el-input-number__decrease { .el-input-number--small .el-input-number__increase, .el-input-number--small .el-input-number__decrease {
width: 28px; width: 14px;
font-size: 14px; } font-size: 14px; }
.el-input-number--small .el-input-number__increase [class*=el-icon], .el-input-number--small .el-input-number__decrease [class*=el-icon] {
-webkit-transform: scale(0.9);
transform: scale(0.9); }
.el-input-number--small .el-input__inner { .el-input-number--small .el-input__inner {
padding-left: 35px; padding-left: 35px;
padding-right: 35px; } padding-right: 35px; }
......
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