Merge pull request #58 from Shopify/fix-quoted-typography

Fix quoted typography
Shopify · Apr 4, 2019 · 799f7ac · 799f7ac
2 parents 8111270 + 1157a86
commit 799f7ac
Show file tree

Hide file tree

Showing 22 changed files with 599 additions and 247 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 
 - Added color names to the Sketch palette ([#53](https://github.com/Shopify/polaris-tokens/pull/53))
+- Fixed a bug where the font family value was wrapped in quotes ([#58](https://github.com/Shopify/polaris-tokens/pull/58))
 
 ## [2.3.0] - 2019-02-19
 

diff --git a/__tests__/__snapshots__/colors.test.js.snap b/__tests__/__snapshots__/colors.test.js.snap
@@ -1982,7 +1982,7 @@ exports[`renders index.d.ts correctly 1`] = `
   colorYellowLight: \\"rgb(255, 234, 138)\\";
   colorYellowLighter: \\"rgb(252, 241, 205)\\";
   colorYellowText: \\"rgb(89, 81, 48)\\";
-  fontStackBase: \\"-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif\\";
+  fontStackBase: \\"-apple-system, BlinkMacSystemFont, 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', sans-serif\\";
   fontStackMonospace: \\"Monaco, Consolas, 'Lucida Console', monospace\\";
   spacingBase: \\"16px\\";
   spacingBaseTight: \\"12px\\";

diff --git a/dist/index.common.js b/dist/index.common.js
@@ -65,6 +65,6 @@ module.exports = {
   spacingLoose: '20px',
   spacingExtraLoose: '32px',
   fontStackBase:
-    "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif",
+    "-apple-system, BlinkMacSystemFont, 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', sans-serif",
   fontStackMonospace: "Monaco, Consolas, 'Lucida Console', monospace",
 };
diff --git a/dist/index.custom-properties.css b/dist/index.custom-properties.css
@@ -64,6 +64,7 @@
   --spacing-base: 16px;
   --spacing-loose: 20px;
   --spacing-extra-loose: 32px;
-  --font-stack-base: "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif";
-  --font-stack-monospace: "Monaco, Consolas, 'Lucida Console', monospace";
+  --font-stack-base: -apple-system, BlinkMacSystemFont, 'San Francisco', Roboto,
+    'Segoe UI', 'Helvetica Neue', sans-serif;
+  --font-stack-monospace: Monaco, Consolas, 'Lucida Console', monospace;
 }
diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -57,7 +57,7 @@ declare interface Tokens {
   colorYellowLight: "rgb(255, 234, 138)";
   colorYellowLighter: "rgb(252, 241, 205)";
   colorYellowText: "rgb(89, 81, 48)";
-  fontStackBase: "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif";
+  fontStackBase: "-apple-system, BlinkMacSystemFont, 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', sans-serif";
   fontStackMonospace: "Monaco, Consolas, 'Lucida Console', monospace";
   spacingBase: "16px";
   spacingBaseTight: "12px";

diff --git a/dist/index.json b/dist/index.json
@@ -64,6 +64,6 @@
   "spacing-base": "16px",
   "spacing-loose": "20px",
   "spacing-extra-loose": "32px",
-  "font-stack-base": "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif",
+  "font-stack-base": "-apple-system, BlinkMacSystemFont, 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', sans-serif",
   "font-stack-monospace": "Monaco, Consolas, 'Lucida Console', monospace"
 }
diff --git a/dist/index.map.scss b/dist/index.map.scss
@@ -195,9 +195,18 @@ $polaris-index-map: (
     32px,
   ),
   'font-stack-base': (
-    "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif",
+    -apple-system,
+    BlinkMacSystemFont,
+    'San Francisco',
+    Roboto,
+    'Segoe UI',
+    'Helvetica Neue',
+    sans-serif,
   ),
   'font-stack-monospace': (
-    "Monaco, Consolas, 'Lucida Console', monospace",
+    Monaco,
+    Consolas,
+    'Lucida Console',
+    monospace,
   ),
 );
diff --git a/dist/index.raw.json b/dist/index.raw.json
@@ -632,14 +632,14 @@
       "originalValue": "32px"
     },
     "font-stack-base": {
-      "type": "string",
+      "type": "font-family",
       "category": "font-family",
       "name": "font-stack-base",
-      "value": "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif",
-      "originalValue": "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif"
+      "value": "-apple-system, BlinkMacSystemFont, 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', sans-serif",
+      "originalValue": "-apple-system, BlinkMacSystemFont, 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', sans-serif"
     },
     "font-stack-monospace": {
-      "type": "string",
+      "type": "font-family",
       "category": "font-family",
       "name": "font-stack-monospace",
       "value": "Monaco, Consolas, 'Lucida Console', monospace",

diff --git a/dist/index.scss b/dist/index.scss
@@ -63,5 +63,6 @@ $spacing-base-tight: 12px;
 $spacing-base: 16px;
 $spacing-loose: 20px;
 $spacing-extra-loose: 32px;
-$font-stack-base: "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif";
-$font-stack-monospace: "Monaco, Consolas, 'Lucida Console', monospace";
+$font-stack-base: -apple-system, BlinkMacSystemFont, 'San Francisco', Roboto,
+  'Segoe UI', 'Helvetica Neue', sans-serif;
+$font-stack-monospace: Monaco, Consolas, 'Lucida Console', monospace;
diff --git a/dist/typography.common.js b/dist/typography.common.js
@@ -1,5 +1,5 @@
 module.exports = {
   fontStackBase:
-    "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif",
+    "-apple-system, BlinkMacSystemFont, 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', sans-serif",
   fontStackMonospace: "Monaco, Consolas, 'Lucida Console', monospace",
 };
diff --git a/dist/typography.custom-properties.css b/dist/typography.custom-properties.css
@@ -1,4 +1,5 @@
 :root {
-  --font-stack-base: "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif";
-  --font-stack-monospace: "Monaco, Consolas, 'Lucida Console', monospace";
+  --font-stack-base: -apple-system, BlinkMacSystemFont, 'San Francisco', Roboto,
+    'Segoe UI', 'Helvetica Neue', sans-serif;
+  --font-stack-monospace: Monaco, Consolas, 'Lucida Console', monospace;
 }
diff --git a/dist/typography.json b/dist/typography.json
@@ -1,4 +1,4 @@
 {
-  "font-stack-base": "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif",
+  "font-stack-base": "-apple-system, BlinkMacSystemFont, 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', sans-serif",
   "font-stack-monospace": "Monaco, Consolas, 'Lucida Console', monospace"
 }
diff --git a/dist/typography.map.scss b/dist/typography.map.scss
@@ -1,8 +1,17 @@
 $polaris-typography-map: (
   'font-stack-base': (
-    "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif",
+    -apple-system,
+    BlinkMacSystemFont,
+    'San Francisco',
+    Roboto,
+    'Segoe UI',
+    'Helvetica Neue',
+    sans-serif,
   ),
   'font-stack-monospace': (
-    "Monaco, Consolas, 'Lucida Console', monospace",
+    Monaco,
+    Consolas,
+    'Lucida Console',
+    monospace,
   ),
 );
diff --git a/dist/typography.raw.json b/dist/typography.raw.json
@@ -2,14 +2,14 @@
   "aliases": {},
   "props": {
     "font-stack-base": {
-      "type": "string",
+      "type": "font-family",
       "category": "font-family",
       "name": "font-stack-base",
-      "value": "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif",
-      "originalValue": "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif"
+      "value": "-apple-system, BlinkMacSystemFont, 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', sans-serif",
+      "originalValue": "-apple-system, BlinkMacSystemFont, 'San Francisco', Roboto, 'Segoe UI', 'Helvetica Neue', sans-serif"
     },
     "font-stack-monospace": {
-      "type": "string",
+      "type": "font-family",
       "category": "font-family",
       "name": "font-stack-monospace",
       "value": "Monaco, Consolas, 'Lucida Console', monospace",

diff --git a/dist/typography.scss b/dist/typography.scss
@@ -1,2 +1,3 @@
-$font-stack-base: "-apple-system, 'BlinkMacSystemFont', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', sans-serif";
-$font-stack-monospace: "Monaco, Consolas, 'Lucida Console', monospace";
+$font-stack-base: -apple-system, BlinkMacSystemFont, 'San Francisco', Roboto,
+  'Segoe UI', 'Helvetica Neue', sans-serif;
+$font-stack-monospace: Monaco, Consolas, 'Lucida Console', monospace;
diff --git a/docs/index.css b/docs/index.css