mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-05-18 12:39:41 +03:00
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.
This commit is contained in:
Vendored
+833
-821
File diff suppressed because it is too large
Load Diff
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+629
-619
File diff suppressed because it is too large
Load Diff
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+2
-2
@@ -2,9 +2,10 @@
|
|||||||
@import "variables.less";
|
@import "variables.less";
|
||||||
@import "mixins.less";
|
@import "mixins.less";
|
||||||
|
|
||||||
// Reset
|
// Reset and dependencies
|
||||||
@import "normalize.less";
|
@import "normalize.less";
|
||||||
@import "print.less";
|
@import "print.less";
|
||||||
|
@import "glyphicons.less";
|
||||||
|
|
||||||
// Core CSS
|
// Core CSS
|
||||||
@import "scaffolding.less";
|
@import "scaffolding.less";
|
||||||
@@ -17,7 +18,6 @@
|
|||||||
|
|
||||||
// Components
|
// Components
|
||||||
@import "component-animations.less";
|
@import "component-animations.less";
|
||||||
@import "glyphicons.less";
|
|
||||||
@import "dropdowns.less";
|
@import "dropdowns.less";
|
||||||
@import "button-groups.less";
|
@import "button-groups.less";
|
||||||
@import "input-groups.less";
|
@import "input-groups.less";
|
||||||
|
|||||||
+21
-12
@@ -271,18 +271,27 @@ input[type="checkbox"],
|
|||||||
.form-control {
|
.form-control {
|
||||||
padding-right: (@input-height-base * 1.25);
|
padding-right: (@input-height-base * 1.25);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// Feedback icon (requires .glyphicon classes)
|
// Feedback icon (requires .glyphicon classes)
|
||||||
.form-control-feedback {
|
.form-control-feedback {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: (@line-height-computed + 5); // Height of the `label` and its margin
|
top: (@line-height-computed + 5); // Height of the `label` and its margin
|
||||||
right: 0;
|
right: 0;
|
||||||
display: block;
|
display: block;
|
||||||
width: @input-height-base;
|
width: @input-height-base;
|
||||||
height: @input-height-base;
|
height: @input-height-base;
|
||||||
line-height: @input-height-base;
|
line-height: @input-height-base;
|
||||||
text-align: center;
|
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
|
// Feedback states
|
||||||
|
|||||||
Reference in New Issue
Block a user