From 28ac7a958978a75ab1f7aedaafd5a577f71ab34b Mon Sep 17 00:00:00 2001 From: Casey Carroll Date: Wed, 21 Feb 2024 14:36:47 -0800 Subject: [PATCH 1/9] perf(cdr-fonts.css): leverage font-face descriptors to reduce CLS when web fonts swap from fallback This change reduces the layout shift impact of font-display: swap. Font-face descriptors allow us to resize the fallback font to closely match the brand font that replaces it. This will improve the page loading experience for cold-cache visitors of REI.com. --- public/cdr-fonts.css | 18 ++++++++++++++++++ public/cdr-reset.css | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/public/cdr-fonts.css b/public/cdr-fonts.css index c4b9ffa55..ed1522c2e 100644 --- a/public/cdr-fonts.css +++ b/public/cdr-fonts.css @@ -4,6 +4,15 @@ font-weight: 1 999; src: url("//www.rei.com/satchel/media/font-optimized/Stuart/REIStuart-VF-Web-Subset.woff2") format("woff2-variations"), url("//www.rei.com/satchel/media/font-optimized/Stuart/REIStuart-VF-Web-Subset.woff2") format("woff2"); } +@font-face { + font-family: "Stuart fallback"; + src: local("Georgia"); + size-adjust: 102.9695%; + ascent-override: 95.1738%; + descent-override: 20.5886%; + line-gap-override: 0%; +} + @font-face { font-display: swap; font-family: Stuart; @@ -17,6 +26,15 @@ font-weight: 1 999; src: url("//www.rei.com/satchel/media/font-optimized/Graphik/Graphik-VF-Web-Subset.woff2") format("woff2-variations"), url("//www.rei.com/satchel/media/font-optimized/Graphik/Graphik-VF-Web-Subset.woff2") format("woff2"); } +@font-face { + font-family: "Graphik fallback"; + src: local("Helvetica Neue"); + size-adjust: 104.9217%; + ascent-override: 93.4983%; + descent-override: 18.5853%; + line-gap-override: 0%; +} + @font-face { font-display: swap; font-family: Graphik; diff --git a/public/cdr-reset.css b/public/cdr-reset.css index fbce2b315..737bc8e8e 100644 --- a/public/cdr-reset.css +++ b/public/cdr-reset.css @@ -25,7 +25,7 @@ html { body { /* cdr-text-default */ - font-family: Graphik, "Helvetica Neue", sans-serif; + font-family: Graphik, "Graphik fallback", "Helvetica Neue", sans-serif; font-style: normal; font-weight: 400; letter-spacing: -0.16px; From 288f1aa851a11cbfca5292c6572a7eb5b60f98d7 Mon Sep 17 00:00:00 2001 From: Michael Hewson Date: Wed, 19 Jun 2024 22:14:19 -0700 Subject: [PATCH 2/9] V1 fluid space variables --- src/components/examples.js | 2 + src/dev/router.js | 1 + src/styles/settings/examples/utility.vue | 392 +++++++++++++++++++++++ src/styles/settings/fluid.vars.scss | 71 +++- 4 files changed, 450 insertions(+), 16 deletions(-) create mode 100644 src/styles/settings/examples/utility.vue diff --git a/src/components/examples.js b/src/components/examples.js index 670aaa351..b4f874f02 100644 --- a/src/components/examples.js +++ b/src/components/examples.js @@ -37,6 +37,7 @@ import toast from 'componentsdir/toast/examples/Toast.vue'; import toggleButton from 'componentsdir/toggleButton/examples/ToggleButton.vue'; import cdrSwitch from 'componentsdir/switch/examples/Switch.vue'; // Can't name it switch because it's a JS keyword import tooltip from 'componentsdir/tooltip/examples/Tooltip.vue'; +import utility from '../styles/settings/examples/utility.vue'; export default { abstract, @@ -78,4 +79,5 @@ export default { toggleButton, cdrSwitch, tooltip, + utility, }; diff --git a/src/dev/router.js b/src/dev/router.js index 3d28e73aa..3b0fc44e6 100644 --- a/src/dev/router.js +++ b/src/dev/router.js @@ -60,6 +60,7 @@ const routes = [ { path: '/toggleButton', name: 'ToggleButton', component: Examples.toggleButton }, { path: '/switch', name: 'Switch', component: Examples.cdrSwitch }, { path: '/tooltip', name: 'Tooltip', component: Examples.tooltip }, + { path: '/utility', name: 'Utility', component: Examples.utility }, // Nightwatch test targets { path: '/e2e-1', component: e2e1 }, diff --git a/src/styles/settings/examples/utility.vue b/src/styles/settings/examples/utility.vue new file mode 100644 index 000000000..584cd2b34 --- /dev/null +++ b/src/styles/settings/examples/utility.vue @@ -0,0 +1,392 @@ + + + + diff --git a/src/styles/settings/fluid.vars.scss b/src/styles/settings/fluid.vars.scss index fe766d5cf..cafe639f0 100644 --- a/src/styles/settings/fluid.vars.scss +++ b/src/styles/settings/fluid.vars.scss @@ -1,5 +1,8 @@ - +// type /* https://www.fluid-type-scale.com/calculate?minFontSize=16&minWidth=320&minRatio=1.20&maxFontSize=20&maxWidth=1232&maxRatio=1.25&steps=-1%2C0%2C1%2C2%2C3%2C4%2C5%2C6%2C7&baseStep=0&prefix=cdr-type-scale&decimals=2&useRems=on&remValue=10&previewFont=Inter&previewText=Almost+before+we+knew+it%2C+we+had+left+the+ground&previewWidth=1247 */ +// space +/* @link https://utopia.fyi/space/calculator?c=320,16,1.2,1232,20,1.25,7,1,&s=0.75|0.5|0.25|0.2|0.15|0.25|0.2,1.5|2|3|4|6,s-l&g=s,l,xl,12 */ +/* TODO our rem is still base 10 set via reset font-size: 62.5%; at some point this should be removed and rem values recaculated */ :root { --cdr-heading-display-line-height-ratio: 1.07; @@ -12,9 +15,13 @@ --cdr-body-line-height-ratio: 1.8; } +// the clamp is comprized of 3 numbers representing the min value, the preferred size expression, and the max value +// in order the valuse are: min spacing | base spacing + container-growth | max spacing + @supports(container-type: inline-size) { :root { - --cdr-type-scale--1: clamp(1.33rem, 0.29cqw + 1.24rem, 1.6rem); + // type + --cdr-type-scale-xs: clamp(1.33rem, 0.29cqw + 1.24rem, 1.6rem); --cdr-type-scale-0: clamp(1.6rem, 0.44cqw + 1.46rem, 2rem); --cdr-type-scale-1: clamp(1.92rem, 0.64cqw + 1.72rem, 2.5rem); --cdr-type-scale-2: clamp(2.3rem, 0.9cqw + 2.02rem, 3.13rem); @@ -23,19 +30,51 @@ --cdr-type-scale-5: clamp(3.98rem, 2.33cqw + 3.24rem, 6.1rem); --cdr-type-scale-6: clamp(4.78rem, 3.13cqw + 3.78rem, 7.63rem); --cdr-type-scale-7: clamp(5.73rem, 4.17cqw + 4.4rem, 9.54rem); + + // space + --cdr-space-scale-0: clamp(0.2rem, 0.2rem + 0.11cqi, 0.3rem); + --cdr-space-scale-1: clamp(0.3rem, 0.3rem + 0.11cqi, 0.4rem); + --cdr-space-scale-2: clamp(0.4rem, 0.4rem + 0.11cqi, 0.5rem); + --cdr-space-scale-3: clamp(0.8rem, 0.7rem + 0.22cqi, 1rem); + --cdr-space-scale-4: clamp(1.2rem, 1.1rem + 0.33cqi, 1.5rem); + --cdr-space-scale-5: clamp(1.6rem, 1.5rem + 0.44cqi, 2rem); + --cdr-space-scale-6: clamp(2.4rem, 2.2rem + 0.66cqi, 3rem); + --cdr-space-scale-7: clamp(3.2rem, 2.9rem + 0.88cqi, 4rem); + --cdr-space-scale-8: clamp(4.8rem, 4.4rem + 1.31cqi, 6rem); + /* One-up pairs */ + --cdr-space-scale-0--1: clamp(0.2rem, 0.1rem + 0.223cqi, 0.4rem); + --cdr-space-scale-3--4: clamp(0.4rem, 0.2rem + 0.66cqi, 1rem); + --cdr-space-scale-3--5: clamp(0.8rem, 0.1404px + 1.21cqi, 1.6rem); + + + } -} -/** Remove once Safari < 16 is no longer a target */ -@supports not (container-type: inline-size) { - :root { - --cdr-type-scale--1: clamp(1.33rem, 0.29vw + 1.24rem, 1.6rem); - --cdr-type-scale-0: clamp(1.6rem, 0.44vw + 1.46rem, 2rem); - --cdr-type-scale-1: clamp(1.92rem, 0.64vw + 1.72rem, 2.5rem); - --cdr-type-scale-2: clamp(2.3rem, 0.9vw + 2.02rem, 3.13rem); - --cdr-type-scale-3: clamp(2.76rem, 1.25vw + 2.36rem, 3.91rem); - --cdr-type-scale-4: clamp(3.32rem, 1.72vw + 2.77rem, 4.88rem); - --cdr-type-scale-5: clamp(3.98rem, 2.33vw + 3.24rem, 6.1rem); - --cdr-type-scale-6: clamp(4.78rem, 3.13vw + 3.78rem, 7.63rem); - --cdr-type-scale-7: clamp(5.73rem, 4.17vw + 4.4rem, 9.54rem); + /** Remove once Safari < 16 is no longer a target */ + @supports not (container-type: inline-size) { + :root { + --cdr-type-scale--1: clamp(1.33rem, 0.29vw + 1.24rem, 1.6rem); + --cdr-type-scale-0: clamp(1.6rem, 0.44vw + 1.46rem, 2rem); + --cdr-type-scale-1: clamp(1.92rem, 0.64vw + 1.72rem, 2.5rem); + --cdr-type-scale-2: clamp(2.3rem, 0.9vw + 2.02rem, 3.2rem); + --cdr-type-scale-3: clamp(2.76rem, 1.25vw + 2.36rem, 3.91rem); + --cdr-type-scale-4: clamp(3.32rem, 1.72vw + 2.77rem, 4.88rem); + --cdr-type-scale-5: clamp(3.98rem, 2.33vw + 3.24rem, 6.1rem); + --cdr-type-scale-6: clamp(4.78rem, 3.13vw + 3.78rem, 7.63rem); + --cdr-type-scale-7: clamp(5.73rem, 4.17vw + 4.4rem, 9.54rem); + // space + --cdr-space-scale-0: clamp(0.2rem, 0.2rem + 0.11vw, 0.3rem); + --cdr-space-scale-1: clamp(0.3rem, 0.3rem + 0.11vw, 0.4rem); + --cdr-space-scale-2: clamp(0.4rem, 0.4rem + 0.11vw, 0.5rem); + --cdr-space-scale-3: clamp(0.8rem, 0.7rem + 0.22vw, 1rem); + --cdr-space-scale-4: clamp(1.2rem, 1.1rem + 0.33vw, 1.5rem); + --cdr-space-scale-5: clamp(1.6rem, 1.5rem + 0.44vw, 2rem); + --cdr-space-scale-6: clamp(2.4rem, 2.2rem + 0.66vw, 3rem); + --cdr-space-scale-7: clamp(3.2rem, 2.9rem + 0.88vw, 4rem); + --cdr-space-scale-8: clamp(4.8rem, 4.4rem + 1.31vw, 6rem); + /* One-up pairs */ + --cdr-space-scale-0--1: clamp(0.2rem, 0.1rem + 0.223vw, 0.4rem); + --cdr-space-scale-3--4: clamp(0.4rem, 0.2rem + 0.66vw, 1rem); + --cdr-space-scale-3--5: clamp(0.8rem, 0.1404px + 1.21vw, 1.6rem); + } } -} \ No newline at end of file +} From 1e448261f0ebfb39114f57b96b444f37bc668c3a Mon Sep 17 00:00:00 2001 From: Michael Hewson Date: Wed, 19 Jun 2024 22:25:26 -0700 Subject: [PATCH 3/9] reverting type value change --- src/styles/settings/fluid.vars.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/settings/fluid.vars.scss b/src/styles/settings/fluid.vars.scss index cafe639f0..eb583d497 100644 --- a/src/styles/settings/fluid.vars.scss +++ b/src/styles/settings/fluid.vars.scss @@ -21,7 +21,7 @@ @supports(container-type: inline-size) { :root { // type - --cdr-type-scale-xs: clamp(1.33rem, 0.29cqw + 1.24rem, 1.6rem); + --cdr-type-scale--1: clamp(1.33rem, 0.29cqw + 1.24rem, 1.6rem); --cdr-type-scale-0: clamp(1.6rem, 0.44cqw + 1.46rem, 2rem); --cdr-type-scale-1: clamp(1.92rem, 0.64cqw + 1.72rem, 2.5rem); --cdr-type-scale-2: clamp(2.3rem, 0.9cqw + 2.02rem, 3.13rem); From 0e1d5c5f7dc27d6339cdfee1b7b4162be2ac9ab0 Mon Sep 17 00:00:00 2001 From: Michael Hewson Date: Wed, 19 Jun 2024 22:26:40 -0700 Subject: [PATCH 4/9] reverting type value change --- src/styles/settings/examples/utility.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/settings/examples/utility.vue b/src/styles/settings/examples/utility.vue index 584cd2b34..5ac3663cb 100644 --- a/src/styles/settings/examples/utility.vue +++ b/src/styles/settings/examples/utility.vue @@ -64,7 +64,7 @@ prompt="Choose one" @select-change="doExternal" > - + @@ -301,7 +301,7 @@ export default { .space { grid-template-rows: 28px auto; - font-size: var(--cdr-type-scale-xs); + font-size: var(--cdr-type-scale--1); display: grid; grid-gap: 0; min-width: 40px; From e44c791db0d1c56ceb5bb9fbba13e48d593b1d44 Mon Sep 17 00:00:00 2001 From: David Sinclair Date: Thu, 20 Jun 2024 15:17:07 -0700 Subject: [PATCH 5/9] perf(cdr-fonts.css): low-CLS fallback --- package-lock.json | 13 ++++++------- package.json | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index e8ac7d729..47c6aced4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "devDependencies": { "@babel/preset-env": "^7.18.2", "@emotion/is-prop-valid": "^1.2.1", - "@rei/cdr-tokens": "^12.1.0", + "@rei/cdr-tokens": "github:rei/rei-cedar-tokens#low-cls-font-fallback", "@rei/cedar-icons": "^2.6.1", "@rollup/plugin-babel": "^6.0.3", "@types/tabbable": "^3.1.2", @@ -3023,9 +3023,9 @@ }, "node_modules/@rei/cdr-tokens": { "version": "12.1.0", - "resolved": "https://registry.npmjs.org/@rei/cdr-tokens/-/cdr-tokens-12.1.0.tgz", - "integrity": "sha512-MZPQpS+x6k9kZtIIV/KDY30NdF+td3xjAk6mxO3v/coFoe93UGmPYQlea959uy/tK2z6Ju0SjQCy3E9A4qKu7w==", + "resolved": "git+ssh://git@github.com/rei/rei-cedar-tokens.git#3ca6f6d06efaec57c59f82321bef1853cd466821", "dev": true, + "license": "ISC", "engines": { "node": ">= 8.0.0", "npm": ">= 6.0.0" @@ -16476,10 +16476,9 @@ "optional": true }, "@rei/cdr-tokens": { - "version": "12.1.0", - "resolved": "https://registry.npmjs.org/@rei/cdr-tokens/-/cdr-tokens-12.1.0.tgz", - "integrity": "sha512-MZPQpS+x6k9kZtIIV/KDY30NdF+td3xjAk6mxO3v/coFoe93UGmPYQlea959uy/tK2z6Ju0SjQCy3E9A4qKu7w==", - "dev": true + "version": "git+ssh://git@github.com/rei/rei-cedar-tokens.git#3ca6f6d06efaec57c59f82321bef1853cd466821", + "dev": true, + "from": "@rei/cdr-tokens@github:rei/rei-cedar-tokens#low-cls-font-fallback" }, "@rei/cedar-icons": { "version": "2.6.1", diff --git a/package.json b/package.json index e266323ac..1a65387db 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "devDependencies": { "@babel/preset-env": "^7.18.2", "@emotion/is-prop-valid": "^1.2.1", - "@rei/cdr-tokens": "^12.1.0", + "@rei/cdr-tokens": "github:rei/rei-cedar-tokens#low-cls-font-fallback", "@rei/cedar-icons": "^2.6.1", "@rollup/plugin-babel": "^6.0.3", "@types/tabbable": "^3.1.2", From 5ffe9484286fd5514841321335c3621ea7414932 Mon Sep 17 00:00:00 2001 From: Michael Hewson Date: Tue, 25 Jun 2024 11:26:46 -0700 Subject: [PATCH 6/9] placing the browserTargest from the update-browsers PR into this branch --- browserTargets.mjs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/browserTargets.mjs b/browserTargets.mjs index d41a06723..e9e194f55 100644 --- a/browserTargets.mjs +++ b/browserTargets.mjs @@ -1,7 +1,7 @@ export default [ - 'Chrome >= 109', - 'Firefox >= 108', - 'iOS >= 15', - 'Safari >= 15', - 'Edge >= 115', -]; + 'Chrome >= 111', + 'Firefox >= 121', + 'iOS >= 15.6', + 'Safari >= 15.6', + 'Edge >= 120', +]; \ No newline at end of file From 2a22d4c9ba4aa17fe7045ce2c4c46dba62dd5855 Mon Sep 17 00:00:00 2001 From: Michael Hewson Date: Wed, 26 Jun 2024 12:07:38 -0700 Subject: [PATCH 7/9] bumping REI-Cedar-Tokens https://github.com/rei/rei-cedar-tokens/releases/tag/v12.2.0 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8bafaa9a0..5f6261eca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "devDependencies": { "@babel/preset-env": "^7.18.2", "@emotion/is-prop-valid": "^1.2.1", - "@rei/cdr-tokens": "^12.1.0", + "@rei/cdr-tokens": "^12.2.0", "@rei/cedar-icons": "^2.6.1", "@rollup/plugin-babel": "^6.0.3", "@types/tabbable": "^3.1.2", @@ -3022,9 +3022,9 @@ } }, "node_modules/@rei/cdr-tokens": { - "version": "12.1.0", - "resolved": "https://registry.npmjs.org/@rei/cdr-tokens/-/cdr-tokens-12.1.0.tgz", - "integrity": "sha512-MZPQpS+x6k9kZtIIV/KDY30NdF+td3xjAk6mxO3v/coFoe93UGmPYQlea959uy/tK2z6Ju0SjQCy3E9A4qKu7w==", + "version": "12.2.0", + "resolved": "https://registry.npmjs.org/@rei/cdr-tokens/-/cdr-tokens-12.2.0.tgz", + "integrity": "sha512-FV8y2pJ/+stfjOAMVg91tOeDd1tP3xM9yn6TDvReVKE8DNGAnKYsLVYe6A+AVrlD9kf7syfoU18o4uG60zRimA==", "dev": true, "engines": { "node": ">= 8.0.0", @@ -16775,9 +16775,9 @@ "optional": true }, "@rei/cdr-tokens": { - "version": "12.1.0", - "resolved": "https://registry.npmjs.org/@rei/cdr-tokens/-/cdr-tokens-12.1.0.tgz", - "integrity": "sha512-MZPQpS+x6k9kZtIIV/KDY30NdF+td3xjAk6mxO3v/coFoe93UGmPYQlea959uy/tK2z6Ju0SjQCy3E9A4qKu7w==", + "version": "12.2.0", + "resolved": "https://registry.npmjs.org/@rei/cdr-tokens/-/cdr-tokens-12.2.0.tgz", + "integrity": "sha512-FV8y2pJ/+stfjOAMVg91tOeDd1tP3xM9yn6TDvReVKE8DNGAnKYsLVYe6A+AVrlD9kf7syfoU18o4uG60zRimA==", "dev": true }, "@rei/cedar-icons": { diff --git a/package.json b/package.json index 8d3e28328..aadd0d65a 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "devDependencies": { "@babel/preset-env": "^7.18.2", "@emotion/is-prop-valid": "^1.2.1", - "@rei/cdr-tokens": "^12.1.0", + "@rei/cdr-tokens": "^12.2.0", "@rei/cedar-icons": "^2.6.1", "@rollup/plugin-babel": "^6.0.3", "@types/tabbable": "^3.1.2", From 14572b09c8e8bb07be25079ded4c73327d228f8f Mon Sep 17 00:00:00 2001 From: Michael Hewson Date: Wed, 26 Jun 2024 12:41:52 -0700 Subject: [PATCH 8/9] bump to chromedriver version --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5f6261eca..b84402a15 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "autoprefixer": "^10.2.5", "c8": "^7.11.0", "chalk": "^4.1.0", - "chromedriver": "^122", + "chromedriver": "^126.0.4", "concat": "^1.0.3", "cross-env": "^7.0.3", "cz-conventional-changelog": "^3.3.0", @@ -5238,9 +5238,9 @@ } }, "node_modules/chromedriver": { - "version": "122.0.4", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-122.0.4.tgz", - "integrity": "sha512-MxkaWaxCqefHyh9UorGzl1F6ZNBgC7pqgT0piAysLZdw20ojSgJ62ljG8SFbhDJqBTegKbmuioa6MQ1m4Czdsg==", + "version": "126.0.4", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-126.0.4.tgz", + "integrity": "sha512-mIdJqdocfN/y9fl5BymIzM9WQLy64x078i5tS1jGFzbFAwXwXrj3zmA86Wf3R/hywPYpWqwXxFGBJHgqZTuGCA==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -18387,9 +18387,9 @@ } }, "chromedriver": { - "version": "122.0.4", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-122.0.4.tgz", - "integrity": "sha512-MxkaWaxCqefHyh9UorGzl1F6ZNBgC7pqgT0piAysLZdw20ojSgJ62ljG8SFbhDJqBTegKbmuioa6MQ1m4Czdsg==", + "version": "126.0.4", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-126.0.4.tgz", + "integrity": "sha512-mIdJqdocfN/y9fl5BymIzM9WQLy64x078i5tS1jGFzbFAwXwXrj3zmA86Wf3R/hywPYpWqwXxFGBJHgqZTuGCA==", "dev": true, "requires": { "@testim/chrome-version": "^1.1.4", diff --git a/package.json b/package.json index aadd0d65a..da0986165 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "autoprefixer": "^10.2.5", "c8": "^7.11.0", "chalk": "^4.1.0", - "chromedriver": "^122", + "chromedriver": "^126.0.4", "concat": "^1.0.3", "cross-env": "^7.0.3", "cz-conventional-changelog": "^3.3.0", From 35e249aebd49eeac6476a742bf2cf86c10f1d4ad Mon Sep 17 00:00:00 2001 From: Casey Carroll Date: Thu, 27 Jun 2024 15:24:18 -0700 Subject: [PATCH 9/9] adjustments after manual testing in climber site --- public/cdr-fonts.css | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/public/cdr-fonts.css b/public/cdr-fonts.css index ed1522c2e..5fa6d9b8e 100644 --- a/public/cdr-fonts.css +++ b/public/cdr-fonts.css @@ -7,10 +7,7 @@ @font-face { font-family: "Stuart fallback"; src: local("Georgia"); - size-adjust: 102.9695%; - ascent-override: 95.1738%; - descent-override: 20.5886%; - line-gap-override: 0%; + size-adjust: 106% } @font-face { @@ -28,11 +25,8 @@ @font-face { font-family: "Graphik fallback"; - src: local("Helvetica Neue"); - size-adjust: 104.9217%; - ascent-override: 93.4983%; - descent-override: 18.5853%; - line-gap-override: 0%; + src: local("Verdana"); + size-adjust: 92%; } @font-face {