Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
b745b776
Commit
b745b776
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fixes
#4458
: improve support for .btn + .btn in .btn-groups and .btn-toolbars
parent
887f11d4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/css/bootstrap.css
+6
-2
docs/assets/css/bootstrap.css
less/button-groups.less
+5
-2
less/button-groups.less
with
11 additions
and
4 deletions
+11
-4
docs/assets/css/bootstrap.css
+
6
-
2
View file @
b745b776
...
...
@@ -3334,6 +3334,7 @@ input[type="submit"].btn.btn-mini {
*
zoom
:
1
;
}
.btn-toolbar
.btn
+
.btn
,
.btn-toolbar
.btn-group
+
.btn
,
.btn-toolbar
.btn
+
.btn-group
{
margin-left
:
5px
;
...
...
@@ -3341,12 +3342,15 @@ input[type="submit"].btn.btn-mini {
.btn-group
>
.btn
{
position
:
relative
;
margin-left
:
-1px
;
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;
}
.btn-group
>
.btn
+
.btn
{
margin-left
:
-1px
;
}
.btn-group
>
.btn
,
.btn-group
>
.dropdown-menu
{
font-size
:
14px
;
...
...
@@ -3516,7 +3520,6 @@ input[type="submit"].btn.btn-mini {
display
:
block
;
float
:
none
;
width
:
100%
;
margin-left
:
0
;
-webkit-border-radius
:
0
;
-moz-border-radius
:
0
;
border-radius
:
0
;
...
...
@@ -3524,6 +3527,7 @@ input[type="submit"].btn.btn-mini {
.btn-group-vertical
.btn
+
.btn
{
margin-top
:
-1px
;
margin-left
:
0
;
}
.btn-group-vertical
.btn
:first-child
{
...
...
This diff is collapsed.
Click to expand it.
less/button-groups.less
+
5
-
2
View file @
b745b776
...
...
@@ -25,6 +25,7 @@
display: inline-block;
.ie7-inline-block();
}
.btn + .btn,
.btn-group + .btn,
.btn + .btn-group {
margin-left: 5px;
...
...
@@ -34,9 +35,11 @@
// Float them, remove border radius, then re-add to first and last elements
.btn-group > .btn {
position: relative;
margin-left: -1px;
.border-radius(0);
}
.btn-group > .btn + .btn {
margin-left: -1px;
}
.btn-group > .btn,
.btn-group > .dropdown-menu {
font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
...
...
@@ -215,11 +218,11 @@
.btn-group-vertical .btn {
display: block;
float: none;
margin-left: 0;
width: 100%;
.border-radius(0);
}
.btn-group-vertical .btn + .btn {
margin-left: 0;
margin-top: -1px;
}
.btn-group-vertical .btn:first-child {
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment