FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

nbconvert: Inline user custom CSS if it's defined. by jdfreder · Pull Request #5942 · ipython/ipython · GitHub

/ ipython Public

nbconvert: Inline user custom CSS if it's defined. - #5942

Merged
jdfreder merged 3 commits into
ipython:masterfrom
jdfreder:i5655
Jun 5, 2014
ConversationCommits (3)ChecksFiles changed
Merged

nbconvert: Inline user custom CSS if it's defined.#5942
jdfreder merged 3 commits into
ipython:masterfrom
jdfreder:i5655

Conversation

jdfreder commented Jun 3, 2014

Copy link
Copy Markdown
Contributor

closes #5655

jdfreder commented Jun 3, 2014

Copy link
Copy Markdown
Contributor Author

Note to self, this will make #5900 require a rebase.

minrk reviewed Jun 4, 2014
View reviewed changes
Comment thread IPython/nbconvert/preprocessors/csshtmlheader.py Outdated

minrk Jun 4, 2014

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Two points here:

  1. it's probably better to compare checksums than strings of file contents
  2. we don't want to re-read the custom.css every time this is called, can you cache the checksum of the default css?

jdfreder Jun 4, 2014

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

uh oh- looks like your last point got cut off :( Did you mean to say cache the user CSS too?

minrk Jun 4, 2014

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

just the two points - I wouldn't cache the user css.

ellisonbg commented Jun 4, 2014

Copy link
Copy Markdown
Member

I have looked at this and agree with @minrk 's comments. Once those are addressed, I think this is ready for merging.

minrk reviewed Jun 4, 2014
View reviewed changes
Comment thread IPython/nbconvert/preprocessors/csshtmlheader.py Outdated

minrk Jun 4, 2014

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I think you want to make sure that custom CSS comes last, but pygments is last here.

jdfreder Jun 4, 2014

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I do, thanks for catching this. Sometimes I get a little bit confused working in this class, because the "new" and "improved" version sits in my widget persistence branch (which I will have to rebase once this gets merged).

jdfreder commented Jun 4, 2014

Copy link
Copy Markdown
Contributor Author

Comments addressed

minrk commented Jun 4, 2014

Copy link
Copy Markdown
Member

looks ok

ellisonbg commented Jun 4, 2014

Copy link
Copy Markdown
Member

Looks good, merging.

jdfreder added a commit that referenced this pull request Jun 5, 2014
Merge pull request #5942 from jdfreder/i5655
bd89ec3 
nbconvert: Inline user custom CSS if it's defined.
jdfreder merged commit bd89ec3 into ipython:master Jun 5, 2014
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
Merge pull request ipython#5942 from jdfreder/i5655
ad351cd 
nbconvert: Inline user custom CSS if it's defined.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

3.0

Development

Successfully merging this pull request may close these issues.

Include profile dir custom.css in nbconvert HTML output

3 participants

Back | FazBrowse Home | New Git URL