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
15bb78ce
Commit
15bb78ce
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fixes
#5107
: make all .btn-group inline-block by default instead of just within a .btn-toolbar
parent
e1deba30
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/css/bootstrap.css
+3
-8
docs/assets/css/bootstrap.css
less/button-groups.less
+2
-4
less/button-groups.less
with
5 additions
and
12 deletions
+5
-12
docs/assets/css/bootstrap.css
+
3
-
8
View file @
15bb78ce
...
@@ -3445,10 +3445,13 @@ input[type="submit"].btn.btn-mini {
...
@@ -3445,10 +3445,13 @@ input[type="submit"].btn.btn-mini {
.btn-group
{
.btn-group
{
position
:
relative
;
position
:
relative
;
display
:
inline-block
;
*
display
:
inline
;
*
margin-left
:
.3em
;
*
margin-left
:
.3em
;
font-size
:
0
;
font-size
:
0
;
white-space
:
nowrap
;
white-space
:
nowrap
;
vertical-align
:
middle
;
vertical-align
:
middle
;
*
zoom
:
1
;
}
}
.btn-group
:first-child
{
.btn-group
:first-child
{
...
@@ -3465,14 +3468,6 @@ input[type="submit"].btn.btn-mini {
...
@@ -3465,14 +3468,6 @@ input[type="submit"].btn.btn-mini {
font-size
:
0
;
font-size
:
0
;
}
}
.btn-toolbar
.btn-group
{
display
:
inline-block
;
*
display
:
inline
;
/* IE7 inline-block hack */
*
zoom
:
1
;
}
.btn-toolbar
.btn
+
.btn
,
.btn-toolbar
.btn
+
.btn
,
.btn-toolbar
.btn-group
+
.btn
,
.btn-toolbar
.btn-group
+
.btn
,
.btn-toolbar
.btn
+
.btn-group
{
.btn-toolbar
.btn
+
.btn-group
{
...
...
This diff is collapsed.
Click to expand it.
less/button-groups.less
+
2
-
4
View file @
15bb78ce
...
@@ -6,6 +6,8 @@
...
@@ -6,6 +6,8 @@
// Make the div behave like a button
// Make the div behave like a button
.btn-group {
.btn-group {
position: relative;
position: relative;
display: inline-block;
.ie7-inline-block();
font-size: 0; // remove as part 1 of font-size inline-block hack
font-size: 0; // remove as part 1 of font-size inline-block hack
vertical-align: middle; // match .btn alignment given font-size hack above
vertical-align: middle; // match .btn alignment given font-size hack above
white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
...
@@ -22,10 +24,6 @@
...
@@ -22,10 +24,6 @@
font-size: 0; // Hack to remove whitespace that results from using inline-block
font-size: 0; // Hack to remove whitespace that results from using inline-block
margin-top: @baseLineHeight / 2;
margin-top: @baseLineHeight / 2;
margin-bottom: @baseLineHeight / 2;
margin-bottom: @baseLineHeight / 2;
.btn-group {
display: inline-block;
.ie7-inline-block();
}
.btn + .btn,
.btn + .btn,
.btn-group + .btn,
.btn-group + .btn,
.btn + .btn-group {
.btn + .btn-group {
...
...
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