Skip to content

Commit e24b6b8

Browse files
authored
Merge branch 'master' into dash-datashader
2 parents 64b9504 + af7697f commit e24b6b8

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
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-brain-viewer/assets/default.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919
/* PLotly.js
20-
–––––––––––––––––––––––––––––––––––––––––––––––––– */
20+
––––––––––––––––––––––––––––––––––––––––––––––– */
2121
/* plotly.js's modebar's z-index is 1001 by default
2222
* https://github.com/plotly/plotly.js/blob/7e4d8ab164258f6bd48be56589dacd9bdd7fded2/src/css/_modebar.scss#L5
2323
* In case a dropdown is above the graph, the dropdown's options

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

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

apps/dash-drug-discovery/assets/app.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
*/
1818

1919
/* PLotly.js
20-
–––––––––––––––––––––––––––––––––––––––––––––––––– */
20+
–––––––––––––––––––––––––––––––––––––––––––––––– */
2121
/* plotly.js's modebar's z-index is 1001 by default
2222
* https://github.com/plotly/plotly.js/blob/7e4d8ab164258f6bd48be56589dacd9bdd7fded2/src/css/_modebar.scss#L5
2323
* In case a dropdown is above the graph, the dropdown's options
2424
* will be rendered below the modebar
2525
* Increase the select option's z-index
2626
*/
2727

28-
/* This was actually not quite right -
28+
/* This was actually not quite right ----
2929
dropdowns were overlapping each other (edited October 26)
3030
3131
.Select {

0 commit comments

Comments
 (0)