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
8358471a
Commit
8358471a
authored
9 years ago
by
Chris Rebert
Browse files
Options
Download
Plain Diff
Merge pull request #19212 from twbs/label-padding-x-y
Extract $label-padding-{x,y} variables
parents
2a2462d2
1d634a07
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/_labels.scss
+1
-1
scss/_labels.scss
scss/_variables.scss
+2
-0
scss/_variables.scss
with
3 additions
and
1 deletion
+3
-1
scss/_labels.scss
+
1
-
1
View file @
8358471a
...
...
@@ -5,7 +5,7 @@
.label
{
display
:
inline-block
;
padding
:
.25em
.4em
;
padding
:
$label-padding-y
$label-padding-x
;
font-size
:
75%
;
font-weight
:
$label-font-weight
;
line-height
:
1
;
...
...
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
2
-
0
View file @
8358471a
...
...
@@ -619,6 +619,8 @@ $label-danger-bg: $brand-danger !default;
$label-color
:
#fff
!
default
;
$label-link-hover-color
:
#fff
!
default
;
$label-font-weight
:
bold
!
default
;
$label-padding-x
:
.4em
!
default
;
$label-padding-y
:
.25em
!
default
;
// Modals
...
...
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