Skip to content

Draft PR for discussion: transition to CSS varaibles only for type #1044

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
stephaniehobson wants to merge 1 commit into from
Closed

Draft PR for discussion: transition to CSS varaibles only for type #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# HEAD

* Dropped support for font-sizes in pixels, all font-sizes are in rem now.
* Removed `text-display-*` mixins. See migration notes for version 11.0.2.

# 22.0.0

## Features
Expand Down Expand Up @@ -199,8 +204,8 @@ stating variables explicitly, like this:

@supports (--css: variables) {
background-color: var(--background-color-inverse);
color: var(--body-text-color-inverse);
line-height: var(--body-line-height);
color: var(--token-body-text-color-inverse);
line-height: var(--token-body-line-height);
}
}
```
Expand Down
6 changes: 1 addition & 5 deletions assets/sass/protocol/base/elements/_document.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,12 @@ body {
@include text-body-md;
background: $background-color;
color: $body-text-color;
font-family: $body-font-family;
line-height: $body-line-height;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;

@supports (--css: variable) {
background: var(--background-color);
color: var(--body-text-color);
font-family: var(--body-font-family);
line-height: var(--body-line-height);
color: var(--token-body-text-color);
}
}

Expand Down
6 changes: 1 addition & 5 deletions assets/sass/protocol/base/elements/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,9 @@ legend {
@include forms.field-label;
}
@include text-body-lg;
font-family: $body-font-family;
font-family: var(--token-body-font-family);
font-weight: bold;
margin-bottom: forms.$field-v-spacing;

@supports (--css: variables) {
font-family: var(--body-font-family);
}
}

button,
Expand Down
21 changes: 1 addition & 20 deletions assets/sass/protocol/base/elements/_links.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,9 @@ a {
}

.mzp-c-cta-link {
font-family: $button-font-family;
font-family: var(--button-font-family);
font-weight: bold;

@supports (--css: variables) {
font-family: var(--button-font-family);
}

&.mzp-t-xs {
@include text-body-sm;
}
Expand All @@ -69,29 +65,14 @@ a {

&.mzp-t-lg {
@include text-title-xs;
font-family: $title-font-family;

@supports (--css: variables) {
font-family: var(--title-font-family);
}
}

&.mzp-t-xl {
@include text-title-sm;
font-family: $title-font-family;

@supports (--css: variables) {
font-family: var(--title-font-family);
}
}

&.mzp-t-2xl {
@include text-title-lg;
font-family: $title-font-family;

@supports (--css: variables) {
font-family: var(--title-font-family);
}
}

// Icon support
Expand Down
6 changes: 2 additions & 4 deletions assets/sass/protocol/base/elements/_quotes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ blockquote {
border-color: $color-marketing-gray-20;
border-style: solid;
color: $title-text-color;
font-family: $title-font-family;
font-weight: bold;
margin: $spacing-lg auto;
padding: $spacing-sm $spacing-lg;
Expand All @@ -29,11 +28,10 @@ blockquote {
}

@supports (--css: variables) {
color: var(--title-text-color);
font-family: var(--title-font-family);
color: var(--token-title-text-color);

cite {
color: var(--body-text-color-secondary);
color: var(--token-body-text-color-secondary);
}
}
}
13 changes: 4 additions & 9 deletions assets/sass/protocol/base/elements/_titles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ h3,
h4,
h5,
h6 {
$default-font-weight: bold;
font-family: $title-font-family;
font-family: var(--token-title-font-family);
font-variant-ligatures: var(--token-title-font-ligatures);
color: $title-text-color;
font-weight: $default-font-weight;
text-wrap: balance;
margin: 0 0 0.5em;

Expand All @@ -24,14 +23,10 @@ h6 {
}

@supports (--css: variables) {
font-family: var(--title-font-family);
font-variant-ligatures: var(--title-font-ligatures);
font-weight: var(--title-font-weight, #{$default-font-weight});
letter-spacing: var(--title-letter-spacing);
color: var(--title-text-color);
color: var(--token-title-text-color);

.mzp-t-dark & {
color: var(--title-text-color-inverse);
color: var(--token-title-text-color-inverse);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion assets/sass/protocol/base/utilities/_backgrounds.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

@supports (--css: variables) {
background-color: var(--background-color-inverse);
color: var(--body-text-color-inverse);
color: var(--token-body-text-color-inverse);
}
}

Expand Down
2 changes: 1 addition & 1 deletion assets/sass/protocol/base/utilities/_rich-text.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

h4 {
@include text-body-lg;
font-family: var(--body-font-family);
font-family: var(--token-body-font-family);
margin-bottom: $layout-xs;
margin-top: $layout-xs;
}
Expand Down
40 changes: 0 additions & 40 deletions assets/sass/protocol/base/utilities/_titles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,74 +9,34 @@

.mzp-u-title-2xl {
@include text-title-2xl;
font-family: $title-font-family;

@supports (--css: variables) {
font-family: var(--title-font-family);
}
}

.mzp-u-title-xl {
@include text-title-xl;
font-family: $title-font-family;

@supports (--css: variables) {
font-family: var(--title-font-family);
}
}

.mzp-u-title-lg {
@include text-title-lg;
font-family: $title-font-family;

@supports (--css: variables) {
font-family: var(--title-font-family);
}
}

.mzp-u-title-md {
@include text-title-md;
font-family: $title-font-family;

@supports (--css: variables) {
font-family: var(--title-font-family);
}
}

.mzp-u-title-sm {
@include text-title-sm;
font-family: $title-font-family;

@supports (--css: variables) {
font-family: var(--title-font-family);
}
}

.mzp-u-title-xs {
@include text-title-xs;
font-family: $title-font-family;

@supports (--css: variables) {
font-family: var(--title-font-family);
}
}

.mzp-u-title-2xs {
@include text-title-2xs;
font-family: $title-font-family;

@supports (--css: variables) {
font-family: var(--title-font-family);
}
}

.mzp-u-title-3xs {
@include text-title-3xs;
font-family: $title-font-family;

@supports (--css: variables) {
font-family: var(--title-font-family);
}
}

// Utility class for centered text.
Expand Down
4 changes: 2 additions & 2 deletions assets/sass/protocol/components/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
border: 2px solid transparent;
cursor: pointer;
display: inline-block;
font-family: $button-font-family;
font-family: var(--button-font-family);
font-weight: bold;
line-height: $body-line-height;
padding: $spacing-sm $spacing-md;
Expand Down Expand Up @@ -44,7 +44,7 @@

@supports (--css: variables) {
font-family: var(--button-font-family);
line-height: var(--body-line-height);
line-height: var(--token-body-line-height);
}
}

Expand Down
8 changes: 4 additions & 4 deletions assets/sass/protocol/components/_card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,18 +158,18 @@

@supports (--css: variables) {
background-color: var(--background-color-inverse);
color: var(--body-text-color-inverse);
color: var(--token-body-text-color-inverse);

.mzp-c-card-tag,
.mzp-c-card-meta {
color: var(--body-text-color-inverse);
color: var(--token-body-text-color-inverse);
}

.mzp-c-card-block-link {
color: var(--body-text-color-inverse);
color: var(--token-body-text-color-inverse);

.mzp-c-card-cta-text {
color: var(--body-text-color-inverse);
color: var(--token-body-text-color-inverse);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion assets/sass/protocol/components/_emphasis-box.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

&.mzp-t-dark {
background-color: var(--background-color-inverse);
color: var(--body-text-color-inverse);
color: var(--token-body-text-color-inverse);
}
}
}
4 changes: 2 additions & 2 deletions assets/sass/protocol/components/_feature-card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@
}

@supports (--css: variables) {
color: var(--body-text-color-inverse);
color: var(--token-body-text-color-inverse);

.mzp-c-card-feature-desc {
color: var(--body-text-color-secondary-inverse);
color: var(--token-body-text-color-secondary-inverse);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion assets/sass/protocol/components/_menu-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}

.mzp-c-menu-list-title {
font-family: $button-font-family;
font-family: var(--button-font-family);
font-size: inherit;
font-weight: bold;

Expand Down
4 changes: 2 additions & 2 deletions assets/sass/protocol/components/_sticky-promo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ $logos: (

@supports (--css: variables) {
background-color: var(--background-color-inverse);
color: var(--body-text-color-inverse);
color: var(--token-body-text-color-inverse);
}
}

Expand All @@ -92,7 +92,7 @@ $logos: (
}

.mzp-c-sticky-promo-title {
@include text-display-xs;
@include text-title-xs;
margin-bottom: $spacing-xl;
}

Expand Down
11 changes: 4 additions & 7 deletions assets/sass/protocol/components/forms/_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
}

@supports (--css: variables) {
color: var(--body-text-color-secondary);
color: var(--token-body-text-color-secondary);

&.mzp-t-dark,
.mzp-t-dark & {
color: var(--body-text-color-secondary-inverse);
color: var(--token-body-text-color-secondary-inverse);
}
}

Expand Down Expand Up @@ -68,8 +68,6 @@
legend.mzp-c-form-title {
@include text-title-xs;
color: $title-text-color;
font-family: $title-font-family;
font-weight: bold;
margin: 0 0 $spacing-lg;

.mzp-c-form-header > & {
Expand All @@ -81,11 +79,10 @@ legend.mzp-c-form-title {
}

@supports (--css: variables) {
color: var(--title-text-color);
font-family: var(--title-font-family);
color: var(--token-title-text-color);

.mzp-t-dark & {
color: var(--title-text-color-inverse);
color: var(--token-title-text-color-inverse);
}
}
}
Expand Down
Loading
Loading