Fluid type scale #216
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| @use "sass:map"; | ||
|
|
||
| /// Create new/different scales by editing the config | ||
| /// This is the single source of truth | ||
| $fluid-config: ( | ||
| // Typescale ratio for calculating steps | ||
| typescale-ratio: 1.25, | ||
| // base font size to use for --step0 | ||
| base-fontsize: 1rem, | ||
| // adjustment added to base-fontsize in --step0 for scaling | ||
| viewport-scale: 0.5vw, | ||
| // number of positive steps (--step1, --step2 etc) | ||
| // and number of negative steps (--step-1, --step-2 etc) | ||
|
Comment on lines
+12
to
+13
There was a problem hiding this comment. These names are not really clear. Hyphenating is common to separate words, especially in CSS where we don’t use camel case. Can you change these two be either There was a problem hiding this comment. I agree. Will update |
||
| steps: | ||
| ( | ||
| pos: 10, | ||
| neg: 3 | ||
| ) | ||
| ); | ||
|
|
||
| /// Creates all required css step variables | ||
| /// for the type scale | ||
| /// | ||
| /// @param {number} $typescale-ratio | ||
| /// The ratio we use to compute steps. | ||
| /// @example | ||
| /// --step1 : calc(var(--step0 * #{$typescale-ratio})) | ||
| /// | ||
| /// @param {integer (rem)} $base-fontsize | ||
| /// The base fontsize we use for step0 | ||
| /// @param {integer (vw)} $viewport-scale | ||
| /// adjustment added to base-fontsize for scaling | ||
| /// @example | ||
| /// --step0: calc(#{$base-fontsize}+#{$viewport-scale}) | ||
| /// | ||
| /// @param {map} $steps | ||
| /// no of positive and negative steps to create in font scales | ||
| /// @example | ||
| /// $steps: (pos: 7, neg: 3) | ||
|
|
||
| @mixin create-typescale( | ||
| $typescale-ratio, | ||
| $base-fontsize, | ||
| $viewport-scale, | ||
| $steps | ||
| ) { | ||
| $pos-steps: map.get($steps, pos); | ||
| $neg-steps: map.get($steps, neg); | ||
| --step0: calc(#{$base-fontsize} + #{$viewport-scale}); | ||
| @for $step from 1 to $pos-steps { | ||
| & { | ||
| --step#{$step}: calc(var(--step#{$step - 1}) * #{$typescale-ratio}); | ||
| } | ||
| } | ||
|
|
||
| @for $step from 1 to $neg-steps { | ||
| // to account for the lack of dash(-) in step0 | ||
| // --step-0 doesn't exist so we need to use a different expression | ||
| // while computing --step-1 | ||
| @if $step != 1 { | ||
| & { | ||
| --step-#{$step}: calc(var(--step-#{$step - 1}) / #{$typescale-ratio}); | ||
| } | ||
| } @else { | ||
| & { | ||
| --step-#{$step}: calc(var(--step0) / #{$typescale-ratio}); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| :root { | ||
| @include create-typescale($fluid-config...); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,57 @@ | ||
| $line-height-heading: 1; | ||
| $line-height-body: 1.4; | ||
| $line-height-tight: 0.8; | ||
|
|
||
| h1 { | ||
| font-family: $ext-sans; | ||
| font-weight: $bold; | ||
| line-height: $line-height-heading; | ||
| } | ||
|
|
||
| h1, | ||
| h2, | ||
| h3, | ||
| h4 { | ||
| line-height: $line-height-heading; | ||
| margin-bottom: 0.5em; | ||
| margin-top: 1em; | ||
| word-break: break-word; | ||
| } | ||
|
|
||
| p { | ||
| font-size: var(--step-1); | ||
| line-height: $line-height-body; | ||
| margin: 0.75rem 0; | ||
| } | ||
| li { | ||
| font-size: var(--step-1); | ||
| line-height: $line-height-body; | ||
| } | ||
|
|
||
| .thicc-headline { | ||
| font-size: var(--step6); | ||
| line-height: $line-height-tight; | ||
| margin: 0.5rem 0; | ||
| padding: 0; | ||
| } | ||
|
|
||
| .main-headline { | ||
| font-family: orpheuspro, Palatino, Times, serif; | ||
| font-size: var(--step4); | ||
| line-height: $line-height-heading; | ||
| margin: 0; | ||
| } | ||
|
|
||
| .sub-headline { | ||
| font-family: $ext-sans; | ||
| font-size: var(--step0); | ||
|
There was a problem hiding this comment. I believe |
||
| font-weight: $bold; | ||
| letter-spacing: 0.01rem; | ||
| line-height: $line-height-heading; | ||
| margin: 0.75rem 0; | ||
| } | ||
|
|
||
| .small { | ||
| font-size: var(--step-1); | ||
| line-height: $line-height-body; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,22 @@ | ||
| .word__type { | ||
| font-family: $con-sans; | ||
| font-size: var(--step-2); | ||
| padding-right: 1rem; | ||
| text-align: right; | ||
| text-transform: uppercase; | ||
| } | ||
|
|
||
| .word__link { | ||
| border-bottom: darkgrey solid 0.1em; | ||
| color: black; | ||
| font-family: $ext-sans; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| .word__breakdown { | ||
| border-left: 0.1rem solid lightgrey; | ||
| font-family: $sans-serif; | ||
| padding-left: 1rem; | ||
| } | ||
|
|
||
| .content-flag { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| .flag { | ||
| border-radius: 1rem; | ||
| display: inline-block; | ||
| font-size: var(--step-1); | ||
| font-weight: bold; | ||
| margin: 0.5rem 0.75rem 0.25rem 0; | ||
| padding: 0.45rem 0.65rem; | ||
|
|
@@ -15,10 +15,9 @@ | |
| } | ||
| &--yellow { | ||
| background-color: $lt-background-color-warning; | ||
| &:before { | ||
| @include icon__warning(); | ||
| @include icon__embed(); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,7 @@ | |
|
|
||
| &__title { | ||
| font-family: $serif; | ||
| font-size: var(--step2); | ||
| font-weight: 900; | ||
| line-height: 1.25; | ||
| margin-bottom: 1rem; | ||
|
|
@@ -26,14 +26,14 @@ | |
|
|
||
| & > p { | ||
| font-family: $sans-serif; | ||
| font-size: var(--step1); | ||
| grid-column: 1 / -1; | ||
| } | ||
|
|
||
| & h4 { | ||
| flex: 0 1 auto; | ||
| font-family: $con-sans; | ||
| font-size: var(--step2); | ||
| font-weight: normal; | ||
| grid-column: 1; | ||
| text-transform: uppercase; | ||
|
|
@@ -60,15 +60,15 @@ | |
|
|
||
| &__speech { | ||
| font-family: $sans-serif; | ||
| font-size: var(--step-3); | ||
| } | ||
|
|
||
| &__signal { | ||
| border-top: pxToRem(1) solid var(--word-signal-color); | ||
| color: var(--word-signal-color); | ||
| display: inline-block; | ||
| font-family: $ext-sans; | ||
| font-size: var(--step-2); | ||
| letter-spacing: 0.15rem; | ||
| padding: 0.5rem 0.75rem; | ||
| text-transform: uppercase; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,6 +25,10 @@ | |
| } | ||
| } | ||
|
|
||
| .wide-content .title p { | ||
| font-size: var(--step-2); | ||
| } | ||
|
|
||
| .definition { | ||
| max-width: 47rem; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ | |
|
|
||
| &__title { | ||
| font-family: $serif; | ||
| font-size: var(--step3); | ||
| font-weight: 900; | ||
| line-height: 1.25; | ||
| margin-bottom: 1rem; | ||
|
|
@@ -31,17 +31,18 @@ | |
|
|
||
| & > p { | ||
| font-family: $sans-serif; | ||
| font-size: var(--step0); | ||
|
There was a problem hiding this comment. I think you changed this here because |
||
| grid-column: 1 / -1; | ||
| line-height: $line-height-body; | ||
| } | ||
|
|
||
| & h2 { | ||
| flex: 0 1 auto; | ||
| font-family: $con-sans; | ||
| font-size: var(--step-2); | ||
| font-weight: normal; | ||
| grid-column: 1; | ||
| line-height: $line-height-body; | ||
| text-transform: uppercase; | ||
| transform: translateY(0.4em); | ||
|
|
||
|
|
@@ -75,7 +76,7 @@ | |
| color: var(--word-signal-color); | ||
| display: block; | ||
| font-family: $ext-sans; | ||
| font-size: var(--step-2); | ||
| letter-spacing: 0.15rem; | ||
| padding: 0.5rem 0.75rem; | ||
| text-transform: uppercase; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,7 @@ | |
|
|
||
| .definition-navigation__sub-headline { | ||
| color: #333; | ||
| font-size: var(--step-1); | ||
| font-variant-caps: all-small-caps; | ||
| letter-spacing: 0.01em; | ||
| margin-top: 0; | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We import this in
css/base.scss, I think you were adding this here because otherwise the SASS variables you are defining in the typography partial would not be accessible?Two ways to mitigate this, both cleaning up the structure a bit:
abstracts/variables(or inbase/_fontswhere the font weights and families are defined)base/custom-properties