More work on the less setup.

This commit is contained in:
Brian E. Granger 2013-05-15 16:21:39 -07:00
parent 926e60c5ea
commit 6d39d633b6
9 changed files with 69 additions and 58 deletions

View File

@ -0,0 +1,4 @@
@import "../../base/less/base.less";
@import "variables.less";
@import "login.less";
@import "logout.less";

View File

@ -1,10 +1,12 @@
{% extends "base.html" %}
{% extends "page.html" %}
{% block stylesheet %}
<link rel="stylesheet" href="{{static_url("css/login.css") }}" type="text/css"/>
{% endblock %}
{% block lesscss %}
{% if use_less %}
<link rel="stylesheet/less" href="{{ static_url("auth/less/style.less") }}" type="text/css" />
{% else %}
<link rel="stylesheet" href="{{ static_url("auth/css/style.min.css") }}" type="text/css"/>
{% endif %}
{% endblock lesscss%}
{% block login_widget %}
@ -37,6 +39,6 @@
{% block script %}
<script src="{{static_url("js/loginmain.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("auth/js/loginmain.js") }}" type="text/javascript" charset="utf-8"></script>
{% endblock %}

View File

@ -1,10 +1,13 @@
{% extends "base.html" %}
{% extends "page.html" %}
{% block stylesheet %}
{% block lesscss %}
{% if use_less %}
<link rel="stylesheet/less" href="{{ static_url("auth/less/style.less") }}" type="text/css" />
{% else %}
<link rel="stylesheet" href="{{ static_url("auth/css/style.min.css") }}" type="text/css"/>
{% endif %}
{% endblock lesscss%}
<link rel="stylesheet" href="{{static_url("css/logout.css") }}" type="text/css"/>
{% endblock %}
{% block login_widget %}
@ -35,6 +38,6 @@
{% block script %}
<script src="{{static_url("js/logoutmain.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("auth/js/logoutmain.js") }}" type="text/javascript" charset="utf-8"></script>
{% endblock %}

View File

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "page.html" %}
{% block stylesheet %}
@ -19,9 +19,9 @@ window.mathjax_url = "{{mathjax_url}}";
{% block lesscss %}
{% if use_less %}
<link rel="stylesheet/less" href="{{ static_url("ipython/notebooks/less/style.less") }}" type="text/css" />
<link rel="stylesheet/less" href="{{ static_url("notebooks/less/style.less") }}" type="text/css" />
{% else %}
<link rel="stylesheet" href="{{ static_url("ipython/notebooks/css/style.min.css") }}" type="text/css"/>
<link rel="stylesheet" href="{{ static_url("notebooks/css/style.min.css") }}" type="text/css"/>
{% endif %}
{% endblock lesscss%}
@ -202,7 +202,7 @@ class="notebook_app"
<script src="{{ static_url("components/codemirror/addon/mode/loadmode.js") }}" charset="utf-8"></script>
<script src="{{ static_url("components/codemirror/addon/mode/multiplex.js") }}" charset="utf-8"></script>
<script src="{{ static_url("components/codemirror/addon/mode/overlay.js") }}" charset="utf-8"></script>
<script src="{{ static_url("ipython/notebooks/js/codemirror-ipython.js") }}" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/codemirror-ipython.js") }}" charset="utf-8"></script>
<script src="{{ static_url("components/codemirror/mode/htmlmixed/htmlmixed.js") }}" charset="utf-8"></script>
<script src="{{ static_url("components/codemirror/mode/xml/xml.js") }}" charset="utf-8"></script>
<script src="{{ static_url("components/codemirror/mode/javascript/javascript.js") }}" charset="utf-8"></script>
@ -216,33 +216,33 @@ class="notebook_app"
<script src="{{ static_url("dateformat/date.format.js") }}" charset="utf-8"></script>
<script src="{{ static_url("ipython/base/js/events.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("ipython/base/js/utils.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/layoutmanager.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/mathjaxutils.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/outputarea.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/cell.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/celltoolbar.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/codecell.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/completer.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/textcell.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/kernel.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/savewidget.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/quickhelp.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/pager.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/menubar.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/toolbar.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/maintoolbar.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/notebook.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/notificationwidget.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/notificationarea.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/tooltip.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/config.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/notebookmain.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("base/js/events.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("base/js/utils.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/layoutmanager.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/mathjaxutils.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/outputarea.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/cell.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/celltoolbar.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/codecell.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/completer.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/textcell.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("kernels/js/kernel.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/savewidget.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/quickhelp.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/pager.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/menubar.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/toolbar.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/maintoolbar.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/notebook.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/notificationwidget.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/notificationarea.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/tooltip.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/config.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/notebookmain.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/contexthint.js") }}" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/contexthint.js") }}" charset="utf-8"></script>
<script src="{{ static_url("js/celltoolbarpresets/default.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("js/celltoolbarpresets/slideshow.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/celltoolbarpresets/default.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{ static_url("notebooks/js/celltoolbarpresets/slideshow.js") }}" type="text/javascript" charset="utf-8"></script>
{% endblock %}

View File

@ -12,7 +12,7 @@
<title>{% block title %}IPython Notebook{% endblock %}</title>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<link rel="stylesheet" href="{{static_url("jquery/css/themes/base/jquery-ui.min.css") }}" type="text/css" />
<link rel="stylesheet" href="{{static_url("ipython/base/css/boilerplate.css") }}" type="text/css" />
<link rel="stylesheet" href="{{static_url("base/css/boilerplate.css") }}" type="text/css" />
{% block stylesheet %}
{% block lesscss %}
{% endblock lesscss%}
@ -28,7 +28,7 @@
<body {% block params %}{% endblock %}>
<div id="header">
<span id="ipython_notebook"><div><a href="{{base_project_url}}" alt='dashboard'><img src='{{static_url("ipynblogo.png") }}' alt='IPython Notebook'/></a></div></span>
<span id="ipython_notebook"><div><a href="{{base_project_url}}" alt='dashboard'><img src='{{static_url("base/images/ipynblogo.png") }}' alt='IPython Notebook'/></a></div></span>
{% block login_widget %}
@ -53,9 +53,9 @@
<script src="{{static_url("jquery/js/jquery-1.7.1.min.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("jquery/js/jquery-ui.min.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("ipython/base/js/namespace.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("ipython/base/js/page.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("ipython/auth/js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("base/js/namespace.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("base/js/page.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("auth/js/loginwidget.js") }}" type="text/javascript" charset="utf-8"></script>
{% block script %}
{% if use_less %}

View File

@ -1,13 +1,15 @@
{% extends "base.html" %}
{% extends "page.html" %}
{% block title %}IPython Dashboard{% endblock %}
{% block stylesheet %}
{{super()}}
<link rel="stylesheet" href="{{static_url("css/alternateuploadform.css") }}" type="text/css" />
<link rel="stylesheet" href="{{static_url("css/style.min.css") }}" type="text/css" />
<link rel="stylesheet" href="{{static_url("css/projectdashboard.css") }}" type="text/css" />
{% endblock %}
{% block lesscss %}
{% if use_less %}
<link rel="stylesheet/less" href="{{ static_url("tree/less/style.less") }}" type="text/css" />
{% else %}
<link rel="stylesheet" href="{{ static_url("tree/css/style.min.css") }}" type="text/css"/>
{% endif %}
{% endblock lesscss%}
{% block params %}
@ -84,7 +86,7 @@ data-read-only={{read_only}}
{% block script %}
{{super()}}
<script src="{{static_url("js/notebooklist.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("js/clusterlist.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("js/projectdashboardmain.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("tree/js/notebooklist.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("tree/js/clusterlist.js") }}" type="text/javascript" charset="utf-8"></script>
<script src="{{static_url("tree/js/projectdashboardmain.js") }}" type="text/javascript" charset="utf-8"></script>
{% endblock %}