Merge pull request matplotlib#2825 from vmarkovtsev/master

WebAgg: extracted figure_div style into css and changed layout

Author: mdboom

lib/matplotlib/backends/backend_webagg.py

@@ -369,11 +369,14 @@ def start(cls):
         if cls.started:
             return
 
-        print("Press Ctrl+C to stop server")
-        try:
-            tornado.ioloop.IOLoop.instance().start()
-        except KeyboardInterrupt:
-            print("Server stopped")
+        if not tornado.ioloop.IOLoop.instance().running():
+            print("Press Ctrl+C to stop server")
+            try:
+                tornado.ioloop.IOLoop.instance().start()
+            except KeyboardInterrupt:
+                print("Server stopped")
+        else:
+            print("Server is running in an existing Tornado IOLoop")
 
         cls.started = True
 

lib/matplotlib/backends/web_backend/all_figures.html

@@ -14,7 +14,7 @@
         $(document).ready(
         function() {
           var main_div = $('div#figures');
-          var figure_div = $('<div style="padding-bottom: 12px"/>')
+          var figure_div = $('<div id="figure-div"/>')
           main_div.append(figure_div);
           var websocket_type = mpl.get_websocket_type();
           var websocket = new websocket_type(

lib/matplotlib/backends/web_backend/css/page.css

@@ -75,3 +75,8 @@ span#login_widget {
     -webkit-box-sizing: border-box;
 }
 
+#figure-div {
+    display: inline-block;
+    margin: 10px;
+}
+