mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-20 20:00:36 +03:00
Code Activity

Fixes #15422: Alternate fix for temporal input sizing in input groups

Browse Source
This commit is contained in:
Mark Otto
2014-12-22 19:28:29 -08:00
parent c4a23cc040
commit c41970c579
4 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+10 -2
View File
@@ -2590,13 +2590,21 @@ input[type="search"] {
input[type="date"].input-sm, input[type="date"].input-sm,
input[type="time"].input-sm, input[type="time"].input-sm,
input[type="datetime-local"].input-sm, input[type="datetime-local"].input-sm,
input[type="month"].input-sm { input[type="month"].input-sm,
.input-group-sm input[type="date"],
.input-group-sm input[type="time"],
.input-group-sm input[type="datetime-local"],
.input-group-sm input[type="month"] {
line-height: 30px; line-height: 30px;
} }
input[type="date"].input-lg, input[type="date"].input-lg,
input[type="time"].input-lg, input[type="time"].input-lg,
input[type="datetime-local"].input-lg, input[type="datetime-local"].input-lg,
input[type="month"].input-lg { input[type="month"].input-lg,
.input-group-lg input[type="date"],
.input-group-lg input[type="time"],
.input-group-lg input[type="datetime-local"],
.input-group-lg input[type="month"] {
line-height: 46px; line-height: 46px;
} }
} }
dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
less/forms.less
+10 -12
View File
@@ -178,18 +178,16 @@ input[type="search"] {
input[type="datetime-local"], input[type="datetime-local"],
input[type="month"] { input[type="month"] {
line-height: @input-height-base; line-height: @input-height-base;
}
input[type="date"].input-sm, &.input-sm,
input[type="time"].input-sm, .input-group-sm & {
input[type="datetime-local"].input-sm, line-height: @input-height-small;
input[type="month"].input-sm { }
line-height: @input-height-small;
} &.input-lg,
input[type="date"].input-lg, .input-group-lg & {
input[type="time"].input-lg, line-height: @input-height-large;
input[type="datetime-local"].input-lg, }
input[type="month"].input-lg {
line-height: @input-height-large;
} }
} }