Merge pull request #789 from plotly/font-imports

VeraZab · web-flow · commit 279f4fa1a708 · 2018-11-09T14:10:41.000-05:00
prevent external-fonts
diff --git a/dev/index.html b/dev/index.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8">
     <link rel="shortcut icon" href="/favicon.ico">
+    <link href='https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700' rel='stylesheet' type='text/css'>
     <title>Editor Dev</title>
   </head>
   <body>
diff --git a/examples/custom/public/index.html b/examples/custom/public/index.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="theme-color" content="#000000">
+    <link href='https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700' rel='stylesheet' type='text/css'>
     <!--
       manifest.json provides metadata used when your web app is added to the
       homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
diff --git a/examples/demo/public/index.html b/examples/demo/public/index.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="theme-color" content="#000000">
+    <link href='https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700' rel='stylesheet' type='text/css'>
     <!--
       manifest.json provides metadata used when your web app is added to the
       homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
diff --git a/examples/redux/public/index.html b/examples/redux/public/index.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="theme-color" content="#000000">
+    <link href='https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700' rel='stylesheet' type='text/css'>
     <!--
       manifest.json provides metadata used when your web app is added to the
       homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
diff --git a/examples/simple/public/index.html b/examples/simple/public/index.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="theme-color" content="#000000">
+    <link href='https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700' rel='stylesheet' type='text/css'>
     <!--
       manifest.json provides metadata used when your web app is added to the
       homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
diff --git a/package.json b/package.json
@@ -125,4 +125,4 @@
     "watch": "babel src --watch --out-dir lib --source-maps | node-sass -w src/styles/main.scss lib/react-chart-editor.css",
     "watch-test": "jest --watch"
   }
-}
+}
diff --git a/scripts/translationKeys/combined-translation-keys.txt b/scripts/translationKeys/combined-translation-keys.txt
@@ -516,7 +516,7 @@ Relative
 Relative To                                                                                                                                                                // react-chart-editor: /default_panels/StyleImagesPanel.js:51
 Relative to                                                                                                                                                                // react-chart-editor: /default_panels/StyleShapesPanel.js:31
 Relative to Grid                                                                                                                                                           // react-chart-editor: /default_panels/StyleImagesPanel.js:33
-Rendering                                                                                                                                                                  // react-chart-editor: /components/fields/TraceSelector.js:135
+Rendering                                                                                                                                                                  // react-chart-editor: /components/fields/TraceSelector.js:136
 Reset                                                                                                                                                                      // plotly.js: components/modebar/buttons.js:443
 Reset axes                                                                                                                                                                 // plotly.js: components/modebar/buttons.js:159
 Reset camera to default                                                                                                                                                    // plotly.js: components/modebar/buttons.js:325
@@ -551,7 +551,7 @@ See a basic example.
 Select                                                                                                                                                                     // react-chart-editor: /default_panels/StyleLayoutPanel.js:85
 Select Data Point                                                                                                                                                          // react-chart-editor: /default_panels/StyleLayoutPanel.js:111
 Select Direction                                                                                                                                                           // react-chart-editor: /default_panels/StyleLayoutPanel.js:94
-Select Trace Type                                                                                                                                                          // react-chart-editor: /components/widgets/TraceTypeSelector.js:234
+Select Trace Type                                                                                                                                                          // react-chart-editor: /components/widgets/TraceTypeSelector.js:220
 Select a Colorscale Type                                                                                                                                                   // react-chart-editor: /components/widgets/ColorscalePicker.js:54
 Select an Option                                                                                                                                                           // react-chart-editor: /components/widgets/Dropdown.js:66
 Separate Thousands                                                                                                                                                         // react-chart-editor: /default_panels/StyleAxesPanel.js:174
diff --git a/scripts/translationKeys/translation-keys.txt b/scripts/translationKeys/translation-keys.txt
@@ -509,7 +509,7 @@ Relative
 Relative To                                                                                                                                                                  // /default_panels/StyleImagesPanel.js:51
 Relative to                                                                                                                                                                  // /default_panels/StyleShapesPanel.js:31
 Relative to Grid                                                                                                                                                             // /default_panels/StyleImagesPanel.js:33
-Rendering                                                                                                                                                                    // /components/fields/TraceSelector.js:135
+Rendering                                                                                                                                                                    // /components/fields/TraceSelector.js:136
 Resolution                                                                                                                                                                   // /default_panels/GraphSubplotsPanel.js:209
 Reversed                                                                                                                                                                     // /components/fields/MarkerColor.js:185
 Reversed and Grouped                                                                                                                                                         // /default_panels/StyleLegendPanel.js:72
@@ -538,7 +538,7 @@ See a basic example.
 Select                                                                                                                                                                       // /default_panels/StyleLayoutPanel.js:85
 Select Data Point                                                                                                                                                            // /default_panels/StyleLayoutPanel.js:111
 Select Direction                                                                                                                                                             // /default_panels/StyleLayoutPanel.js:94
-Select Trace Type                                                                                                                                                            // /components/widgets/TraceTypeSelector.js:234
+Select Trace Type                                                                                                                                                            // /components/widgets/TraceTypeSelector.js:220
 Select a Colorscale Type                                                                                                                                                     // /components/widgets/ColorscalePicker.js:54
 Select an Option                                                                                                                                                             // /components/widgets/Dropdown.js:66
 Separate Thousands                                                                                                                                                           // /default_panels/StyleAxesPanel.js:174
diff --git a/src/__percy__/percy.css b/src/__percy__/percy.css
@@ -1,3 +1,5 @@
+@import url('https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700');
+
 .editor_controls__wrapper > div {
   position: relative !important;
 }
diff --git a/src/styles/variables/_typography.scss b/src/styles/variables/_typography.scss
@@ -1,5 +1,3 @@
-@import url('https://fonts.googleapis.com/css?family=Dosis:500,700|Open+Sans:400,400i,600,700');
-
 $font-weight-light: 400;
 $font-weight-normal: 500;
 $font-weight-semibold: 600;
@@ -34,6 +32,6 @@ $font: (
   family:
     (
       body: ('Open Sans', --apple-default, sans-serif),
-      headings: ('Dosis', sans-serif)
+      headings: ('Dosis', 'Arial', sans-serif)
     )
 );

Original file line number	Diff line number	Diff line change
`@@ -125,4 +125,4 @@`
`125`	`125`	`"watch": "babel src --watch --out-dir lib --source-maps \| node-sass -w src/styles/main.scss lib/react-chart-editor.css",`
`126`	`126`	`"watch-test": "jest --watch"`
`127`	`127`	`}`
`128`		`-}`
	`128`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+@import url('https://fonts.googleapis.com/css?family=Dosis:500,700\|Open+Sans:400,400i,600,700');`
	`2`	`+`
`1`	`3`	`.editor_controls__wrapper > div {`
`2`	`4`	`position: relative !important;`
`3`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-@import url('https://fonts.googleapis.com/css?family=Dosis:500,700\|Open+Sans:400,400i,600,700');`
`2`		`-`
`3`	`1`	`$font-weight-light: 400;`
`4`	`2`	`$font-weight-normal: 500;`
`5`	`3`	`$font-weight-semibold: 600;`
`@@ -34,6 +32,6 @@ $font: (`
`34`	`32`	`family:`
`35`	`33`	`(`
`36`	`34`	`body: ('Open Sans', --apple-default, sans-serif),`
`37`		`- headings: ('Dosis', sans-serif)`
	`35`	`+ headings: ('Dosis', 'Arial', sans-serif)`
`38`	`36`	`)`
`39`	`37`	`);`