Merge pull request #185 from rei/v15.1

V15.1

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',
+];

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",
@@ -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",

public/cdr-fonts.css

@@ -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;
@@ -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;

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;

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,
 };

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 },