aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-18 15:28:38 -0700
committerMark Otto <[email protected]>2013-07-18 15:28:38 -0700
commit7d9fb1dda7a3009e986364b714313037bfb67d0c (patch)
tree2e08ac3fd71841a99ccff527f5d83819d447a851
parent1f48e837000c8c2ec701c1442fa003ab836f818f (diff)
downloadbootstrap-7d9fb1dda7a3009e986364b714313037bfb67d0c.tar.xz
bootstrap-7d9fb1dda7a3009e986364b714313037bfb67d0c.zip
Jankily fix input group wrapping with button groups in Firefox (fixes #8321, #8429, and #8067)
-rw-r--r--docs/assets/css/bootstrap.css3
-rw-r--r--less/forms.less4
2 files changed, 3 insertions, 4 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index ebfc45fdd..257cbacb1 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1792,11 +1792,10 @@ input[type="color"].input-small {
.input-group-btn > .btn {
position: relative;
- float: left;
}
.input-group-btn > .btn + .btn {
- margin-left: -1px;
+ margin-left: -4px;
}
.input-group-btn > .btn:hover,
diff --git a/less/forms.less b/less/forms.less
index add42ee9f..eaa7c11d2 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -392,9 +392,9 @@ input[type="color"] {
}
.input-group-btn > .btn {
position: relative;
- float: left; // Collapse white-space
+ // Jankily prevent input button groups from wrapping
+ .btn {
- margin-left: -1px;
+ margin-left: -4px;
}
// Bring the "active" button to the front
&:hover,