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
e6e0e2ac
Commit
e6e0e2ac
authored
Aug 18, 2012
by
Mark Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes #4442: allow for .btn within a .btn-toolbar without .btn-group
parent
4d2f584f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+6
-0
less/button-groups.less
less/button-groups.less
+5
-0
No files found.
docs/assets/css/bootstrap.css
View file @
e6e0e2ac
...
...
@@ -3328,6 +3328,7 @@ input[type="submit"].btn.btn-mini {
.btn-toolbar
{
margin-top
:
10px
;
margin-bottom
:
10px
;
font-size
:
0
;
}
.btn-toolbar
.btn-group
{
...
...
@@ -3338,6 +3339,11 @@ input[type="submit"].btn.btn-mini {
*
zoom
:
1
;
}
.btn-toolbar
.btn-group
+
.btn
,
.btn-toolbar
.btn
+
.btn-group
{
margin-left
:
5px
;
}
.btn-group
>
.btn
{
position
:
relative
;
margin-left
:
-1px
;
...
...
less/button-groups.less
View file @
e6e0e2ac
...
...
@@ -18,12 +18,17 @@
// Optional: Group multiple button groups together for a toolbar
.btn-toolbar {
font-size: 0; // Hack to remove whitespace that results from using inline-block
margin-top: @baseLineHeight / 2;
margin-bottom: @baseLineHeight / 2;
.btn-group {
display: inline-block;
.ie7-inline-block();
}
.btn-group + .btn,
.btn + .btn-group {
margin-left: 5px;
}
}
// Float them, remove border radius, then re-add to first and last elements
...
...
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