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
a362d62d
Commit
a362d62d
authored
7 years ago
by
Patrick Yeo
Committed by
Mark Otto
7 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Rename `$font-size-h*` to `$h*-font-size` for consistency (
#22414
)
parent
c349f591
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scss/_type.scss
+6
-6
scss/_type.scss
scss/_variables.scss
+6
-6
scss/_variables.scss
with
12 additions
and
12 deletions
+12
-12
scss/_type.scss
+
6
-
6
View file @
a362d62d
...
@@ -11,12 +11,12 @@ h1, h2, h3, h4, h5, h6,
...
@@ -11,12 +11,12 @@ h1, h2, h3, h4, h5, h6,
color
:
$headings-color
;
color
:
$headings-color
;
}
}
h1
,
.h1
{
font-size
:
$font-size
-h1
;
}
h1
,
.h1
{
font-size
:
$
h1-
font-size
;
}
h2
,
.h2
{
font-size
:
$font-size
-h2
;
}
h2
,
.h2
{
font-size
:
$
h2-
font-size
;
}
h3
,
.h3
{
font-size
:
$font-size
-h3
;
}
h3
,
.h3
{
font-size
:
$
h3-
font-size
;
}
h4
,
.h4
{
font-size
:
$font-size
-h4
;
}
h4
,
.h4
{
font-size
:
$
h4-
font-size
;
}
h5
,
.h5
{
font-size
:
$font-size
-h5
;
}
h5
,
.h5
{
font-size
:
$
h5-
font-size
;
}
h6
,
.h6
{
font-size
:
$font-size
-h6
;
}
h6
,
.h6
{
font-size
:
$
h6-
font-size
;
}
.lead
{
.lead
{
font-size
:
$lead-font-size
;
font-size
:
$lead-font-size
;
...
...
This diff is collapsed.
Click to expand it.
scss/_variables.scss
+
6
-
6
View file @
a362d62d
...
@@ -262,12 +262,12 @@ $font-weight-bold: bold !default;
...
@@ -262,12 +262,12 @@ $font-weight-bold: bold !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
;
$font-size
-h1
:
2
.5rem
!
default
;
$
h1-
font-size
:
2
.5rem
!
default
;
$font-size
-h2
:
2rem
!
default
;
$
h2-
font-size
:
2rem
!
default
;
$font-size
-h3
:
1
.75rem
!
default
;
$
h3-
font-size
:
1
.75rem
!
default
;
$font-size
-h4
:
1
.5rem
!
default
;
$
h4-
font-size
:
1
.5rem
!
default
;
$font-size
-h5
:
1
.25rem
!
default
;
$
h5-
font-size
:
1
.25rem
!
default
;
$font-size
-h6
:
1rem
!
default
;
$
h6-
font-size
:
1rem
!
default
;
$headings-margin-bottom
:
(
$spacer
/
2
)
!
default
;
$headings-margin-bottom
:
(
$spacer
/
2
)
!
default
;
$headings-font-family
:
inherit
!
default
;
$headings-font-family
:
inherit
!
default
;
...
...
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