From fb092cfeba4449c8cc62834f5bed3cfb087161d3 Mon Sep 17 00:00:00 2001
From: David Estrada <destrada@Davids-MacBook-Pro-2.local>
Date: Wed, 15 Mar 2017 15:09:25 -0600
Subject: [PATCH 1/3] Add 49 more unicode symbols for scattergl symbol types

---
 devtools/test_dashboard/index.html |  3 ++-
 devtools/test_dashboard/test.js    | 17 ++++++++++++
 src/constants/gl_markers.js        | 42 +++++++++++++++++++++++++++---
 3 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 devtools/test_dashboard/test.js

diff --git a/devtools/test_dashboard/index.html b/devtools/test_dashboard/index.html
index d52115330d7..85e334732d5 100644
--- a/devtools/test_dashboard/index.html
+++ b/devtools/test_dashboard/index.html
@@ -15,7 +15,7 @@
 
   <section id="mocks-list"></section>
   <div id="plots">
-    <div id="graph"></div>
+    <div id="graph" style="width: 600px; height: 500px;"></div>
   </div>
   <div id="snapshot"></div>
 
@@ -23,5 +23,6 @@
   <script id="source" type="text/javascript" src="../../build/plotly.js"></script>
   <script type="text/javascript" src="../../test/image/strict-d3.js" charset="utf-8"></script>
   <script type="text/javascript" src="../../build/test_dashboard-bundle.js"></script>
+  <script type="text/javascript" src="./test.js"></script>
 </body>
 </html>
diff --git a/devtools/test_dashboard/test.js b/devtools/test_dashboard/test.js
new file mode 100644
index 00000000000..d2c9557a283
--- /dev/null
+++ b/devtools/test_dashboard/test.js
@@ -0,0 +1,17 @@
+var trace1 = {
+  x: [1, 2, 3, 4],
+  y: [10, 15, 13, 17],
+  mode: 'markers',
+  type: 'scattergl',
+  marker:{size:30, color: 'red', symbol: 'asterisk'}
+};
+
+var data = [ trace1 ];
+
+var layout = {
+  title:'Line and Scatter Plot',
+  height: 400,
+  width: 480
+};
+
+Plotly.newPlot('graph', data, layout);
\ No newline at end of file
diff --git a/src/constants/gl_markers.js b/src/constants/gl_markers.js
index e10354e84a4..d1bbce1b4dc 100644
--- a/src/constants/gl_markers.js
+++ b/src/constants/gl_markers.js
@@ -16,6 +16,42 @@ module.exports = {
     'square-open': '□',
     diamond: '◆',
     'diamond-open': '◇',
-    cross: '+',
-    x: '❌'
-};
+    cross: '➕',
+    x: '❌',
+    'triangle-up': '▲',
+    'triangle-up-open': '△',
+    'triangle-down': '▼',
+    'triangle-down-open': '▽',
+    'triangle-left': '◄',
+    'triangle-left-open': '◁',
+    'triangle-right': '►',
+    'triangle-right-open': '▷',
+    'triangle-ne': '◥',
+    'triangle-ne-open': '◹',
+    'triangle-nw': '◤',
+    'triangle-nw-open': '◸',
+    'triangle-se': '◢',
+    'triangle-se-open': '◿',
+    'triangle-sw': '◣',
+    'triangle-sw-open': '◺',
+    'pentagon': '⬟',
+    'pentagon-open': '⬠',
+    'hexagon': '⬢',
+    'hexagon-open': '⬡',
+    'hexagon2': '⬣',
+    'star': '★',
+    'star-open': '☆',
+    'hexagram': '✶',
+    'diamond-tall': '♦',
+    'diamond-tall-open': '♢',
+    'hourglass': '⧗',
+    'hourglass-open': '⧖',
+    'bowtie': '⧓',
+    'bowtie-open': '⋈',
+    'circle-cross': '⊕',
+    'circle-x': '⊗',
+    'square-cross': '⊞',
+    'square-x': '⊠',
+    'cross-thin': '+',
+    'asterisk': '✱'
+};
\ No newline at end of file

From ffad7facc72be1416e673ce6dd18f1db813c27a9 Mon Sep 17 00:00:00 2001
From: David Estrada <destrada@Davids-MacBook-Pro-2.local>
Date: Thu, 16 Mar 2017 09:28:30 -0600
Subject: [PATCH 2/3] revert devtools folder to master

---
 devtools/test_dashboard/index.html |  3 +--
 devtools/test_dashboard/test.js    | 17 -----------------
 2 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 devtools/test_dashboard/test.js

diff --git a/devtools/test_dashboard/index.html b/devtools/test_dashboard/index.html
index 85e334732d5..d52115330d7 100644
--- a/devtools/test_dashboard/index.html
+++ b/devtools/test_dashboard/index.html
@@ -15,7 +15,7 @@
 
   <section id="mocks-list"></section>
   <div id="plots">
-    <div id="graph" style="width: 600px; height: 500px;"></div>
+    <div id="graph"></div>
   </div>
   <div id="snapshot"></div>
 
@@ -23,6 +23,5 @@
   <script id="source" type="text/javascript" src="../../build/plotly.js"></script>
   <script type="text/javascript" src="../../test/image/strict-d3.js" charset="utf-8"></script>
   <script type="text/javascript" src="../../build/test_dashboard-bundle.js"></script>
-  <script type="text/javascript" src="./test.js"></script>
 </body>
 </html>
diff --git a/devtools/test_dashboard/test.js b/devtools/test_dashboard/test.js
deleted file mode 100644
index d2c9557a283..00000000000
--- a/devtools/test_dashboard/test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var trace1 = {
-  x: [1, 2, 3, 4],
-  y: [10, 15, 13, 17],
-  mode: 'markers',
-  type: 'scattergl',
-  marker:{size:30, color: 'red', symbol: 'asterisk'}
-};
-
-var data = [ trace1 ];
-
-var layout = {
-  title:'Line and Scatter Plot',
-  height: 400,
-  width: 480
-};
-
-Plotly.newPlot('graph', data, layout);
\ No newline at end of file

From c0eb06599db481f2137ed97e79bab5cb2bc31351 Mon Sep 17 00:00:00 2001
From: David Estrada <destrada@Davids-MacBook-Pro-2.local>
Date: Tue, 21 Mar 2017 13:43:08 -0600
Subject: [PATCH 3/3] Changed gl_marker 'cross' back to original symbol and ran
 npm lint-fix

---
 src/constants/gl_markers.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/constants/gl_markers.js b/src/constants/gl_markers.js
index d1bbce1b4dc..933c226e916 100644
--- a/src/constants/gl_markers.js
+++ b/src/constants/gl_markers.js
@@ -16,7 +16,7 @@ module.exports = {
     'square-open': '□',
     diamond: '◆',
     'diamond-open': '◇',
-    cross: '➕',
+    cross: '+',
     x: '❌',
     'triangle-up': '▲',
     'triangle-up-open': '△',
@@ -52,6 +52,5 @@ module.exports = {
     'circle-x': '⊗',
     'square-cross': '⊞',
     'square-x': '⊠',
-    'cross-thin': '+',
     'asterisk': '✱'
-};
\ No newline at end of file
+};