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

Update Fallback Fonts from sans-serif to serif in Rollingstone 2022 #867

Merged
merged 2 commits into from
Oct 31, 2024
Merged

Update Fallback Fonts from sans-serif to serif in Rollingstone 2022 #867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
171b702
Udpate fallback fonts
yahilmadakiya Oct 31, 2024
50e23d7
Update changelog
yahilmadakiya Oct 31, 2024
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 1.66.3 10-28-2024
* Update Fallback Fonts from sans-serif to serif in Rollingstone 2022

Copy link
Contributor

Choose a reason for hiding this comment

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

This should go under the unplublished changes heading.

Copy link
Contributor

@JordanPak JordanPak Oct 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@rsalvucci I didn't see this comment but ended up fixing it in the release branch

## Unpublished Changes

## 1.66.2 10-28-2024
Expand Down
2 changes: 1 addition & 1 deletion build/tokens/rollingstone-2022.custom-properties.css
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions build/tokens/rollingstone-2022.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"FONT_FAMILY_PRIMARY": "serif",
"FONT_FAMILY_SECONDARY_FANCY": "'Feature Flat Deck', serif",
"FONT_FAMILY_SECONDARY": "serif",
"FONT_FAMILY_BODY": "'Feature Flat Text', Helvetica, sans-serif",
"FONT_FAMILY_BASIC": "sans-serif",
"FONT_FAMILY_BODY": "'Feature Flat Text', Helvetica, serif",
"FONT_FAMILY_BASIC": "serif",
"FONT_WEIGHT_LIGHT": "300",
"FONT_WEIGHT_NORMAL": "400",
"FONT_WEIGHT_BOLD": "700",
Expand Down Expand Up @@ -514,6 +514,6 @@
"BODY_L_LINE_HEIGHT_MOBILE": "31px",
"FONT_FAMILY_ACCENT": "Verdana, serif",
"FONT_FAMILY_ACCENT_FANCY": "Verdana, sans-serif",
"FONT_FAMILY_BASIC_FANCY": "'Feature Flat Text', sans-serif",
"FONT_FAMILY_BODY_FANCY": "'Feature Flat Text', Helvetica, sans-serif"
"FONT_FAMILY_BASIC_FANCY": "'Feature Flat Text', serif",
"FONT_FAMILY_BODY_FANCY": "'Feature Flat Text', Helvetica, serif"
}
8 changes: 4 additions & 4 deletions build/tokens/rollingstone-2022.map.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ $rollingstone-2022-map: (
'font-family-secondary-fancy': ('Feature Flat Deck', serif),
/* Fallback for secondary-fancy */
'font-family-secondary': (serif),
'font-family-body': ('Feature Flat Text', Helvetica, sans-serif),
'font-family-basic': (sans-serif),
'font-family-body': ('Feature Flat Text', Helvetica, serif),
'font-family-basic': (serif),
'font-weight-light': (300),
'font-weight-normal': (400),
'font-weight-bold': (700),
Expand Down Expand Up @@ -529,6 +529,6 @@ $rollingstone-2022-map: (
'body-l-line-height-mobile': (31px),
'font-family-accent': (Verdana, serif),
'font-family-accent-fancy': (Verdana, sans-serif),
'font-family-basic-fancy': ('Feature Flat Text', sans-serif),
'font-family-body-fancy': ('Feature Flat Text', Helvetica, sans-serif),
'font-family-basic-fancy': ('Feature Flat Text', serif),
'font-family-body-fancy': ('Feature Flat Text', Helvetica, serif),
);
16 changes: 8 additions & 8 deletions build/tokens/rollingstone-2022.raw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,16 +512,16 @@
},
"FONT_FAMILY_BODY": {
"category": "font-family",
"value": "'Feature Flat Text', Helvetica, sans-serif",
"value": "'Feature Flat Text', Helvetica, serif",
"type": "font",
"originalValue": "'Feature Flat Text', Helvetica, sans-serif",
"originalValue": "'Feature Flat Text', Helvetica, serif",
"name": "FONT_FAMILY_BODY"
},
"FONT_FAMILY_BASIC": {
"category": "font-family",
"value": "sans-serif",
"value": "serif",
"type": "font-family",
"originalValue": "sans-serif",
"originalValue": "serif",
"name": "FONT_FAMILY_BASIC"
},
"FONT_WEIGHT_LIGHT": {
Expand Down Expand Up @@ -4015,16 +4015,16 @@
},
"FONT_FAMILY_BASIC_FANCY": {
"category": "font-family",
"value": "'Feature Flat Text', sans-serif",
"value": "'Feature Flat Text', serif",
"type": "font-family",
"originalValue": "'Feature Flat Text', sans-serif",
"originalValue": "'Feature Flat Text', serif",
"name": "FONT_FAMILY_BASIC_FANCY"
},
"FONT_FAMILY_BODY_FANCY": {
"category": "font-family",
"value": "'Feature Flat Text', Helvetica, sans-serif",
"value": "'Feature Flat Text', Helvetica, serif",
"type": "font",
"originalValue": "'Feature Flat Text', Helvetica, sans-serif",
"originalValue": "'Feature Flat Text', Helvetica, serif",
"name": "FONT_FAMILY_BODY_FANCY"
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/larva-tokens/build/rollingstone-2022.custom-properties.css
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/larva-tokens/build/rollingstone-2022.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"FONT_FAMILY_PRIMARY": "serif",
"FONT_FAMILY_SECONDARY_FANCY": "'Feature Flat Deck', serif",
"FONT_FAMILY_SECONDARY": "serif",
"FONT_FAMILY_BODY": "'Feature Flat Text', Helvetica, sans-serif",
"FONT_FAMILY_BASIC": "sans-serif",
"FONT_FAMILY_BODY": "'Feature Flat Text', Helvetica, serif",
"FONT_FAMILY_BASIC": "serif",
"FONT_WEIGHT_LIGHT": "300",
"FONT_WEIGHT_NORMAL": "400",
"FONT_WEIGHT_BOLD": "700",
Expand Down Expand Up @@ -514,6 +514,6 @@
"BODY_L_LINE_HEIGHT_MOBILE": "31px",
"FONT_FAMILY_ACCENT": "Verdana, serif",
"FONT_FAMILY_ACCENT_FANCY": "Verdana, sans-serif",
"FONT_FAMILY_BASIC_FANCY": "'Feature Flat Text', sans-serif",
"FONT_FAMILY_BODY_FANCY": "'Feature Flat Text', Helvetica, sans-serif"
"FONT_FAMILY_BASIC_FANCY": "'Feature Flat Text', serif",
"FONT_FAMILY_BODY_FANCY": "'Feature Flat Text', Helvetica, serif"
}
8 changes: 4 additions & 4 deletions packages/larva-tokens/build/rollingstone-2022.map.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ $rollingstone-2022-map: (
'font-family-secondary-fancy': ('Feature Flat Deck', serif),
/* Fallback for secondary-fancy */
'font-family-secondary': (serif),
'font-family-body': ('Feature Flat Text', Helvetica, sans-serif),
'font-family-basic': (sans-serif),
'font-family-body': ('Feature Flat Text', Helvetica, serif),
'font-family-basic': (serif),
'font-weight-light': (300),
'font-weight-normal': (400),
'font-weight-bold': (700),
Expand Down Expand Up @@ -529,6 +529,6 @@ $rollingstone-2022-map: (
'body-l-line-height-mobile': (31px),
'font-family-accent': (Verdana, serif),
'font-family-accent-fancy': (Verdana, sans-serif),
'font-family-basic-fancy': ('Feature Flat Text', sans-serif),
'font-family-body-fancy': ('Feature Flat Text', Helvetica, sans-serif),
'font-family-basic-fancy': ('Feature Flat Text', serif),
'font-family-body-fancy': ('Feature Flat Text', Helvetica, serif),
);
16 changes: 8 additions & 8 deletions packages/larva-tokens/build/rollingstone-2022.raw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,16 +512,16 @@
},
"FONT_FAMILY_BODY": {
"category": "font-family",
"value": "'Feature Flat Text', Helvetica, sans-serif",
"value": "'Feature Flat Text', Helvetica, serif",
"type": "font",
"originalValue": "'Feature Flat Text', Helvetica, sans-serif",
"originalValue": "'Feature Flat Text', Helvetica, serif",
"name": "FONT_FAMILY_BODY"
},
"FONT_FAMILY_BASIC": {
"category": "font-family",
"value": "sans-serif",
"value": "serif",
"type": "font-family",
"originalValue": "sans-serif",
"originalValue": "serif",
"name": "FONT_FAMILY_BASIC"
},
"FONT_WEIGHT_LIGHT": {
Expand Down Expand Up @@ -4015,16 +4015,16 @@
},
"FONT_FAMILY_BASIC_FANCY": {
"category": "font-family",
"value": "'Feature Flat Text', sans-serif",
"value": "'Feature Flat Text', serif",
"type": "font-family",
"originalValue": "'Feature Flat Text', sans-serif",
"originalValue": "'Feature Flat Text', serif",
"name": "FONT_FAMILY_BASIC_FANCY"
},
"FONT_FAMILY_BODY_FANCY": {
"category": "font-family",
"value": "'Feature Flat Text', Helvetica, sans-serif",
"value": "'Feature Flat Text', Helvetica, serif",
"type": "font",
"originalValue": "'Feature Flat Text', Helvetica, sans-serif",
"originalValue": "'Feature Flat Text', Helvetica, serif",
"name": "FONT_FAMILY_BODY_FANCY"
}
}
Expand Down
16 changes: 8 additions & 8 deletions packages/larva-tokens/src/brands/rollingstone-2022.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,30 +210,30 @@
},
"FONT_FAMILY_BASIC": {
"category": "font-family",
"value": "sans-serif",
"value": "serif",
"type": "font-family",
"originalValue": "sans-serif",
"originalValue": "serif",
"name": "FONT_FAMILY_BASIC"
},
"FONT_FAMILY_BASIC_FANCY": {
"category": "font-family",
"value": "'Feature Flat Text', sans-serif",
"value": "'Feature Flat Text', serif",
"type": "font-family",
"originalValue": "'Feature Flat Text', sans-serif",
"originalValue": "'Feature Flat Text', serif",
"name": "FONT_FAMILY_BASIC_FANCY"
},
"FONT_FAMILY_BODY": {
"category": "font-family",
"value": "'Feature Flat Text', Helvetica, sans-serif",
"value": "'Feature Flat Text', Helvetica, serif",
"type": "font",
"originalValue": "'Feature Flat Text', Helvetica, sans-serif",
"originalValue": "'Feature Flat Text', Helvetica, serif",
"name": "FONT_FAMILY_BODY"
},
"FONT_FAMILY_BODY_FANCY": {
"category": "font-family",
"value": "'Feature Flat Text', Helvetica, sans-serif",
"value": "'Feature Flat Text', Helvetica, serif",
"type": "font",
"originalValue": "'Feature Flat Text', Helvetica, sans-serif",
"originalValue": "'Feature Flat Text', Helvetica, serif",
"name": "FONT_FAMILY_BODY_FANCY"
},
"FONT_FAMILY_PRIMARY": {
Expand Down
16 changes: 8 additions & 8 deletions packages/larva-tokens/style-guides/rollingstone-2022.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6564,11 +6564,11 @@ <h1>Design Tokens</h1>
<code>font-family-body</code>
</th>
<td>
<code>'Feature Flat Text', Helvetica, sans-serif</code>
<code>'Feature Flat Text', Helvetica, serif</code>
</td>

<td>
<div style="font-family: 'Feature Flat Text', Helvetica, sans-serif;">
<div style="font-family: 'Feature Flat Text', Helvetica, serif;">
The quick brown fox jumps over the lazy dog.
</div>
</td>
Expand All @@ -6581,11 +6581,11 @@ <h1>Design Tokens</h1>
<code>font-family-basic</code>
</th>
<td>
<code>sans-serif</code>
<code>serif</code>
</td>

<td>
<div style="font-family: sans-serif;">
<div style="font-family: serif;">
The quick brown fox jumps over the lazy dog.
</div>
</td>
Expand Down Expand Up @@ -6632,11 +6632,11 @@ <h1>Design Tokens</h1>
<code>font-family-basic-fancy</code>
</th>
<td>
<code>'Feature Flat Text', sans-serif</code>
<code>'Feature Flat Text', serif</code>
</td>

<td>
<div style="font-family: 'Feature Flat Text', sans-serif;">
<div style="font-family: 'Feature Flat Text', serif;">
The quick brown fox jumps over the lazy dog.
</div>
</td>
Expand All @@ -6649,11 +6649,11 @@ <h1>Design Tokens</h1>
<code>font-family-body-fancy</code>
</th>
<td>
<code>'Feature Flat Text', Helvetica, sans-serif</code>
<code>'Feature Flat Text', Helvetica, serif</code>
</td>

<td>
<div style="font-family: 'Feature Flat Text', Helvetica, sans-serif;">
<div style="font-family: 'Feature Flat Text', Helvetica, serif;">
The quick brown fox jumps over the lazy dog.
</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion packages/larva/build/tokens/rollingstone-2022.custom-properties.css
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions packages/larva/build/tokens/rollingstone-2022.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
"FONT_FAMILY_PRIMARY": "serif",
"FONT_FAMILY_SECONDARY_FANCY": "'Feature Flat Deck', serif",
"FONT_FAMILY_SECONDARY": "serif",
"FONT_FAMILY_BODY": "'Feature Flat Text', Helvetica, sans-serif",
"FONT_FAMILY_BASIC": "sans-serif",
"FONT_FAMILY_BODY": "'Feature Flat Text', Helvetica, serif",
"FONT_FAMILY_BASIC": "serif",
"FONT_WEIGHT_LIGHT": "300",
"FONT_WEIGHT_NORMAL": "400",
"FONT_WEIGHT_BOLD": "700",
Expand Down Expand Up @@ -514,6 +514,6 @@
"BODY_L_LINE_HEIGHT_MOBILE": "31px",
"FONT_FAMILY_ACCENT": "Verdana, serif",
"FONT_FAMILY_ACCENT_FANCY": "Verdana, sans-serif",
"FONT_FAMILY_BASIC_FANCY": "'Feature Flat Text', sans-serif",
"FONT_FAMILY_BODY_FANCY": "'Feature Flat Text', Helvetica, sans-serif"
"FONT_FAMILY_BASIC_FANCY": "'Feature Flat Text', serif",
"FONT_FAMILY_BODY_FANCY": "'Feature Flat Text', Helvetica, serif"
}
8 changes: 4 additions & 4 deletions packages/larva/build/tokens/rollingstone-2022.map.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ $rollingstone-2022-map: (
'font-family-secondary-fancy': ('Feature Flat Deck', serif),
/* Fallback for secondary-fancy */
'font-family-secondary': (serif),
'font-family-body': ('Feature Flat Text', Helvetica, sans-serif),
'font-family-basic': (sans-serif),
'font-family-body': ('Feature Flat Text', Helvetica, serif),
'font-family-basic': (serif),
'font-weight-light': (300),
'font-weight-normal': (400),
'font-weight-bold': (700),
Expand Down Expand Up @@ -529,6 +529,6 @@ $rollingstone-2022-map: (
'body-l-line-height-mobile': (31px),
'font-family-accent': (Verdana, serif),
'font-family-accent-fancy': (Verdana, sans-serif),
'font-family-basic-fancy': ('Feature Flat Text', sans-serif),
'font-family-body-fancy': ('Feature Flat Text', Helvetica, sans-serif),
'font-family-basic-fancy': ('Feature Flat Text', serif),
'font-family-body-fancy': ('Feature Flat Text', Helvetica, serif),
);
16 changes: 8 additions & 8 deletions packages/larva/build/tokens/rollingstone-2022.raw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,16 +512,16 @@
},
"FONT_FAMILY_BODY": {
"category": "font-family",
"value": "'Feature Flat Text', Helvetica, sans-serif",
"value": "'Feature Flat Text', Helvetica, serif",
"type": "font",
"originalValue": "'Feature Flat Text', Helvetica, sans-serif",
"originalValue": "'Feature Flat Text', Helvetica, serif",
"name": "FONT_FAMILY_BODY"
},
"FONT_FAMILY_BASIC": {
"category": "font-family",
"value": "sans-serif",
"value": "serif",
"type": "font-family",
"originalValue": "sans-serif",
"originalValue": "serif",
"name": "FONT_FAMILY_BASIC"
},
"FONT_WEIGHT_LIGHT": {
Expand Down Expand Up @@ -4015,16 +4015,16 @@
},
"FONT_FAMILY_BASIC_FANCY": {
"category": "font-family",
"value": "'Feature Flat Text', sans-serif",
"value": "'Feature Flat Text', serif",
"type": "font-family",
"originalValue": "'Feature Flat Text', sans-serif",
"originalValue": "'Feature Flat Text', serif",
"name": "FONT_FAMILY_BASIC_FANCY"
},
"FONT_FAMILY_BODY_FANCY": {
"category": "font-family",
"value": "'Feature Flat Text', Helvetica, sans-serif",
"value": "'Feature Flat Text', Helvetica, serif",
"type": "font",
"originalValue": "'Feature Flat Text', Helvetica, sans-serif",
"originalValue": "'Feature Flat Text', Helvetica, serif",
"name": "FONT_FAMILY_BODY_FANCY"
}
}
Expand Down
Loading