summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap/less/forms.less
diff options
context:
space:
mode:
authorThomas Park <thomas@thomaspark.co>2015-06-16 21:40:15 -0400
committerThomas Park <thomas@thomaspark.co>2015-06-16 21:40:15 -0400
commitea56c37ca9674f0155448699918650bbfcfbb888 (patch)
tree12b2d28dc05b533adb55e0ff344c41df36d51301 /bower_components/bootstrap/less/forms.less
parent06885df3cfbb7d498f59dc5ac61a4cc1cc4f6dc2 (diff)
update bootstrap to 3.3.5
Diffstat (limited to 'bower_components/bootstrap/less/forms.less')
-rw-r--r--bower_components/bootstrap/less/forms.less55
1 files changed, 44 insertions, 11 deletions
diff --git a/bower_components/bootstrap/less/forms.less b/bower_components/bootstrap/less/forms.less
index e4b50629..b064ede4 100644
--- a/bower_components/bootstrap/less/forms.less
+++ b/bower_components/bootstrap/less/forms.less
@@ -56,7 +56,6 @@ input[type="checkbox"] {
line-height: normal;
}
-// Set the height of file controls to match text inputs
input[type="file"] {
display: block;
}
@@ -175,13 +174,17 @@ input[type="search"] {
// text within the input to become vertically misaligned. As a workaround, we
// set a pixel line-height that matches the given height of the input, but only
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
+//
+// Note that as of 8.3, iOS doesn't support `datetime` or `week`.
@media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="date"],
input[type="time"],
input[type="datetime-local"],
input[type="month"] {
- line-height: @input-height-base;
+ &.form-control {
+ line-height: @input-height-base;
+ }
&.input-sm,
.input-group-sm & {
@@ -322,14 +325,26 @@ input[type="checkbox"] {
}
.form-group-sm {
.form-control {
- .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small);
- }
- .form-control-static {
height: @input-height-small;
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
line-height: @line-height-small;
+ border-radius: @input-border-radius-small;
+ }
+ select.form-control {
+ height: @input-height-small;
+ line-height: @input-height-small;
+ }
+ textarea.form-control,
+ select[multiple].form-control {
+ height: auto;
+ }
+ .form-control-static {
+ height: @input-height-small;
min-height: (@line-height-computed + @font-size-small);
+ padding: (@padding-small-vertical + 1) @padding-small-horizontal;
+ font-size: @font-size-small;
+ line-height: @line-height-small;
}
}
@@ -338,14 +353,26 @@ input[type="checkbox"] {
}
.form-group-lg {
.form-control {
- .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);
- }
- .form-control-static {
height: @input-height-large;
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
line-height: @line-height-large;
+ border-radius: @input-border-radius-large;
+ }
+ select.form-control {
+ height: @input-height-large;
+ line-height: @input-height-large;
+ }
+ textarea.form-control,
+ select[multiple].form-control {
+ height: auto;
+ }
+ .form-control-static {
+ height: @input-height-large;
min-height: (@line-height-computed + @font-size-large);
+ padding: (@padding-large-vertical + 1) @padding-large-horizontal;
+ font-size: @font-size-large;
+ line-height: @line-height-large;
}
}
@@ -376,12 +403,16 @@ input[type="checkbox"] {
text-align: center;
pointer-events: none;
}
-.input-lg + .form-control-feedback {
+.input-lg + .form-control-feedback,
+.input-group-lg + .form-control-feedback,
+.form-group-lg .form-control + .form-control-feedback {
width: @input-height-large;
height: @input-height-large;
line-height: @input-height-large;
}
-.input-sm + .form-control-feedback {
+.input-sm + .form-control-feedback,
+.input-group-sm + .form-control-feedback,
+.form-group-sm .form-control + .form-control-feedback {
width: @input-height-small;
height: @input-height-small;
line-height: @input-height-small;
@@ -550,7 +581,7 @@ input[type="checkbox"] {
// Reposition the icon because it's now within a grid column and columns have
// `position: relative;` on them. Also accounts for the grid gutter padding.
.has-feedback .form-control-feedback {
- right: (@grid-gutter-width / 2);
+ right: floor((@grid-gutter-width / 2));
}
// Form group sizes
@@ -561,6 +592,7 @@ input[type="checkbox"] {
@media (min-width: @screen-sm-min) {
.control-label {
padding-top: ((@padding-large-vertical * @line-height-large) + 1);
+ font-size: @font-size-large;
}
}
}
@@ -568,6 +600,7 @@ input[type="checkbox"] {
@media (min-width: @screen-sm-min) {
.control-label {
padding-top: (@padding-small-vertical + 1);
+ font-size: @font-size-small;
}
}
}