Added missing require and jquery from cdn. #5488
Merged
Conversation
This file contains 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
|
Just missed the cutoff, but we should have 2.0.1 pretty soon. |
|
Yes, I know... no problem... thanks for the quick feedback... |
|
@minrk, do you see any problem with this one? I don't want to merge it without your opinion, but since I'm using the nb for my pycon keynote and I also saw @catherinedevlin post about doing the same for her talk, I'd like to merge it sooner rather than later, so we can work off straight master. |
|
I wanted to look into the CSS selector for something simpler, I'll do that now. |
| @@ -107,6 +110,9 @@ html { | |||
| div.input_area { | |||
| padding: 0.06em; | |||
| } | |||
| div.input_area>div.highlight>pre { | |||
| font-size: 80%; | |||
|
@damianavila can you check #5534 for the font-size changes? If that works, then we can merge this PR with just the jquery, require additions. |
damianavila
changed the title
|
Updated... |
|
Thanks |
minrk
added a commit
that referenced
this pull request
Apr 6, 2014
Added require and jquery from cdn in reveal template
|
Thanks!! |
minrk
added a commit
that referenced
this pull request
Apr 9, 2014
For some reason (I suppose some changes at the css level) the font size inside the input cells was fixed at 14 px... making the fonts really small in the reveal slideshows. This is really annoying... As a plus, I have also added the missing calls for require and jquery (as the full html template does). I think these fixes belong to 2.0, but I also know we are on the edge... so I hope to get it inside 馃槈 Cheers.
minrk
added a commit
that referenced
this pull request
May 8, 2014
We had various overrides of the bootstrap defaults for font-size and line-height every time we made a pre tag, and then some overrides of our overrides when we wanted something slightly different. This moves the most basic overrides to apply to all pre tags, reducing the number of downstream changes we need. Should hopefully replace the CSS changes in #5488
mattvonrocketstein
pushed a commit
to mattvonrocketstein/ipython
that referenced
this pull request
Nov 3, 2014
Added require and jquery from cdn in reveal template
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For some reason (I suppose some changes at the css level) the font size inside the input cells was fixed at 14 px... making the fonts really small in the reveal slideshows. This is really annoying...
As a plus, I have also added the missing calls for require and jquery (as the full html template does).
I think these fixes belong to 2.0, but I also know we are on the edge... so I hope to get it inside 馃槈
Cheers.