Merge branch 'master' into icon_paths

Conflicts: dist/css/bootstrap.css.map docs/dist/css/bootstrap.css.map
2026-06-05 16:42:29 +03:00 · 2014-05-22 23:01:42 -07:00
parent 91d51d3fba 10e9fef85c
commit d66b65ddde
39 changed files with 113 additions and 54 deletions
@@ -2629,11 +2629,14 @@ select[multiple].input-lg {
  .form-inline .radio,
  .form-inline .checkbox {
    display: inline-block;
-    padding-left: 0;
    margin-top: 0;
    margin-bottom: 0;
    vertical-align: middle;
  }
+  .form-inline .radio label,
+  .form-inline .checkbox label {
+    padding-left: 0;
+  }
  .form-inline .radio input[type="radio"],
  .form-inline .checkbox input[type="checkbox"] {
    float: none;
@@ -3971,11 +3974,14 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
  .navbar-form .radio,
  .navbar-form .checkbox {
    display: inline-block;
-    padding-left: 0;
    margin-top: 0;
    margin-bottom: 0;
    vertical-align: middle;
  }
+  .navbar-form .radio label,
+  .navbar-form .checkbox label {
+    padding-left: 0;
+  }
  .navbar-form .radio input[type="radio"],
  .navbar-form .checkbox input[type="checkbox"] {
    float: none;