Skip to content

Rewrote displays type variables to use them as a map #28453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
afanjul wants to merge 12 commits into from
Closed

Rewrote displays type variables to use them as a map #28453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a54e6e8
Rewrited displays type variables to use them as a map
afanjul Mar 11, 2019
58de8c2
Merge branch 'master' into master
afanjul Mar 11, 2019
5c4b2a1
Fixed test units
afanjul Mar 11, 2019
3182990
Merge remote-tracking branch 'origin/master'
afanjul Mar 11, 2019
24d7f9d
Using nested maps with explicit key-value in display types map
afanjul Mar 11, 2019
e7d5fe5
Merge branch 'master' into master
XhmikosR Mar 12, 2019
f4e69bd
Added stylelint comment to disable font-weight-notation warning
afanjul Mar 13, 2019
971a8a2
Merge remote-tracking branch 'origin/master'
afanjul Mar 13, 2019
721037a
Merge branch 'master' into master
XhmikosR May 10, 2019
4f85f84
Merge branch 'master' into master
XhmikosR May 19, 2019
3820a62
Added stylelint-disable to avoid compile errors
afanjul Dec 16, 2019
4787f95
Merge remote-tracking branch 'origin/master'
afanjul Dec 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 8 additions & 19 deletions scss/_type.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,14 @@
}

// 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 $index, $display-type in $display-types {
.display-#{$index} {
@include font-size(map-get($display-type, font-size));
//stylelint-disable-next-line font-weight-notation
font-weight: map-get($display-type, font-weight);
//stylelint-disable-next-line font-weight-notation
line-height: map-get($display-type, line-height);
}
}

//
Expand Down
29 changes: 19 additions & 10 deletions scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ $body-color: $gray-900 !default;
// Links
//
// Style anchor elements.

$link-color: theme-color("primary") !default;
$link-decoration: none !default;
$link-hover-color: darken($link-color, 15%) !default;
Expand Down Expand Up @@ -317,15 +316,25 @@ $headings-font-weight: 500 !default;
$headings-line-height: 1.2 !default;
$headings-color: null !default;

$display1-size: 6rem !default;
$display2-size: 5.5rem !default;
$display3-size: 4.5rem !default;
$display4-size: 3.5rem !default;

$display1-weight: 300 !default;
$display2-weight: 300 !default;
$display3-weight: 300 !default;
$display4-weight: 300 !default;
//display types as font-size and font-weight
$display-types: (
1: (
font-size: 6rem,
font-weight: 300
),
2: (
font-size: 5.5rem,
font-weight: 300
),
3: (
font-size: 4.5rem,
font-weight: 300
),
4: (
font-size: 3.5rem,
font-weight: 300
)
) !default;
$display-line-height: $headings-line-height !default;

$lead-font-size: $font-size-base * 1.25 !default;
Expand Down