Skip to content

Commit bff2f9c

Browse files
Merge branch 'master' into dash-lastodash
2 parents eb3767f + 90bdb6a commit bff2f9c

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

.DS_Store

-10 KB
Binary file not shown.

.circleci/config.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,18 @@ jobs:
9999
fi
100100
git config --global user.email '<>' # Leave email blank
101101
git config --global user.name "Circle MonoRepo Automatic Deployer"
102-
echo $PLOTLY_GA_CODE > ~/dash-sample-apps/apps/"$APP"/assets/plotly_ga.js
103-
git add ~/dash-sample-apps/apps/"$APP"/assets/plotly_ga.js && git commit -m "Deployed commit: $CIRCLE_SHA1"
104-
git remote add $APP https://dash-gallery.plotly.host/GIT/$APP
105-
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..."
102+
if [ -d ~/dash-sample-apps/apps/"$APP"/ ]
103+
then
104+
echo $PLOTLY_GA_CODE > ~/dash-sample-apps/apps/"$APP"/assets/plotly_ga.js
105+
git add ~/dash-sample-apps/apps/"$APP"/assets/plotly_ga.js && git commit -m "Deployed commit: $CIRCLE_SHA1"
106+
git remote add $APP https://dash-gallery.plotly.host/GIT/$APP
107+
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..."
108+
fi
106109
done
107110
- run:
108111
name: Push to production
109112
command: |
110-
git push git@github.com:plotly/dash-sample-apps master:production
113+
git push --force git@github.com:plotly/dash-sample-apps master:production
111114
112115
workflows:
113116
version: 2

apps/dash-daq-tektronix350/.vscode/settings.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

apps/dash-datashader/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ datashader>=0.6.9
55
gunicorn>=19.9.0
66
numpy>=1.14.1
77
pandas>=0.24.0
8+
fsspec>=0.3.3

apps/dash-oil-and-gas/assets/s1.css

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Table of contents
2-
––––––––––––––––––––––––––––––––––––––––––––––––––
2+
––––––––––––––––––––––––––––––––––––––––––––––––
33
- Plotly.js
44
- Grid
55
- Base Styles
@@ -14,15 +14,17 @@
1414
- Utilities
1515
- Clearing
1616
- Media Queries
17+
1718
*/
1819

1920
/* PLotly.js
20-
–––––––––––––––––––––––––––––––––––––––––––––––––– */
21+
–––––––––––––––––––––––––––––––––––––––––––––––– */
2122
/* plotly.js's modebar's z-index is 1001 by default
2223
* https://github.com/plotly/plotly.js/blob/7e4d8ab164258f6bd48be56589dacd9bdd7fded2/src/css/_modebar.scss#L5
2324
* In case a dropdown is above the graph, the dropdown's options
2425
* will be rendered below the modebar
2526
* Increase the select option's z-index
27+
2628
*/
2729

2830
/* This was actually not quite right -

0 commit comments

Comments
 (0)