Skip to content

Commit

Permalink
Merge pull request #204 from rei/pr/pressura
Browse files Browse the repository at this point in the history
Pr/pressura
  • Loading branch information
mhewson authored Feb 10, 2025
2 parents c57fa20 + e4cd09b commit b26d381
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
12 changes: 12 additions & 0 deletions src/styles/cdr-fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,15 @@
font-weight: 1 999;
font-style: italic;
src: url("//www.rei.com/satchel/media/font-optimized/Graphik/GraphikWebItalic-VF-Web-Subset.woff2") format("woff2-variations"), url("//www.rei.com/satchel/media/font-optimized/Graphik/GraphikWebItalic-VF-Web-Subset.woff2") format("woff2"); }

@font-face {
font-display: swap;
font-family: Pressura;
font-weight: 400; /* Regular weight */
src: url("//www.rei.com/satchel/media/font/Pressura/gt-pressura-mono-regular.woff2") format("woff2"), url("//www.rei.com/satchel/media/font/Pressura/gt-pressura-mono-regular.woff") format("woff"); }

@font-face {
font-display: swap;
font-family: Pressura;
font-weight: 700;
src: url("//www.rei.com/satchel/media/font/Pressura/gt-pressura-mono-bold.woff2") format("woff2"), url("//www.rei.com/satchel/media/font/Pressura/gt-pressura-mono-bold.woff") format("woff"); }
12 changes: 6 additions & 6 deletions src/styles/cdr-palette.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
--cdr-color-text-button-primary-hover: var(--cdr-membership-subtle-color-text-button-primary-hover, #{$cdr-membership-subtle-color-text-button-primary-hover});
--cdr-color-background-button-primary-rest: var(--cdr-membership-subtle-color-background-button-primary-rest, #{$cdr-membership-subtle-color-background-button-primary-rest});
--cdr-color-background-button-primary-active: var(--cdr-membership-subtle-color-background-button-primary-active, #{$cdr-membership-subtle-color-background-button-primary-active});
--cdr-color-text-link-rest: var( --cdr-membership-subtle-color-text-link-rest, #{$cdr-membership-subtle-color-text-link-rest});
--cdr-color-text-link-hover: var( --cdr-membership-subtle-color-text-link-hover, #{$cdr-membership-subtle-color-text-link-hover});
--cdr-color-text-link-visited: var( --cdr-membership-subtle-color-text-link-visited, #{$cdr-membership-subtle-color-text-link-visited});
--cdr-color-text-link-rest: var(--cdr-membership-subtle-color-text-link-rest, #{$cdr-membership-subtle-color-text-link-rest});
--cdr-color-text-link-hover: var(--cdr-membership-subtle-color-text-link-hover, #{$cdr-membership-subtle-color-text-link-hover});
--cdr-color-text-link-visited: var(--cdr-membership-subtle-color-text-link-visited, #{$cdr-membership-subtle-color-text-link-visited});
}

[data-palette='membership-vibrant'] {
Expand All @@ -41,8 +41,8 @@
--cdr-color-text-button-primary-hover: var(--cdr-membership-vibrant-color-text-button-primary-hover, #{$cdr-membership-vibrant-color-text-button-primary-hover});
--cdr-color-background-button-primary-rest: var(--cdr-membership-vibrant-color-background-button-primary-rest, #{$cdr-membership-vibrant-color-background-button-primary-rest});
--cdr-color-background-button-primary-active: var(--cdr-membership-vibrant-color-background-button-primary-active, #{$cdr-membership-vibrant-color-background-button-primary-active});
--cdr-color-text-link-rest: var( --cdr-membership-subtle-color-text-link-rest, #{$cdr-membership-subtle-color-text-link-rest});
--cdr-color-text-link-hover: var( --cdr-membership-subtle-color-text-link-hover, #{$cdr-membership-subtle-color-text-link-hover});
--cdr-color-text-link-visited: var( --cdr-membership-subtle-color-text-link-visited, #{$cdr-membership-subtle-color-text-link-visited});
--cdr-color-text-link-rest: var(--cdr-membership-subtle-color-text-link-rest, #{$cdr-membership-subtle-color-text-link-rest});
--cdr-color-text-link-hover: var(--cdr-membership-subtle-color-text-link-hover, #{$cdr-membership-subtle-color-text-link-hover});
--cdr-color-text-link-visited: var(--cdr-membership-subtle-color-text-link-visited, #{$cdr-membership-subtle-color-text-link-visited});
}

2 changes: 1 addition & 1 deletion src/styles/cdr-reset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ body {

/* cdr-color-text-primary */

color: rgba(12, 11, 8, 0.75);
color: var(--cdr-color-text-primary), rgba(12, 11, 8, 0.75);

/* cdr-color-background-primary */

Expand Down

0 comments on commit b26d381

Please # to comment.