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.

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

merged 18 commits into from
Nov 8, 2019

Conversation

shammamah-zz
Copy link
Contributor

About

The fornac package includes stylesheets that apply to all SVG elements (see https://github.com/ViennaRNA/fornac/blob/9771d6d79d400e334bb306387d5fc795097ff94d/app/styles/fornac.css#L1); this package was forked to https://github.com/plotly/fornac with an additional .forna-container class selector prepended to each selector in the included stylesheets.

The FornaContainer component in this library was accordingly updated to include a className property of .forna-container so that the styles from the original library would still apply.

@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 October 23, 2019 19:02 Inactive
package.json Outdated
@@ -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)

@@ -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.

@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 November 5, 2019 18:42 Inactive
@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 November 5, 2019 19:38 Inactive
@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 November 5, 2019 19:59 Inactive
@Marc-Andre-Rivet Marc-Andre-Rivet added this to the Dash v1.7 milestone Nov 6, 2019
@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 November 7, 2019 19:50 Inactive
@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 November 7, 2019 19:52 Inactive
@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 November 7, 2019 19:54 Inactive
@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 November 7, 2019 21:14 Inactive
@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 November 7, 2019 21:16 Inactive
@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 November 8, 2019 15:30 Inactive
@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 November 8, 2019 17:45 Inactive
.circleci/config.yml Outdated Show resolved Hide resolved
Co-Authored-By: alexcjohnson <[email protected]>
@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 November 8, 2019 17:53 Inactive
@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 November 8, 2019 20:03 Inactive
@shammamah-zz shammamah-zz temporarily deployed to dash-bio-test-pr-434 November 8, 2019 20:07 Inactive
Copy link
Collaborator

@alexcjohnson alexcjohnson left a comment

Choose a reason for hiding this comment

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

💃

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants