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
d4e7090c
Commit
d4e7090c
authored
7 years ago
by
XhmikosR
Committed by
Mark Otto
7 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Reindent _variables.scss. (#24428)
parent
07034cb3
6 merge requests
!28721
Hot test
,
!27561
Adds font-weight-medium to font weight classes
,
!25494
web pack
,
!25326
Adjust examples
,
!23207
#22402 : modal: new autofocus & keyboardBtnNav options
,
!17021
v4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scss/_variables.scss
+20
-20
scss/_variables.scss
with
20 additions
and
20 deletions
+20
-20
scss/_variables.scss
+
20
-
20
View file @
d4e7090c
...
@@ -221,9 +221,9 @@ $font-family-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, "Libera
...
@@ -221,9 +221,9 @@ $font-family-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, "Libera
$font-family-base
:
$font-family-sans-serif
!
default
;
$font-family-base
:
$font-family-sans-serif
!
default
;
// stylelint-enable value-keyword-case
// stylelint-enable value-keyword-case
$font-size-base
:
1rem
!
default
;
// Assumes the browser default, typically `16px`
$font-size-base
:
1rem
!
default
;
// Assumes the browser default, typically `16px`
$font-size-lg
:
(
$font-size-base
*
1
.25
)
!
default
;
$font-size-lg
:
(
$font-size-base
*
1
.25
)
!
default
;
$font-size-sm
:
(
$font-size-base
*
.875
)
!
default
;
$font-size-sm
:
(
$font-size-base
*
.875
)
!
default
;
$font-weight-light
:
300
!
default
;
$font-weight-light
:
300
!
default
;
$font-weight-normal
:
400
!
default
;
$font-weight-normal
:
400
!
default
;
...
@@ -232,12 +232,12 @@ $font-weight-bold: 700 !default;
...
@@ -232,12 +232,12 @@ $font-weight-bold: 700 !default;
$font-weight-base
:
$font-weight-normal
!
default
;
$font-weight-base
:
$font-weight-normal
!
default
;
$line-height-base
:
1
.5
!
default
;
$line-height-base
:
1
.5
!
default
;
$h1-font-size
:
$font-size-base
*
2
.5
!
default
;
$h1-font-size
:
$font-size-base
*
2
.5
!
default
;
$h2-font-size
:
$font-size-base
*
2
!
default
;
$h2-font-size
:
$font-size-base
*
2
!
default
;
$h3-font-size
:
$font-size-base
*
1
.75
!
default
;
$h3-font-size
:
$font-size-base
*
1
.75
!
default
;
$h4-font-size
:
$font-size-base
*
1
.5
!
default
;
$h4-font-size
:
$font-size-base
*
1
.5
!
default
;
$h5-font-size
:
$font-size-base
*
1
.25
!
default
;
$h5-font-size
:
$font-size-base
*
1
.25
!
default
;
$h6-font-size
:
$font-size-base
!
default
;
$h6-font-size
:
$font-size-base
!
default
;
$headings-margin-bottom
:
(
$spacer
/
2
)
!
default
;
$headings-margin-bottom
:
(
$spacer
/
2
)
!
default
;
$headings-font-family
:
inherit
!
default
;
$headings-font-family
:
inherit
!
default
;
...
@@ -256,8 +256,8 @@ $display3-weight: 300 !default;
...
@@ -256,8 +256,8 @@ $display3-weight: 300 !default;
$display4-weight
:
300
!
default
;
$display4-weight
:
300
!
default
;
$display-line-height
:
$headings-line-height
!
default
;
$display-line-height
:
$headings-line-height
!
default
;
$lead-font-size
:
(
$font-size-base
*
1
.25
)
!
default
;
$lead-font-size
:
(
$font-size-base
*
1
.25
)
!
default
;
$lead-font-weight
:
300
!
default
;
$lead-font-weight
:
300
!
default
;
$small-font-size
:
80%
!
default
;
$small-font-size
:
80%
!
default
;
...
@@ -716,15 +716,15 @@ $alert-border-width: $border-width !default;
...
@@ -716,15 +716,15 @@ $alert-border-width: $border-width !default;
// Progress bars
// Progress bars
$progress-height
:
1rem
!
default
;
$progress-height
:
1rem
!
default
;
$progress-font-size
:
(
$font-size-base
*
.75
)
!
default
;
$progress-font-size
:
(
$font-size-base
*
.75
)
!
default
;
$progress-bg
:
$gray-200
!
default
;
$progress-bg
:
$gray-200
!
default
;
$progress-border-radius
:
$border-radius
!
default
;
$progress-border-radius
:
$border-radius
!
default
;
$progress-box-shadow
:
inset
0
.1rem
.1rem
rgba
(
$black
,.
1
)
!
default
;
$progress-box-shadow
:
inset
0
.1rem
.1rem
rgba
(
$black
,.
1
)
!
default
;
$progress-bar-color
:
$white
!
default
;
$progress-bar-color
:
$white
!
default
;
$progress-bar-bg
:
theme-color
(
"primary"
)
!
default
;
$progress-bar-bg
:
theme-color
(
"primary"
)
!
default
;
$progress-bar-animation-timing
:
1s
linear
infinite
!
default
;
$progress-bar-animation-timing
:
1s
linear
infinite
!
default
;
$progress-bar-transition
:
width
.6s
ease
!
default
;
$progress-bar-transition
:
width
.6s
ease
!
default
;
// List group
// List group
...
...
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