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
4a456500
Commit
4a456500
authored
11 years ago
by
Chris Rebert
Browse files
Options
Download
Email Patches
Plain Diff
fix .btn-group-xs portion of
#10979
parent
bac15312
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dist/css/bootstrap.css
+4
-3
dist/css/bootstrap.css
dist/css/bootstrap.min.css
+1
-1
dist/css/bootstrap.min.css
less/buttons.less
+2
-3
less/buttons.less
less/variables.less
+3
-0
less/variables.less
with
10 additions
and
7 deletions
+10
-7
dist/css/bootstrap.css
+
4
-
3
View file @
4a456500
...
@@ -2622,8 +2622,7 @@ fieldset[disabled] .btn-link:focus {
...
@@ -2622,8 +2622,7 @@ fieldset[disabled] .btn-link:focus {
border-radius
:
6px
;
border-radius
:
6px
;
}
}
.btn-sm
,
.btn-sm
{
.btn-xs
{
padding
:
5px
10px
;
padding
:
5px
10px
;
font-size
:
12px
;
font-size
:
12px
;
line-height
:
1.5
;
line-height
:
1.5
;
...
@@ -2632,6 +2631,9 @@ fieldset[disabled] .btn-link:focus {
...
@@ -2632,6 +2631,9 @@ fieldset[disabled] .btn-link:focus {
.btn-xs
{
.btn-xs
{
padding
:
1px
5px
;
padding
:
1px
5px
;
font-size
:
12px
;
line-height
:
1.5
;
border-radius
:
3px
;
}
}
.btn-block
{
.btn-block
{
...
@@ -3754,7 +3756,6 @@ input[type="button"].btn-block {
...
@@ -3754,7 +3756,6 @@ input[type="button"].btn-block {
}
}
.btn-group-xs
>
.btn
{
.btn-group-xs
>
.btn
{
padding
:
5px
10px
;
padding
:
1px
5px
;
padding
:
1px
5px
;
font-size
:
12px
;
font-size
:
12px
;
line-height
:
1.5
;
line-height
:
1.5
;
...
...
This diff is collapsed.
Click to expand it.
dist/css/bootstrap.min.css
+
1
-
1
View file @
4a456500
This diff is collapsed.
Click to expand it.
less/buttons.less
+
2
-
3
View file @
4a456500
...
@@ -122,13 +122,12 @@
...
@@ -122,13 +122,12 @@
// line-height: ensure even-numbered height of button next to large input
// line-height: ensure even-numbered height of button next to large input
.button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
.button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
}
}
.btn-sm,
.btn-sm {
.btn-xs {
// line-height: ensure proper height of button next to small input
// line-height: ensure proper height of button next to small input
.button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
.button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
}
}
.btn-xs {
.btn-xs {
padding: 1px 5px
;
.button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small)
;
}
}
...
...
This diff is collapsed.
Click to expand it.
less/variables.less
+
3
-
0
View file @
4a456500
...
@@ -84,6 +84,9 @@
...
@@ -84,6 +84,9 @@
@padding-small-vertical: 5px;
@padding-small-vertical: 5px;
@padding-small-horizontal: 10px;
@padding-small-horizontal: 10px;
@padding-xs-vertical: 1px;
@padding-xs-horizontal: 5px;
@line-height-large: 1.33;
@line-height-large: 1.33;
@line-height-small: 1.5;
@line-height-small: 1.5;
...
...
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