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
1db8dc10
Commit
1db8dc10
authored
9 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Remove line-height from button mixin calls
parent
612d287a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scss/_buttons.scss
+3
-3
scss/_buttons.scss
with
3 additions
and
3 deletions
+3
-3
scss/_buttons.scss
+
3
-
3
View file @
1db8dc10
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
cursor
:
pointer
;
cursor
:
pointer
;
user-select
:
none
;
user-select
:
none
;
border
:
$input-btn-border-width
solid
transparent
;
border
:
$input-btn-border-width
solid
transparent
;
@include
button-size
(
$btn-padding-y
,
$btn-padding-x
,
$font-size-base
,
$line-height-base
,
$btn-border-radius
);
@include
button-size
(
$btn-padding-y
,
$btn-padding-x
,
$font-size-base
,
$btn-border-radius
);
@include
transition
(
all
.2s
ease-in-out
);
@include
transition
(
all
.2s
ease-in-out
);
&
,
&
,
...
@@ -143,11 +143,11 @@ fieldset[disabled] a.btn {
...
@@ -143,11 +143,11 @@ fieldset[disabled] a.btn {
.btn-lg
{
.btn-lg
{
// line-height: ensure even-numbered height of button next to large input
// line-height: ensure even-numbered height of button next to large input
@include
button-size
(
$btn-padding-y-lg
,
$btn-padding-x-lg
,
$font-size-lg
,
$line-height-lg
,
$btn-border-radius-lg
);
@include
button-size
(
$btn-padding-y-lg
,
$btn-padding-x-lg
,
$font-size-lg
,
$btn-border-radius-lg
);
}
}
.btn-sm
{
.btn-sm
{
// line-height: ensure proper height of button next to small input
// line-height: ensure proper height of button next to small input
@include
button-size
(
$btn-padding-y-sm
,
$btn-padding-x-sm
,
$font-size-sm
,
$line-height-sm
,
$btn-border-radius-sm
);
@include
button-size
(
$btn-padding-y-sm
,
$btn-padding-x-sm
,
$font-size-sm
,
$btn-border-radius-sm
);
}
}
...
...
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