Merge branch 'master' into dash-live-model-training

Author: christopherjeon

.circleci/config.yml

@@ -102,7 +102,7 @@ jobs:
               echo $PLOTLY_GA_CODE > ~/dash-sample-apps/apps/"$APP"/assets/plotly_ga.js
               git add ~/dash-sample-apps/apps/"$APP"/assets/plotly_ga.js && git commit -m "Deployed commit: $CIRCLE_SHA1"
               git remote add $APP https://dash-gallery.plotly.host/GIT/$APP
-              git push $APP master --force
+              git push $APP master --force || echo "Deploy failed because there is no such app on Dash Gallery: $APP. Please use the web interface to create an app with this name. Continuing deployments..."
             done
       - run:
           name: Push to production

.gitignore

@@ -3,4 +3,5 @@ vv/
 *.DS_Store
 venv/
 .idea/
-.Rproj.user
+.DS_Store
+.Rproj.user

apps/dash-datashader/README.md

@@ -7,4 +7,5 @@ To learn more check out our [documentation](https://dash.plot.ly).
 
 ### Contributing
 
+
 Changes to master will get deployed automatically.

apps/dash-datashader/assets/dash-logo.png

@@ -30,6 +30,12 @@ h3 {
     justify-content: space-evenly;
 }
 
+#logo {
+    width: 150px;
+    height: 30px;
+    padding-left: 60px;
+}
+
 @media only screen and (max-width: 800px) {
     #header {
         max-width: 100%;
@@ -42,6 +48,7 @@ h3 {
 
     #logo {
         margin-bottom: 1rem;
+        padding-left: 0px;
     }
 
     #header h3 {
@@ -50,6 +57,10 @@ h3 {
         max-width: none;
     }
 
+    #header-1, #header-2{
+        font-size: 1.5rem;
+    }
+
     #header-1 {
         text-align: center;
     }
@@ -63,6 +74,10 @@ h3 {
         margin: 0;
     }
 
+    #graph-2>div {
+        margin-bottom: 40px;
+    }
+
 }
 
 
@@ -92,6 +107,3 @@ p, #header-2 {
     display: none;
 }
 
-#logo {
-    height: 5rem;
-}

apps/dash-datashader/assets/style.css

@@ -1,5 +1,5 @@
 cloudpickle>=1.1.1
-dash>=0.42.0
+dash>=1.0.0
 dask>=0.17.1
 datashader>=0.6.9
 gunicorn>=19.9.0

apps/dash-datashader/requirements.txt

@@ -122,8 +122,7 @@ def markdown_popup():
                     className="eight columns",
                     children=[
                         html.Img(
-                            id="logo-mobile",
-                            src=app.get_asset_url("dash-logo-stripe.png"),
+                            id="logo-mobile", src=app.get_asset_url("dash-logo.png")
                         ),
                         html.Div(
                             id="header-section",
@@ -278,8 +277,7 @@ def markdown_popup():
                         html.Div(
                             className="img-container",
                             children=html.Img(
-                                id="logo-web",
-                                src=app.get_asset_url("dash-logo-stripe.png"),
+                                id="logo-web", src=app.get_asset_url("dash-logo.png")
                             ),
                         ),
                         html.Div(id="div-visual-mode"),

apps/dash-object-detection/app.py

@@ -399,16 +399,36 @@ there.
 
 
 /* Larger than mobile */
-@media (min-width: 400px) {}
+@media (min-width: 300px) {
+  #logo-mobile {
+    margin: 0 auto;
+  }
+}
 
 /* Larger than phablet (also point when grid becomes active) */
-@media (min-width: 550px) {}
+@media (min-width: 550px) {
+  #logo-mobile {
+    margin: 0 auto;
+  }
+}
 
 /* Larger than tablet */
-@media (min-width: 750px) {}
+@media (min-width: 750px) {
+  #logo-mobile {
+    margin: 0 auto;
+  }
+}
 
 /* Larger than desktop */
-@media (min-width: 1000px) {}
+@media (min-width: 1000px) {
+  #logo-mobile {
+    margin: 0 auto;
+  }
+}
 
 /* Larger than Desktop HD */
-@media (min-width: 1200px) {}
+@media (min-width: 1200px) {
+  #logo-mobile {
+    margin: 0 auto;
+  }
+}