Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markd.otto@gmail.com>2020-04-14 14:57:11 +0300
committerGitHub <noreply@github.com>2020-04-14 14:57:11 +0300
commit4efc1c462da3be1ef7f6716436349ee67be60ee6 (patch)
tree40ca17ccecb64154e3331313bd2292347b32cdc9 /scss/_type.scss
parente2afbbfa828418dd93c8de8c1c2ce60361d04fbf (diff)
Redo display headings (#30568)
- Convert to Sass map - Consolidate font-weights into single option (matching line-height for them) - Add two new sizes and create a new scale - Update migration docs Co-authored-by: Martijn Cuppens <martijn.cuppens@gmail.com>
Diffstat (limited to 'scss/_type.scss')
-rw-r--r--scss/_type.scss25
1 files changed, 6 insertions, 19 deletions
diff --git a/scss/_type.scss b/scss/_type.scss
index 7726b7b212..efa2c81552 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -32,25 +32,12 @@
}
// Type display classes
-.display-1 {
- @include font-size($display1-size);
- font-weight: $display1-weight;
- line-height: $display-line-height;
-}
-.display-2 {
- @include font-size($display2-size);
- font-weight: $display2-weight;
- line-height: $display-line-height;
-}
-.display-3 {
- @include font-size($display3-size);
- font-weight: $display3-weight;
- line-height: $display-line-height;
-}
-.display-4 {
- @include font-size($display4-size);
- font-weight: $display4-weight;
- line-height: $display-line-height;
+@each $display, $font-size in $display-font-sizes {
+ .display-#{$display} {
+ @include font-size($font-size);
+ font-weight: $display-font-weight;
+ line-height: $display-line-height;
+ }
}
//