Merge branch 'master' into new-plot-new-canvas

Author: etpinard

shelly/plotlyjs/static/plotlyjs/src/graph_obj.js

@@ -1653,6 +1653,9 @@ plots.fontAttrs = {
     }
 };
 
+// TODO make this a plot attribute?
+plots.fontWeight = 'normal';
+
 var extendFlat = Plotly.Lib.extendFlat;
 
 plots.layoutAttributes = {
@@ -2933,9 +2936,14 @@ Plotly.restyle = function restyle(gd, astr, val, traces) {
                 Plotly.Lib.swapAttrs(cont, ['?', '?src'], 'values', valuesTo);
 
                 if(oldVal === 'pie') {
+                    Plotly.Lib.nestedProperty(cont, 'marker.color')
+                        .set(Plotly.Lib.nestedProperty(cont, 'marker.colors').get());
+
                     // super kludgy - but if all pies are gone we won't remove them otherwise
                     fullLayout._pielayer.selectAll('g.trace').remove();
                 } else if(plots.traceIs(cont, 'cartesian')) {
+                    Plotly.Lib.nestedProperty(cont, 'marker.colors')
+                        .set(Plotly.Lib.nestedProperty(cont, 'marker.color').get());
                     //look for axes that are no longer in use and delete them
                     flagAxForDelete[cont.xaxis || 'x'] = true;
                     flagAxForDelete[cont.yaxis || 'y'] = true;
@@ -4343,7 +4351,8 @@ plots.titles = function(gd, title) {
                 'font-family': font,
                 'font-size': d3.round(fontSize,2)+'px',
                 fill: Plotly.Color.rgb(fontColor),
-                opacity: opacity*Plotly.Color.opacity(fontColor)
+                opacity: opacity*Plotly.Color.opacity(fontColor),
+                'font-weight': plots.fontWeight
             })
             .attr(options)
             .call(Plotly.util.convertToTspans)

shelly/plotlyjs/static/plotlyjs/src/plotly.js

@@ -66,3 +66,8 @@ exports.Queue = require('./queue');
 
 // exports d3 used in the bundle
 exports.d3 = require('d3');
+
+// custom styling injected via envify/uglifyify
+if(process.env.PLOTLY_CUSTOM_STYLE === "open-office-2015") {
+    require('./styles/open_office_2015')();
+}

shelly/plotlyjs/static/plotlyjs/src/styles/open_office_2015.js

@@ -0,0 +1,13 @@
+'use strict';
+
+var Plotly = require('../plotly');
+
+module.exports = function updateStyle() {
+    Plotly.Color.defaults = [
+        '#CC0000', '#5E6A71', '#BBDDE7', '#55aab2', '#a4b0b7'
+    ];
+
+    Plotly.Plots.layoutAttributes.font.family.dflt = '"Overpass", verdana, arial, sans-serif';
+
+    Plotly.Plots.fontWeight = 900;
+};

test-dashboard/toolpanel-dashboard/index.html

@@ -17,12 +17,12 @@
     <!-- ToolPanel JS dependencies Bundle -->
     <script type="text/javascript" src="./../../shelly/toolpanel/static/toolpanel/dist/toolpanel-dependencies-bundle.js"></script>
 
-    <!-- ToolPanel Standalone JS Bundle -->
-    <script type="text/javascript" src="./../../shelly/toolpanel/static/toolpanel/dist/toolpanel-standalone-bundle.js"></script>
-
     <!-- PlotlyJS Bundle -->
     <script type="text/javascript" src="./../../shelly/plotlyjs/static/plotlyjs/build/plotlyjs-bundle.js"></script>
 
+    <!-- ToolPanel Standalone JS Bundle -->
+    <script type="text/javascript" src="./../../shelly/toolpanel/static/toolpanel/dist/toolpanel-standalone-bundle.js"></script>
+
     <!-- UI Stuff -->
     <script type="text/javascript" src="ui.js"></script>