mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-08 17:22:31 +03:00
Merge branch 'pr/13320'
Conflicts: dist/css/bootstrap-rtl.min.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/dist/css/bootstrap-rtl.min.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css
This commit is contained in:
Vendored
+4
@@ -3331,6 +3331,10 @@ select[multiple].input-lg {
|
||||
color: #a94442;
|
||||
}
|
||||
|
||||
.has-feedback label.sr-only ~ .form-control-feedback {
|
||||
top: 0;
|
||||
}
|
||||
|
||||
.form-control-static {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+3
@@ -2587,6 +2587,9 @@ select[multiple].input-lg {
|
||||
.has-error .form-control-feedback {
|
||||
color: #a94442;
|
||||
}
|
||||
.has-feedback label.sr-only ~ .form-control-feedback {
|
||||
top: 0;
|
||||
}
|
||||
.form-control-static {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
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
Reference in New Issue
Block a user