aboutsummaryrefslogtreecommitdiff
path: root/less/forms.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-03-04 14:12:57 -0800
committerMark Otto <[email protected]>2014-03-04 14:12:57 -0800
commit7733f2437316c2ae10e669a50771646ae8b8e927 (patch)
treeb7c991d96e458c9730b59a0e79aba1817f571008 /less/forms.less
parent1c66f30b6a67d43a7f4da0b3e4d58aa7094d25a7 (diff)
downloadbootstrap-7733f2437316c2ae10e669a50771646ae8b8e927.tar.xz
bootstrap-7733f2437316c2ae10e669a50771646ae8b8e927.zip
Fixes #12868: Enables icon feedback on validation states for large/small inputs.
Also reorders the CSS to place Glyhpicons as a dependency before other components for fewer overrides and less specific CSS.
Diffstat (limited to 'less/forms.less')
-rw-r--r--less/forms.less33
1 files changed, 21 insertions, 12 deletions
diff --git a/less/forms.less b/less/forms.less
index 8c90e4fdf..273e36608 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -271,18 +271,27 @@ input[type="checkbox"],
.form-control {
padding-right: (@input-height-base * 1.25);
}
-
- // Feedback icon (requires .glyphicon classes)
- .form-control-feedback {
- position: absolute;
- top: (@line-height-computed + 5); // Height of the `label` and its margin
- right: 0;
- display: block;
- width: @input-height-base;
- height: @input-height-base;
- line-height: @input-height-base;
- text-align: center;
- }
+}
+// Feedback icon (requires .glyphicon classes)
+.form-control-feedback {
+ position: absolute;
+ top: (@line-height-computed + 5); // Height of the `label` and its margin
+ right: 0;
+ display: block;
+ width: @input-height-base;
+ height: @input-height-base;
+ line-height: @input-height-base;
+ text-align: center;
+}
+.input-lg + .form-control-feedback {
+ width: @input-height-large;
+ height: @input-height-large;
+ line-height: @input-height-large;
+}
+.input-sm + .form-control-feedback {
+ width: @input-height-small;
+ height: @input-height-small;
+ line-height: @input-height-small;
}
// Feedback states