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.

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

Line height reduction #856

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 17 commits
Commits
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
5 changes: 5 additions & 0 deletions context/brand-context/HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# History

## 31.1.0 (2023-01-09)
* BREAKING:
Copy link
Collaborator

Choose a reason for hiding this comment

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

If this is breaking, should it not be version 32?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@alexkilgour True, I forgot to sync that when I made it breaking.

* Reduction of `line-height` values
* 300 at start of variable font range for Merriweather in springernature README

## 31.0.0 (2023-01-04)
* Reduce scope of block spacing
* NOTE: This version replaces all versions >= 28.0.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

// Do not edit directly
// Generated on Fri, 21 Oct 2022 11:11:43 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-background-page: #f8f8f8 !default;
$t-background-container: #ffffff !default;
$t-background-container-inverted: #222222 !default;
$t-background-page: #f8f8f8;
$t-background-container: #ffffff;
$t-background-container-inverted: #222222;
22 changes: 11 additions & 11 deletions context/brand-context/default/scss/00-tokens/_border.variables.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

// Do not edit directly
// Generated on Fri, 21 Oct 2022 11:11:43 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-border-color-primary: #222222 !default;
$t-border-color-input: #999999 !default;
$t-border-color-button: #01324b !default;
$t-border-color-indent: #dadada !default;
$t-border-radius-50: 2px !default;
$t-border-radius-100: 4px !default;
$t-border-width-25: 1px !default;
$t-border-width-50: 2px !default;
$t-border-width-100: 4px !default;
$t-border-width-200: 8px !default;
$t-border-color-primary: #222222;
$t-border-color-input: #999999;
$t-border-color-button: #01324b;
$t-border-color-indent: #dadada;
$t-border-radius-50: 2px;
$t-border-radius-100: 4px;
$t-border-width-25: 1px;
$t-border-width-50: 2px;
$t-border-width-100: 4px;
$t-border-width-200: 8px;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Mon, 05 Dec 2022 17:04:03 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-breakpoints-xs: 320px;
$t-breakpoints-sm: 580px;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

// Do not edit directly
// Generated on Fri, 21 Oct 2022 11:11:43 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-button-background-primary-resting: #01324b !default;
$t-button-background-primary-hover: #ffffff !default;
$t-button-background-secondary-resting: #ffffff !default;
$t-button-background-secondary-hover: #01324b !default;
$t-button-background-primary-resting: #01324b;
$t-button-background-primary-hover: #ffffff;
$t-button-background-secondary-resting: #ffffff;
$t-button-background-secondary-hover: #01324b;
30 changes: 15 additions & 15 deletions context/brand-context/default/scss/00-tokens/_color.variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Fri, 21 Oct 2022 11:11:43 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-color-white: #ffffff;
$t-color-black: #000000;
Expand All @@ -17,17 +17,17 @@ $t-color-blue-300: #0088cc;
$t-color-blue-400: #025e8d;
$t-color-blue-700: #003f8d;
$t-color-blue-900: #01324b;
$t-color-primary-universal-dark-blue: #01324b !default;
$t-color-primary-medium-blue: #025e8d !default;
$t-color-primary-bright-blue: #0088cc !default;
$t-color-primary-grey-blue-light-1: #ebf1f5 !default;
$t-color-primary-grey-blue-light-2: #cedbe0 !default;
$t-color-primary-black: #000000 !default;
$t-color-primary-white: #ffffff !default;
$t-color-information-red: #c40606 !default;
$t-color-information-orange: #f58220 !default;
$t-color-information-blue: #000000 !default;
$t-color-information-green: #00a69d !default;
$t-color-interaction-hover: #025e8d !default;
$t-color-interaction-visited: #a345c9 !default;
$t-color-interaction-focus: #ffcc00 !default;
$t-color-primary-universal-dark-blue: #01324b;
$t-color-primary-medium-blue: #025e8d;
$t-color-primary-bright-blue: #0088cc;
$t-color-primary-grey-blue-light-1: #ebf1f5;
$t-color-primary-grey-blue-light-2: #cedbe0;
$t-color-primary-black: #000000;
$t-color-primary-white: #ffffff;
$t-color-information-red: #c40606;
$t-color-information-orange: #f58220;
$t-color-information-blue: #000000;
$t-color-information-green: #00a69d;
$t-color-interaction-hover: #025e8d;
$t-color-interaction-visited: #a345c9;
$t-color-interaction-focus: #ffcc00;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Mon, 05 Dec 2022 17:04:03 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-font-weight-light: 300;
$t-font-weight-normal: 400;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Fri, 21 Oct 2022 11:11:43 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT
Copy link
Collaborator

@alexkilgour alexkilgour Jan 9, 2023

Choose a reason for hiding this comment

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

There aren't actually any changes to this file, I think we need a way to not generate this line when the file doesn't change as it's extremely noisy

Copy link
Collaborator

Choose a reason for hiding this comment

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

In fact is there any need for this "Generated on" message? Github shows the last changed date

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 we need a way to not generate this

Agreed, I have a task to look at seeing how we can 'test' what has changed and get Style Dictionary to act accordingly.

Copy link
Contributor

Choose a reason for hiding this comment

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

In fact is there any need for this "Generated on" message?

I guess not - as the 'do not edit directly' message is there.

Github shows the last changed date

We're assuming folks would check this‽ Although tools like VSCode are quite adept at showing this information (even line-by-line).

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think what we need is these files to be auto-generated as part of the package management, then there is no need fo anyone to check anything

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, I'd love some form of automation for this so it's not "yet another npm script" that someone needs to run. It not being on npmjs at the moment is probably scuppering possibilities.

🤞🏼 the single release 🤞🏼


$t-gap-0: 0;
$t-gap-100: .25rem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

// Do not edit directly
// Generated on Fri, 21 Oct 2022 11:11:43 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-icon-checkbox-checked-stroke: #ffffff !default;
$t-icon-checkbox-checked-fill: #01324b !default;
$t-icon-select-stroke: #000000 !default;
$t-icon-checkbox-checked-stroke: #ffffff;
Copy link
Collaborator

Choose a reason for hiding this comment

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

A lot of file seem to have this !default removed. Is this related at all to the line-height change or is this from something else and the tokens were not updated?

Copy link
Contributor

Choose a reason for hiding this comment

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

it's related, when Sass meets two !defaults for the same variable - it takes the first one, rather than the second. This meant that the overriding variable for the nature theme wasn't coming through.

Me adding !default was a pre-cursor for the single release but I got it wrong here.

Sadly I had added !default to pretty much every literal or alias token so we decided to remove them all, and 'circle back' to their usage later.

$t-icon-checkbox-checked-fill: #01324b;
$t-icon-select-stroke: #000000;
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

// Do not edit directly
// Generated on Fri, 21 Oct 2022 11:11:43 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-link-color: #025e8d !default;
$t-link-hover: #01324b !default;
$t-link-visited: #01324b !default;
$t-link-focus: #0088cc !default;
$t-link-color: #025e8d;
$t-link-hover: #01324b;
$t-link-visited: #01324b;
$t-link-focus: #0088cc;
114 changes: 57 additions & 57 deletions context/brand-context/default/scss/00-tokens/_margin.variables.scss
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@

// Do not edit directly
// Generated on Fri, 21 Oct 2022 11:11:43 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-margin-0: 0 !default;
$t-margin-100: .25rem !default;
$t-margin-200: .5rem !default;
$t-margin-400: 1rem !default;
$t-margin-600: 1.5rem !default;
$t-margin-800: 2rem !default;
$t-margin-1200: 3rem !default;
$t-margin-1600: 4rem !default;
$t-margin-inline-0: 0 !default;
$t-margin-inline-100: .25rem !default;
$t-margin-inline-200: .5rem !default;
$t-margin-inline-400: 1rem !default;
$t-margin-inline-600: 1.5rem !default;
$t-margin-inline-800: 2rem !default;
$t-margin-inline-1200: 3rem !default;
$t-margin-inline-1600: 4rem !default;
$t-margin-inline-start-0: 0 !default;
$t-margin-inline-start-100: .25rem !default;
$t-margin-inline-start-200: .5rem !default;
$t-margin-inline-start-400: 1rem !default;
$t-margin-inline-start-600: 1.5rem !default;
$t-margin-inline-start-800: 2rem !default;
$t-margin-inline-start-1200: 3rem !default;
$t-margin-inline-start-1600: 4rem !default;
$t-margin-inline-end-0: 0 !default;
$t-margin-inline-end-100: .25rem !default;
$t-margin-inline-end-200: .5rem !default;
$t-margin-inline-end-400: 1rem !default;
$t-margin-inline-end-600: 1.5rem !default;
$t-margin-inline-end-800: 2rem !default;
$t-margin-inline-end-1200: 3rem !default;
$t-margin-inline-end-1600: 4rem !default;
$t-margin-block-0: 0 !default;
$t-margin-block-100: .25rem !default;
$t-margin-block-200: .5rem !default;
$t-margin-block-400: 1rem !default;
$t-margin-block-600: 1.5rem !default;
$t-margin-block-800: 2rem !default;
$t-margin-block-1200: 3rem !default;
$t-margin-block-1600: 4rem !default;
$t-margin-block-start-0: 0 !default;
$t-margin-block-start-100: .25rem !default;
$t-margin-block-start-200: .5rem !default;
$t-margin-block-start-400: 1rem !default;
$t-margin-block-start-600: 1.5rem !default;
$t-margin-block-start-800: 2rem !default;
$t-margin-block-start-1200: 3rem !default;
$t-margin-block-start-1600: 4rem !default;
$t-margin-block-end-0: 0 !default;
$t-margin-block-end-100: .25rem !default;
$t-margin-block-end-200: .5rem !default;
$t-margin-block-end-400: 1rem !default;
$t-margin-block-end-600: 1.5rem !default;
$t-margin-block-end-800: 2rem !default;
$t-margin-block-end-1200: 3rem !default;
$t-margin-block-end-1600: 4rem !default;
$t-margin-0: 0;
$t-margin-100: .25rem;
$t-margin-200: .5rem;
$t-margin-400: 1rem;
$t-margin-600: 1.5rem;
$t-margin-800: 2rem;
$t-margin-1200: 3rem;
$t-margin-1600: 4rem;
$t-margin-inline-0: 0;
$t-margin-inline-100: .25rem;
$t-margin-inline-200: .5rem;
$t-margin-inline-400: 1rem;
$t-margin-inline-600: 1.5rem;
$t-margin-inline-800: 2rem;
$t-margin-inline-1200: 3rem;
$t-margin-inline-1600: 4rem;
$t-margin-inline-start-0: 0;
$t-margin-inline-start-100: .25rem;
$t-margin-inline-start-200: .5rem;
$t-margin-inline-start-400: 1rem;
$t-margin-inline-start-600: 1.5rem;
$t-margin-inline-start-800: 2rem;
$t-margin-inline-start-1200: 3rem;
$t-margin-inline-start-1600: 4rem;
$t-margin-inline-end-0: 0;
$t-margin-inline-end-100: .25rem;
$t-margin-inline-end-200: .5rem;
$t-margin-inline-end-400: 1rem;
$t-margin-inline-end-600: 1.5rem;
$t-margin-inline-end-800: 2rem;
$t-margin-inline-end-1200: 3rem;
$t-margin-inline-end-1600: 4rem;
$t-margin-block-0: 0;
$t-margin-block-100: .25rem;
$t-margin-block-200: .5rem;
$t-margin-block-400: 1rem;
$t-margin-block-600: 1.5rem;
$t-margin-block-800: 2rem;
$t-margin-block-1200: 3rem;
$t-margin-block-1600: 4rem;
$t-margin-block-start-0: 0;
$t-margin-block-start-100: .25rem;
$t-margin-block-start-200: .5rem;
$t-margin-block-start-400: 1rem;
$t-margin-block-start-600: 1.5rem;
$t-margin-block-start-800: 2rem;
$t-margin-block-start-1200: 3rem;
$t-margin-block-start-1600: 4rem;
$t-margin-block-end-0: 0;
$t-margin-block-end-100: .25rem;
$t-margin-block-end-200: .5rem;
$t-margin-block-end-400: 1rem;
$t-margin-block-end-600: 1.5rem;
$t-margin-block-end-800: 2rem;
$t-margin-block-end-1200: 3rem;
$t-margin-block-end-1600: 4rem;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Fri, 21 Oct 2022 11:11:43 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-padding-0: 0;
$t-padding-100: .25rem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Mon, 05 Dec 2022 17:04:03 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-spacing-relative-0: 0;
$t-spacing-relative-100: .25rem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

// Do not edit directly
// Generated on Fri, 21 Oct 2022 11:11:43 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-state-focus: #ffcc00 !default;
$t-state-error: #c40606 !default;
$t-state-warning: #f58220 !default;
$t-state-success: #00a69d !default;
$t-state-information: #000000 !default;
$t-state-focus: #ffcc00;
$t-state-error: #c40606;
$t-state-warning: #f58220;
$t-state-success: #00a69d;
$t-state-information: #000000;
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

// Do not edit directly
// Generated on Fri, 21 Oct 2022 11:11:43 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-text-primary: #000000 !default;
$t-text-secondary: #666666 !default;
$t-text-reversed: #ffffff !default;
$t-text-primary: #000000;
$t-text-secondary: #666666;
$t-text-reversed: #ffffff;
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@

// Do not edit directly
// Generated on Mon, 14 Nov 2022 15:43:11 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-typography-heading-font-family: serif !default;
$t-typography-heading-letter-spacing: 0.2rem !default;
$t-typography-heading-line-height: 1.2 !default;
$t-typography-heading-level-1-default-font-size: 2.5rem !default;
$t-typography-heading-level-1-default-font-weight: 400 !default;
$t-typography-heading-level-1-fluid-font-size: clamp(1.875rem, 4vw, 2.5rem) !default;
$t-typography-heading-level-2-default-font-size: 1.875rem !default;
$t-typography-heading-level-2-default-font-weight: 400 !default;
$t-typography-heading-level-2-fluid-font-size: clamp(1.5rem, 4vw, 1.875rem) !default;
$t-typography-heading-level-3-default-font-size: 1.5rem !default;
$t-typography-heading-level-3-fluid-font-size: clamp(1.25rem, 4vw, 1.5rem) !default;
$t-typography-level-4-font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif !default;
$t-typography-level-4-default-font-size: 1.25rem !default;
$t-typography-level-4-fluid-font-size: clamp(1.125rem, 4vw, 1.25rem) !default;
$t-typography-level-4-font-weight: 700 !default;
$t-typography-level-5-font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif !default;
$t-typography-level-5-font-size: 1.125rem !default;
$t-typography-level-5-font-weight: 700 !default;
$t-typography-heading-font-family: serif;
$t-typography-heading-letter-spacing: 0.2rem;
$t-typography-heading-line-height: 1.25;
$t-typography-heading-level-1-default-font-size: 2.5rem;
$t-typography-heading-level-1-default-font-weight: 400;
$t-typography-heading-level-1-fluid-font-size: clamp(1.875rem, 4vw, 2.5rem);
$t-typography-heading-level-2-default-font-size: 1.875rem;
$t-typography-heading-level-2-default-font-weight: 400;
$t-typography-heading-level-2-fluid-font-size: clamp(1.5rem, 4vw, 1.875rem);
$t-typography-heading-level-3-default-font-size: 1.5rem;
$t-typography-heading-level-3-fluid-font-size: clamp(1.25rem, 4vw, 1.5rem);
$t-typography-level-4-font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif;
$t-typography-level-4-default-font-size: 1.25rem;
$t-typography-level-4-fluid-font-size: clamp(1.125rem, 4vw, 1.25rem);
$t-typography-level-4-font-weight: 700;
$t-typography-level-5-font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif;
$t-typography-level-5-font-size: 1.125rem;
$t-typography-level-5-font-weight: 700;
$t-typography-block-spacing-small: .5rem;
$t-typography-block-spacing-medium: 1rem;
$t-typography-block-spacing-large: 2rem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

// Do not edit directly
// Generated on Fri, 21 Oct 2022 11:11:43 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-ui-font-size: 1rem;
$t-ui-focus-outline-color: #0088cc;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

// Do not edit directly
// Generated on Fri, 21 Oct 2022 11:11:43 GMT
// Generated on Mon, 09 Jan 2023 13:28:25 GMT

$t-background-page: #ffffff !default;
$t-background-page: #ffffff;
Loading