Creating override.css for each page.

This css file should only have temporary hack until we fix
out global styles. Don't add anything new to these files.
This commit is contained in:
Brian E. Granger 2013-05-21 15:33:24 -07:00
parent 6b8c543fae
commit 7e0bd8f960
15 changed files with 51 additions and 36 deletions

View File

@ -43,7 +43,7 @@ class NamedNotebookHandler(IPythonHandler):
nbm = self.notebook_manager
if not nbm.notebook_exists(notebook_id):
raise web.HTTPError(404, u'Notebook does not exist: %s' % notebook_id)
self.write(self.render_template('notebooks.html',
self.write(self.render_template('notebook.html',
project=self.project,
notebook_id=notebook_id,
kill_kernel=False,

View File

@ -0,0 +1,9 @@
/*This file contains any manual css for this page that needs to override the global styles.
This is only required when different pages style the same element differently. This is just
a hack to deal with our current css styles and no new styling should be added in this file.*/
#ipython-main-app {
height: 100px;
width: 350px;
margin: 50px auto;
}

View File

@ -1,6 +1 @@
#ipython-main-app {
height: 100px;
width: 350px;
margin: 50px auto;
}
// Custom styles for login.html

View File

@ -1,7 +1,2 @@
#ipython-main-app {
height: 100px;
width: 200px;
margin: 50px auto;
}
// Custom styles for logout.html

View File

@ -0,0 +1,9 @@
/*This file contains any manual css for this page that needs to override the global styles.
This is only required when different pages style the same element differently. This is just
a hack to deal with our current css styles and no new styling should be added in this file.*/
#ipython-main-app {
width: 100%;
position: relative;
font-size: 110%;
}

View File

@ -116,13 +116,6 @@ span#notebook_name {
width:auto;
}
#ipython-main-app {
width: 100%;
position: relative;
font-size: 110%;
}
span#quick_help_area {
position: static;
padding: 5px 0px;

View File

@ -1,5 +1,5 @@
@import "../notebooks/less/notebook.less";
@import "../notebooks/less/renderedhtml.less";
@import "../notebooks/less/tooltip.less";
@import "../notebooks/less/celltoolbar.less";
@import "../notebooks/less/highlight.less";
@import "notebook.less";
@import "renderedhtml.less";
@import "tooltip.less";
@import "celltoolbar.less";
@import "highlight.less";

View File

@ -881,12 +881,9 @@ span#ipython_notebook img{font-family:Verdana,"Helvetica Neue",Arial,Helvetica,G
.ui-button .ui-button-text{padding:0.2em 0.8em;font-size:77%;}
input.ui-button{padding:0.3em 0.9em;}
span#login_widget{float:right;}
#ipython-main-app{height:100px;width:350px;margin:50px auto;}
#ipython-main-app{height:100px;width:200px;margin:50px auto;}
.alternate_upload{background-color:none;display:inline;}
.alternate_upload.form{padding:0;margin:0;}
.alternate_upload input.fileinput{background-color:red;position:relative;opacity:0;z-index:2;width:295px;margin-left:163px;cursor:pointer;}
#ipython-main-app{width:920px;margin:30px auto 0px auto;}
#tabs{border-style:none;}
#tab1,#tab2{padding:1em 0em;}
.list_toolbar{padding:5px;height:25px;line-height:25px;}
@ -941,7 +938,6 @@ span#notebook_name{height:1em;line-height:1em;padding:3px;border:none;font-size:
.toolbar{padding:3px 15px;border-bottom:1px #ababab solid;}.toolbar button{margin-top:2px;margin-bottom:2px;}
.toolbar select,.toolbar label{height:19px;vertical-align:middle;margin-right:2px;margin-bottom:0;display:inline;font-size:92%;margin-left:0.3em;margin-right:0.3em;padding:0px;}
.toolbar select{width:auto;}
#ipython-main-app{width:100%;position:relative;font-size:110%;}
span#quick_help_area{position:static;padding:5px 0px;margin:0px 0px 0px 0px;}
.help_string{float:right;width:170px;padding:0px 5px;text-align:left;font-size:85%;}
.help_string_label{float:right;font-size:85%;}

View File

@ -0,0 +1,8 @@
/*This file contains any manual css for this page that needs to override the global styles.
This is only required when different pages style the same element differently. This is just
a hack to deal with our current css styles and no new styling should be added in this file.*/
#ipython-main-app {
width: 920px;
margin: 30px auto 0px auto;
}

View File

@ -5,11 +5,6 @@
* Author: IPython Development Team
*/
#ipython-main-app {
width: 920px;
margin: 30px auto 0px auto;
}
#tabs {
border-style: none;
}

View File

@ -1,9 +1,13 @@
{% extends "page.html" %}
{% block login_widget %}
{% block stylesheet %}
{{super()}}
<link rel="stylesheet" href="{{ static_url("auth/css/override.css") }}" type="text/css" />
{% endblock %}
{% block login_widget %}
{% endblock %}
{% block site %}

View File

@ -1,5 +1,9 @@
{% extends "page.html" %}
{% block stylesheet %}
{{super()}}
<link rel="stylesheet" href="{{ static_url("auth/css/override.css") }}" type="text/css" />
{% endblock %}
{% block login_widget %}
{% endblock %}

View File

@ -15,6 +15,8 @@ window.mathjax_url = "{{mathjax_url}}";
{{super()}}
<link rel="stylesheet" href="{{ static_url("notebook/css/override.css") }}" type="text/css" />
{% endblock %}
{% block params %}

View File

@ -21,7 +21,7 @@
{% else %}
<link rel="stylesheet" href="{{ static_url("style/style.min.css") }}" type="text/css"/>
{% endif %}
{% endblock lesscss%}
{% endblock %}
{% endblock %}
<link rel="stylesheet" href="{{ static_url("custom/css/custom.css") }}" type="text/css" />

View File

@ -3,6 +3,11 @@
{% block title %}IPython Dashboard{% endblock %}
{% block stylesheet %}
{{super()}}
<link rel="stylesheet" href="{{ static_url("tree/css/override.css") }}" type="text/css" />
{% endblock %}
{% block params %}
data-project={{project}}