Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
15bb78ce
Commit
15bb78ce
authored
Sep 12, 2012
by
Mark Otto
Browse files
Options
Browse Files
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
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
12 deletions
+5
-12
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+3
-8
less/button-groups.less
less/button-groups.less
+2
-4
No files found.
docs/assets/css/bootstrap.css
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
{
...
...
less/button-groups.less
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 {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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