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

Fixes for JupyterLab 1.0.0 #5

Merged
merged 7 commits into from Jul 31, 2019
Merged

Fixes for JupyterLab 1.0.0 #5

merged 7 commits into from Jul 31, 2019

Conversation

agoose77
Copy link
Contributor

@agoose77 agoose77 commented Jul 8, 2019

No description provided.

@agoose77
Copy link
Contributor Author

agoose77 commented Jul 8, 2019

Not sure if there were any modified icons by this theme - I just took them from master in theme-dark-extension

@agoose77
Copy link
Contributor Author

agoose77 commented Jul 8, 2019

I didn't restore scrollbars.css as I felt this might have been ommitted for a reason. I just returned the basic scrollbar theming.

@telamonian telamonian self-requested a review July 10, 2019 01:03
@telamonian
Copy link
Owner

Thanks for helping me get this up to date!

Don't need scrollbars.css, since the contents of that were already pushed upstream to jlab itself.

I looked over your changes, and the only thing that caught my eye is that there's probably still a bunch of now-unused icons sitting around (if I'm interpreting the changes you made to style/urls.css correctly). There's no custom icons in this theme, so you can just nuke style/icons and style/images and replace them with the latest versions from @jupyterlab/theme-dark-extension.

Other than that, I think it looks ready to pull. I also need to sort out why the CI is failing, but that probably has nothing to do with this PR.

@agoose77
Copy link
Contributor Author

agoose77 commented Jul 10, 2019

Hey no problem, it's a great extension and it was about time I contributed more than GitHub Issues.

Yeah, if you've just exported the JLab icons, I'll overwrite them from master and update urls respectively.
It looks like Travis failed because it hit the token page, but I haven't really looked into it.

@agoose77
Copy link
Contributor Author

Updated images.

style/variables.css Outdated Show resolved Hide resolved
@telamonian
Copy link
Owner

Okay, everything looks great, and I tested and can confirm it works with the latest Jlab release (1.0.4). Thanks for all your work, @agoose77!

@telamonian
Copy link
Owner

I'll pull this and then do an npm release

@telamonian telamonian merged commit f356e42 into telamonian:jlab-1.0 Jul 31, 2019
@telamonian
Copy link
Owner

Hmm, I guess I still have to rebase and/or merge with master (they've drifted apart). But I think I'll save that for a future release.

@agoose77
Copy link
Contributor Author

agoose77 commented Jul 31, 2019 via email

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.

None yet

2 participants