Skip to content

Move CM IPython theme out of codemirror folder #2942

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

Merged
ellisonbg merged 1 commit into from
Feb 22, 2013
Merged

Move CM IPython theme out of codemirror folder #2942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 1 addition & 14 deletions IPython/frontend/html/notebook/static/codemirror/README-IPython.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,9 @@ The only changes we've applied so far are these::
In practice it's just a one-line change, adding `\\?` to singleOperators,
surrounded by a comment.

Then don't forget to reintroduce ipython.css

git show 39a602468ee1ca8fdb660826d6185e0f9a026fdf --stat
commit 39a602468ee1ca8fdb660826d6185e0f9a026fdf
Author: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Mon Jul 23 14:47:08 2012 +0200

reintroduce ipython.css

IPython/frontend/html/notebook/static/codemirror/theme/ipython.css | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)


that you should be able to apply after updating codemirror with

git cherry-pick 271e17 39a602
git cherry-pick 271e17

We'll turn this into a proper patchset if it ever gets more complicated than
this, but for now this note should be enough.
0 ...ebook/static/codemirror/theme/ipython.css → ...otebook/static/css/codemirror-ipython.css
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion IPython/frontend/html/notebook/templates/notebook.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</script>

<link rel="stylesheet" href="{{ static_url("codemirror/lib/codemirror.css") }}">
<link rel="stylesheet" href="{{ static_url("codemirror/theme/ipython.css") }}">
<link rel="stylesheet" href="{{ static_url("css/codemirror-ipython.css") }}">

<link rel="stylesheet" href="{{ static_url("prettify/prettify.css") }}"/>

Expand Down