drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

optimize button like and input like font-size in normal and small size

Browse source 
optimize button like and input like font-size in normal and small size
This commit is contained in:
梁灏 2016-11-08 18:14:36 +08:00
parent 0f822c9b36
commit 86cf21fd13
4 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dist/styles/iview.all.css
View file

File diff suppressed because one or more lines are too long

2
dist/styles/iview.css
View file

File diff suppressed because one or more lines are too long

5
src/styles/components/select.less
View file

@ -91,6 +91,7 @@
display: block; display: block;
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
font-size: @font-size-small;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
@ -105,6 +106,7 @@
.@{select-prefix-cls}-placeholder, .@{select-prefix-cls}-selected-value{ .@{select-prefix-cls}-placeholder, .@{select-prefix-cls}-selected-value{
height: 34px; height: 34px;
line-height: 34px; line-height: 34px;
font-size: @font-size-base;
} }
} }
@ -141,7 +143,7 @@
height: @input-height-base; height: @input-height-base;
line-height: @input-height-base; line-height: @input-height-base;
padding: 0 24px 0 8px; padding: 0 24px 0 8px;
font-size: @font-size-base; font-size: @font-size-small;
outline: none; outline: none;
border: none; border: none;
box-sizing: border-box; box-sizing: border-box;
@ -157,6 +159,7 @@
} }
&-large &-input{ &-large &-input{
font-size: @font-size-base;
height: @input-height-large; height: @input-height-large;
} }

11
src/styles/mixins/input.less
View file

@ -19,6 +19,7 @@
} }
.input-large() { .input-large() {
font-size: @font-size-base;
padding: @input-padding-vertical-large @input-padding-horizontal; padding: @input-padding-vertical-large @input-padding-horizontal;
height: @input-height-large; height: @input-height-large;
} }
@ -35,7 +36,7 @@
height: @input-height-base; height: @input-height-base;
line-height: @line-height-base; line-height: @line-height-base;
padding: @input-padding-vertical-base @input-padding-horizontal; padding: @input-padding-vertical-base @input-padding-horizontal;
font-size: @font-size-base; font-size: @font-size-small;
border: 1px solid @input-border-color; border: 1px solid @input-border-color;
border-radius: @border-radius-base; border-radius: @border-radius-base;
color: @input-color; color: @input-color;
@ -64,6 +65,7 @@
max-width: 100%; max-width: 100%;
height: auto; height: auto;
vertical-align: bottom; vertical-align: bottom;
font-size: @font-size-base;
} }
// Size // Size
@ -81,6 +83,11 @@
width: 100%; width: 100%;
border-collapse: separate; border-collapse: separate;
position: relative; position: relative;
font-size: @font-size-small;
&-large{
font-size: @font-size-base;
}
// Undo padding and float of grid classes // Undo padding and float of grid classes
&[class*="col-"] { &[class*="col-"] {
@ -132,7 +139,7 @@
&-append &-append
{ {
padding: @input-padding-vertical-base @input-padding-horizontal; padding: @input-padding-vertical-base @input-padding-horizontal;
font-size: @font-size-base; font-size: inherit;
font-weight: normal; font-weight: normal;
line-height: 1; line-height: 1;
color: @input-color; color: @input-color;