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

V15.1 #185

Merged
merged 12 commits into from
Jul 2, 2024
Merged

V15.1 #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
28ac7a9
perf(cdr-fonts.css): leverage font-face descriptors to reduce CLS whe…
caseycarroll Feb 21, 2024
288f1aa
V1 fluid space variables
mhewson Jun 20, 2024
1e44826
reverting type value change
mhewson Jun 20, 2024
0e1d5c5
reverting type value change
mhewson Jun 20, 2024
e44c791
perf(cdr-fonts.css): low-CLS fallback
sikhote Jun 20, 2024
5ffe948
placing the browserTargest from the update-browsers PR into this branch
mhewson Jun 25, 2024
8d7669b
Merge pull request #184 from rei/fluid-space
mhewson Jun 26, 2024
2a22d4c
bumping REI-Cedar-Tokens https://github.com/rei/rei-cedar-tokens/rele…
mhewson Jun 26, 2024
14572b0
bump to chromedriver version
mhewson Jun 26, 2024
35e249a
adjustments after manual testing in climber site
caseycarroll Jun 27, 2024
7cbc27b
perf(cdr-fonts.css): merge 15.1
sikhote Jul 2, 2024
a9d70d5
Merge pull request #178 from rei/font-fallback-cls
mhewson Jul 2, 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
12 changes: 6 additions & 6 deletions browserTargets.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
];
28 changes: 14 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
12 changes: 12 additions & 0 deletions public/cdr-fonts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
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: 106%
}

@font-face {
font-display: swap;
font-family: Stuart;
Expand All @@ -17,6 +23,12 @@
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("Verdana");
size-adjust: 92%;
}

@font-face {
font-display: swap;
font-family: Graphik;
Expand Down
2 changes: 1 addition & 1 deletion public/cdr-reset.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/components/examples.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -78,4 +79,5 @@ export default {
toggleButton,
cdrSwitch,
tooltip,
utility,
};
1 change: 1 addition & 0 deletions src/dev/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
Loading
Loading