merge in and resolve conflicts
This commit is contained in:
parent
77c1a528ab
commit
b4958aba69
|
@ -2530,7 +2530,7 @@ select[multiple].input-lg {
|
||||||
}
|
}
|
||||||
.form-control-feedback {
|
.form-control-feedback {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 25px;
|
top: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -2554,7 +2554,11 @@ select[multiple].input-lg {
|
||||||
.has-success .radio,
|
.has-success .radio,
|
||||||
.has-success .checkbox,
|
.has-success .checkbox,
|
||||||
.has-success .radio-inline,
|
.has-success .radio-inline,
|
||||||
.has-success .checkbox-inline {
|
.has-success .checkbox-inline,
|
||||||
|
.has-success.radio label,
|
||||||
|
.has-success.checkbox label,
|
||||||
|
.has-success.radio-inline label,
|
||||||
|
.has-success.checkbox-inline label {
|
||||||
color: #3c763d;
|
color: #3c763d;
|
||||||
}
|
}
|
||||||
.has-success .form-control {
|
.has-success .form-control {
|
||||||
|
@ -2580,7 +2584,11 @@ select[multiple].input-lg {
|
||||||
.has-warning .radio,
|
.has-warning .radio,
|
||||||
.has-warning .checkbox,
|
.has-warning .checkbox,
|
||||||
.has-warning .radio-inline,
|
.has-warning .radio-inline,
|
||||||
.has-warning .checkbox-inline {
|
.has-warning .checkbox-inline,
|
||||||
|
.has-warning.radio label,
|
||||||
|
.has-warning.checkbox label,
|
||||||
|
.has-warning.radio-inline label,
|
||||||
|
.has-warning.checkbox-inline label {
|
||||||
color: #8a6d3b;
|
color: #8a6d3b;
|
||||||
}
|
}
|
||||||
.has-warning .form-control {
|
.has-warning .form-control {
|
||||||
|
@ -2606,7 +2614,11 @@ select[multiple].input-lg {
|
||||||
.has-error .radio,
|
.has-error .radio,
|
||||||
.has-error .checkbox,
|
.has-error .checkbox,
|
||||||
.has-error .radio-inline,
|
.has-error .radio-inline,
|
||||||
.has-error .checkbox-inline {
|
.has-error .checkbox-inline,
|
||||||
|
.has-error.radio label,
|
||||||
|
.has-error.checkbox label,
|
||||||
|
.has-error.radio-inline label,
|
||||||
|
.has-error.checkbox-inline label {
|
||||||
color: #a94442;
|
color: #a94442;
|
||||||
}
|
}
|
||||||
.has-error .form-control {
|
.has-error .form-control {
|
||||||
|
@ -2627,6 +2639,9 @@ select[multiple].input-lg {
|
||||||
.has-error .form-control-feedback {
|
.has-error .form-control-feedback {
|
||||||
color: #a94442;
|
color: #a94442;
|
||||||
}
|
}
|
||||||
|
.has-feedback label ~ .form-control-feedback {
|
||||||
|
top: 25px;
|
||||||
|
}
|
||||||
.has-feedback label.sr-only ~ .form-control-feedback {
|
.has-feedback label.sr-only ~ .form-control-feedback {
|
||||||
top: 0;
|
top: 0;
|
||||||
}
|
}
|
||||||
|
@ -2707,7 +2722,6 @@ select[multiple].input-lg {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.form-horizontal .has-feedback .form-control-feedback {
|
.form-horizontal .has-feedback .form-control-feedback {
|
||||||
top: 0;
|
|
||||||
right: 15px;
|
right: 15px;
|
||||||
}
|
}
|
||||||
@media (min-width: 768px) {
|
@media (min-width: 768px) {
|
||||||
|
|
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
File diff suppressed because one or more lines are too long
|
@ -362,9 +362,9 @@ input[type="checkbox"] {
|
||||||
.form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg);
|
.form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Reposition feedback icon if input has visible label above
|
// Reposition feedback icon if input has visible label above
|
||||||
.has-feedback label {
|
.has-feedback label {
|
||||||
|
|
||||||
& ~ .form-control-feedback {
|
& ~ .form-control-feedback {
|
||||||
top: (@line-height-computed + 5); // Height of the `label` and its margin
|
top: (@line-height-computed + 5); // Height of the `label` and its margin
|
||||||
}
|
}
|
||||||
|
@ -387,7 +387,6 @@ input[type="checkbox"] {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Inline forms
|
// Inline forms
|
||||||
//
|
//
|
||||||
// Make forms appear inline(-block) by adding the `.form-inline` class. Inline
|
// Make forms appear inline(-block) by adding the `.form-inline` class. Inline
|
||||||
|
@ -458,10 +457,7 @@ input[type="checkbox"] {
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validation states
|
// Re-override the feedback icon.
|
||||||
//
|
|
||||||
// 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 {
|
.has-feedback .form-control-feedback {
|
||||||
top: 0;
|
top: 0;
|
||||||
}
|
}
|
||||||
|
@ -514,7 +510,6 @@ input[type="checkbox"] {
|
||||||
// Reposition the icon because it's now within a grid column and columns have
|
// 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.
|
// `position: relative;` on them. Also accounts for the grid gutter padding.
|
||||||
.has-feedback .form-control-feedback {
|
.has-feedback .form-control-feedback {
|
||||||
top: 0;
|
|
||||||
right: (@grid-gutter-width / 2);
|
right: (@grid-gutter-width / 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,11 @@
|
||||||
.radio,
|
.radio,
|
||||||
.checkbox,
|
.checkbox,
|
||||||
.radio-inline,
|
.radio-inline,
|
||||||
.checkbox-inline {
|
.checkbox-inline,
|
||||||
|
&.radio label,
|
||||||
|
&.checkbox label,
|
||||||
|
&.radio-inline label,
|
||||||
|
&.checkbox-inline label {
|
||||||
color: @text-color;
|
color: @text-color;
|
||||||
}
|
}
|
||||||
// Set the border and box shadow on specific inputs to match
|
// Set the border and box shadow on specific inputs to match
|
||||||
|
|
Loading…
Reference in New Issue