From 739d7ff5c86d9ce3e9adff947b6f15b8974f985d Mon Sep 17 00:00:00 2001
From: Vera Zabeida <vera.zabeida@gmail.com>
Date: Fri, 9 Nov 2018 11:36:24 -0500
Subject: [PATCH 1/3] prevent external-fonts

---
 scripts/translationKeys/combined-translation-keys.txt | 4 ++--
 scripts/translationKeys/translation-keys.txt          | 4 ++--
 src/styles/variables/_typography.scss                 | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/translationKeys/combined-translation-keys.txt b/scripts/translationKeys/combined-translation-keys.txt
index 84e6364f6..897d95718 100644
--- 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
index 198e722df..294788d50 100644
--- 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/styles/variables/_typography.scss b/src/styles/variables/_typography.scss
index 23bf735f7..cdfd04ee4 100644
--- 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;

From 98e1388ecbc4a328845499b841cf1eacc0cb06d6 Mon Sep 17 00:00:00 2001
From: Vera Zabeida <vera.zabeida@gmail.com>
Date: Fri, 9 Nov 2018 11:50:13 -0500
Subject: [PATCH 2/3] better default + add Dosis to Demo

---
 dev/index.html                        | 1 +
 examples/custom/public/index.html     | 1 +
 examples/demo/public/index.html       | 1 +
 examples/redux/public/index.html      | 1 +
 examples/simple/public/index.html     | 1 +
 package.json                          | 2 +-
 src/styles/variables/_typography.scss | 2 +-
 7 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dev/index.html b/dev/index.html
index 66eed34dd..cb6ff0454 100644
--- 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
index 5dc65ae50..bfe79260a 100644
--- 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
index ac959ccd8..b9fca36f7 100644
--- 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
index ce4969687..b1bb0e79f 100644
--- 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
index 35f718dab..594c4ab21 100644
--- 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
index 1681a2786..c12e3f780 100644
--- 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"
   }
-}
\ No newline at end of file
+}
diff --git a/src/styles/variables/_typography.scss b/src/styles/variables/_typography.scss
index cdfd04ee4..270654b68 100644
--- a/src/styles/variables/_typography.scss
+++ b/src/styles/variables/_typography.scss
@@ -32,6 +32,6 @@ $font: (
   family:
     (
       body: ('Open Sans', --apple-default, sans-serif),
-      headings: ('Dosis', sans-serif)
+      headings: ('Dosis', 'Arial', sans-serif)
     )
 );

From 9352eab2b749ee1705d630cba3ec44e09452ddd5 Mon Sep 17 00:00:00 2001
From: Vera Zabeida <vera.zabeida@gmail.com>
Date: Fri, 9 Nov 2018 14:01:59 -0500
Subject: [PATCH 3/3] percy adjustment

---
 src/__percy__/percy.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/__percy__/percy.css b/src/__percy__/percy.css
index e9ae9f344..079831e77 100644
--- 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;
 }