Skip to content
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

Jump to bottom

Set Value from Theme #13

Merged
merged 4 commits into from
Mar 14, 2021
Merged

Set Value from Theme #13

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05a11af
Update _type.scss
katgirl Jan 8, 2021
b9fb741
Merge pull request #1 from katgirl/katgirl-patch-1
katgirl Jan 8, 2021
a446120
Merge branch 'develop' into develop
denniserdmann Jan 29, 2021
9febfcd
Merge branch 'develop' into develop
denniserdmann Mar 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 16 additions & 5 deletions files/nutshell/scss/base/_type.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,17 +137,28 @@ html {
$margin-top: map-get($options, margin-top);
$margin-bottom: map-get($options, margin-bottom);
$color: map-get($options, color);

$font-weight: map-get($options, font-weight);
$font-family: map-get($options, font-family);
font-size: map-get($sizes, xs); // [5]
font-family: var(--headings__font-family);
font-weight: var(--headings__font-weight);
line-height: $line-height;
margin-bottom: $margin-bottom;

@if $color {
color: $color;
}


@if $font-weight {
font-weight: $font-weight;
} @else {
font-weight: var(--headings__font-weight);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think about removing the fallback, as we already have a fallback in line 116ff. What do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I hadn't seen it at all, that's OK if that one falls on there.

}

@if $font-family {
font-family: $font-family;
} @else {
font-family: var(--headings__font-family);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think about removing the fallback, as we already have a fallback in line 116ff. What do you think?

}

// [6]
@for $i from 2 through length($sizes) {
$current: nth($sizes, $i); // $i = 2 = sm, $i = 5 = xl
Expand Down