Merge pull request #475 from MatrixZ/selectbox-height

fixes #468
This commit is contained in:
Fez Vrasta 2015-03-07 10:23:27 +01:00
commit ba6b7304b5
10 changed files with 28 additions and 38 deletions

View File

@ -14259,15 +14259,15 @@ fieldset[disabled] .form-control.focus,
box-shadow: none;
border-radius: 0;
}
fieldset[disabled] .form-control:not(textarea):not(select),
.form-control-wrapper .form-control:not(textarea):not(select),
.form-control:not(textarea):not(select),
fieldset[disabled] .form-control:focus:not(textarea):not(select),
.form-control-wrapper .form-control:focus:not(textarea):not(select),
.form-control:focus:not(textarea):not(select),
fieldset[disabled] .form-control.focus:not(textarea):not(select),
.form-control-wrapper .form-control.focus:not(textarea):not(select),
.form-control.focus:not(textarea):not(select) {
fieldset[disabled] .form-control:not(textarea),
.form-control-wrapper .form-control:not(textarea),
.form-control:not(textarea),
fieldset[disabled] .form-control:focus:not(textarea),
.form-control-wrapper .form-control:focus:not(textarea),
.form-control:focus:not(textarea),
fieldset[disabled] .form-control.focus:not(textarea),
.form-control-wrapper .form-control.focus:not(textarea),
.form-control.focus:not(textarea) {
height: 28px;
}
fieldset[disabled] .form-control:disabled,
@ -14282,9 +14282,6 @@ fieldset[disabled] .form-control.focus:disabled,
border-style: dashed;
border-bottom: 1px solid #757575;
}
select.form-control {
height: 23px;
}
select[multiple].form-control,
select[multiple].form-control:focus,
select[multiple].form-control.focus {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

21
dist/css/material.css vendored
View File

@ -14235,15 +14235,15 @@ fieldset[disabled] .form-control.focus,
box-shadow: none;
border-radius: 0;
}
fieldset[disabled] .form-control:not(textarea):not(select),
.form-control-wrapper .form-control:not(textarea):not(select),
.form-control:not(textarea):not(select),
fieldset[disabled] .form-control:focus:not(textarea):not(select),
.form-control-wrapper .form-control:focus:not(textarea):not(select),
.form-control:focus:not(textarea):not(select),
fieldset[disabled] .form-control.focus:not(textarea):not(select),
.form-control-wrapper .form-control.focus:not(textarea):not(select),
.form-control.focus:not(textarea):not(select) {
fieldset[disabled] .form-control:not(textarea),
.form-control-wrapper .form-control:not(textarea),
.form-control:not(textarea),
fieldset[disabled] .form-control:focus:not(textarea),
.form-control-wrapper .form-control:focus:not(textarea),
.form-control:focus:not(textarea),
fieldset[disabled] .form-control.focus:not(textarea),
.form-control-wrapper .form-control.focus:not(textarea),
.form-control.focus:not(textarea) {
height: 28px;
}
fieldset[disabled] .form-control:disabled,
@ -14258,9 +14258,6 @@ fieldset[disabled] .form-control.focus:disabled,
border-style: dashed;
border-bottom: 1px solid #757575;
}
select.form-control {
height: 23px;
}
select[multiple].form-control,
select[multiple].form-control:focus,
select[multiple].form-control.focus {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1,6 +1,6 @@
fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-control {
&, &:focus, &.focus {
&:not(textarea):not(select) {
&:not(textarea) {
height: 28px;
}
padding: 0;
@ -14,9 +14,7 @@ fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-con
}
}
}
select.form-control {
height: 23px;
}
select[multiple].form-control {
&, &:focus, &.focus {
height: 85px;

View File

@ -1,6 +1,6 @@
fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-control {
&, &:focus, &.focus {
&:not(textarea):not(select) {
&:not(textarea) {
height: 28px;
}
padding: 0;
@ -15,9 +15,7 @@ fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-con
}
}
}
select.form-control {
height: 23px;
}
select[multiple].form-control {
&, &:focus, &.focus {
height: 85px;