Updating fabfile and templates for global style.min.css.

IPython/frontend/html/notebook/fabfile.py

@@ -6,28 +6,20 @@ import os
 
 static_dir = 'static'
 components_dir = os.path.join(static_dir, 'components')
-to_compile = [
-    ('notebooks', 'style.less'),
-    ('tree', 'style.less'),
-    ('auth', 'style.less')
-]
 
 def css(minify=True):
     """generate the css from less files"""
-    for subdir, filename in to_compile:
-        _compile_less(subdir, filename, minify=minify)
+    source = os.path.join('style', 'style.less')
+    target = os.path.join('style', 'style.min.css')
+    _compile_less(source, target, minify)
 
-
-def _compile_less(subdir, filename, minify=True):
+def _compile_less(source, target, minify=True):
+    """Complie a less file by source and target relative to static_dir"""
     if minify not in ['True', 'False', True, False]:
         abort('minify must be Boolean')
     minify = (minify in ['True',True])
     min_flag= '-x' if minify is True else ''
     lessc = os.path.join('components', 'less.js', 'bin', 'lessc')
-
-    source = os.path.join(subdir, 'less', filename)
-    target = os.path.join(subdir, 'css', filename.replace('.less','.min.css'))
-    subdir = os.path.join(static_dir, subdir)
     with lcd(static_dir):
         local('{lessc} {min_flag} {source} {target}'.format(**locals()))
 

IPython/frontend/html/notebook/static/style/style.less

@@ -1,24 +1,23 @@
 // Bootstrap
-@import "../../components/bootstrap/less/bootstrap.less";
+@import "../components/bootstrap/less/bootstrap.less";
 
 // base
-@import "variables.less";
-@import "mixins.less";
-@import "flexbox.less";
-@import "page.less";
+@import "../base/less/variables.less";
+@import "../base/less/mixins.less";
+@import "../base/less/flexbox.less";
+@import "../base/less/page.less";
 
 // auth
-@import "login.less";
-@import "logout.less";
+@import "../auth/less/login.less";
+@import "../auth/less/logout.less";
 
 // notebooks
-@import "notebook.less";
-@import "renderedhtml.less";
-@import "tooltip.less";
-@import "celltoolbar.less";
-@import "highlight.less";
+@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";
 
 // tree
-@import "variables.less";
-@import "altuploadform.less";
-@import "tree.less";
+@import "../tree/less/altuploadform.less";
+@import "../tree/less/tree.less";

IPython/frontend/html/notebook/templates/login.html

@@ -1,13 +1,5 @@
 {% extends "page.html" %}
 
-{% 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 %}
 {% endblock %}

IPython/frontend/html/notebook/templates/logout.html

@@ -1,14 +1,5 @@
 {% extends "page.html" %}
 
-{% 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 %}
 {% endblock %}

IPython/frontend/html/notebook/templates/page.html

@@ -16,6 +16,11 @@
     <link rel="stylesheet" href="{{static_url("base/css/boilerplate.css") }}" type="text/css" />
     {% block stylesheet %}
     {% block lesscss %}
+	    {% if use_less %}
+	        <link rel="stylesheet/less" href="{{ static_url("style/style.less") }}" type="text/css" />
+	    {% else %}
+	        <link rel="stylesheet" href="{{ static_url("style/style.min.css") }}" type="text/css"/>
+	    {% endif %}
     {% endblock lesscss%}
     {% endblock %}
     <link rel="stylesheet" href="{{ static_url("user/css/custom.css") }}" type="text/css" />

IPython/frontend/html/notebook/templates/tree.html

@@ -2,15 +2,6 @@
 
 {% block title %}IPython Dashboard{% 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 %}