Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
02097700
Commit
02097700
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Fixes
#6035
: use font-size vars in button groups
parent
dc10e6bb
3 merge requests
!6060
Waits to tigger the hidden event
,
!6055
Typeahead complex source
,
!6061
Sorry, close this. I pulled to the wrong branch!
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/css/bootstrap.css
+3
-3
docs/assets/css/bootstrap.css
less/button-groups.less
+3
-3
less/button-groups.less
with
6 additions
and
6 deletions
+6
-6
docs/assets/css/bootstrap.css
+
3
-
3
View file @
02097700
...
...
@@ -3596,15 +3596,15 @@ input[type="submit"].btn.btn-mini {
}
.btn-group
>
.btn-mini
{
font-size
:
1
1
px
;
font-size
:
1
0.5
px
;
}
.btn-group
>
.btn-small
{
font-size
:
1
2
px
;
font-size
:
1
1.9
px
;
}
.btn-group
>
.btn-large
{
font-size
:
1
6
px
;
font-size
:
1
7.5
px
;
}
.btn-group
>
.btn
:first-child
{
...
...
This diff is collapsed.
Click to expand it.
less/button-groups.less
+
3
-
3
View file @
02097700
...
...
@@ -46,13 +46,13 @@
// Reset fonts for other sizes
.btn-group > .btn-mini {
font-size:
11px
;
font-size:
@fontSizeMini
;
}
.btn-group > .btn-small {
font-size:
12px
;
font-size:
@fontSizeSmall
;
}
.btn-group > .btn-large {
font-size:
16px
;
font-size:
@fontSizeLarge
;
}
// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
...
...
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
Menu
Explore
Projects
Groups
Snippets