Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix forna stylesheet #434

Merged
merged 18 commits into from
Nov 8, 2019
Merged

Fix forna stylesheet #434

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c64f3ef
Add className to container div.
Oct 23, 2019
30048df
Use fixed version of fornac library.
Oct 23, 2019
222e811
Update version of package.
Oct 23, 2019
8d75305
Update auto-generated files.
Oct 23, 2019
d7b1d85
Merge branch 'master' into fix-forna-stylesheet
Nov 5, 2019
cea82c8
Add hash for specific fornac commit and update version.
Nov 5, 2019
d9e174a
Update autogenerated files.
Nov 5, 2019
247c7db
Merge branch 'master' into fix-forna-stylesheet
Nov 7, 2019
d42c42b
Add Python version to cache checksum.
Nov 7, 2019
8cad5f4
Remove className.
Nov 8, 2019
1994255
Update CHANGELOG.
Nov 8, 2019
e0d5d6c
Update version.
Nov 8, 2019
ce1c497
Add autogenerated files.
Nov 8, 2019
bc9706f
Remove python version caching from node job.
Nov 8, 2019
f65bb85
Update .circleci/config.yml
Nov 8, 2019
45183b0
Fix save_cache for python dependencies.
Nov 8, 2019
9c15d1e
Update version.
Nov 8, 2019
77b2d68
Update autogenerated files.
Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions dash_bio/bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dash_bio/package-info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"name": "dash_bio", "version": "0.3.0", "author": "The Plotly Team <[email protected]>"}
{"name": "dash_bio", "version": "0.4.0-rc3", "author": "The Plotly Team <[email protected]>"}
7 changes: 3 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dash-bio",
"version": "0.3.0",
"version": "0.4.0-rc3",
"description": "Dash components for bioinformatics",
"repository": {
"type": "git",
Expand Down Expand Up @@ -30,7 +30,7 @@
"dependencies": {
"circos": "git+https://github.com/matthewchan15/circosJS.git#matthewchan15-zoom-pan-svg",
"fast-memoize": "^2.5.1",
"fornac": "^1.1.8",
"fornac": "git://github.com/plotly/fornac.git",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's put a hash here, so if and when we upgrade it's intentional :)
Same for all the git-referenced packages in fact. Even the circos branch reference isn't unique, a commit hash is better (and while I'm looking at this... much as we appreciate @matthewchan15's work, circos should probably be moved into the plotly namespace as well)

"ideogram": "git+https://github.com/eweitz/ideogram.git#7d9b2ab91b91ef35db93bdeb529d4760de63292f",
"molecule-2d-for-react": "git://github.com/plotly/molecule-2d-for-react.git",
"molecule-3d-for-react": "git://github.com/plotly/molecule-3d-for-react.git",
Expand Down
1 change: 1 addition & 0 deletions src/lib/components/FornaContainer.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export default class FornaContainer extends Component {
return (
<div
id={this.props.id}
className="forna-container"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're able to rebuild fornac, it would be better to add this class there - probably here adding .classed('forna-container', true) - so that (a) we don't have this hidden requirement that our fornac only be run through dash-bio (and the otherwise inexplicable presence of this className), and (b) we can PR back to the original repo.

If it's any sort of a pain figuring out how to build fornac, don't worry about it, we can leave it as you have it.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can get rid of this line now, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah that's right! Fixed in 8cad5f4.

ref={this.containerRef}
style={{outline: 'none'}}
/>
Expand Down