make file and other less

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

@@ -1,3 +1,4 @@
+@import "flexible-box-model.less";
 @import "notebook.less";
 @import "printnotebook.less";
 @import "renderedhtml.less";

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

@@ -19,13 +19,9 @@ window.mathjax_url = "{{mathjax_url}}";
 <link rel="stylesheet" href="{{ static_url("css/celltoolbar.css") }}" type="text/css" />
 
 {% if use_less %}
-	<link rel="stylesheet/less" href="{{ static_url("less/notebook.less") }}" type="text/css" />
-	<link rel="stylesheet/less" href="{{ static_url("less/tooltip.less") }}" type="text/css" />
-	<link rel="stylesheet/less" href="{{ static_url("less/renderedhtml.less") }}" type="text/css" />
-
-	<link rel="stylesheet/less" href="{{ static_url("less/printnotebook.less") }}" type="text/css"/>
+    <link rel="stylesheet/less" href="{{ static_url("less/style.less") }}" type="text/css" />
 {% else %}
-	<link rel="stylesheet" href="{{ static_url("css/style.min.css") }}" type="text/css"/>
+    <link rel="stylesheet" href="{{ static_url("css/style.min.css") }}" type="text/css"/>
 {% endif %}
 
 {% endblock %}

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

@@ -13,7 +13,6 @@
     <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("css/boilerplate.css") }}" type="text/css" />
-    <link rel="stylesheet" href="{{static_url("css/fbm.css") }}" type="text/css" />
     <link rel="stylesheet" href="{{static_url("css/page.css") }}" type="text/css"/>
     {% block stylesheet %}
     {% endblock %}

IPython/frontend/html/notebook/templates/projectdashboard.html

@@ -4,7 +4,8 @@
 
 {% block stylesheet %}
     <link rel="stylesheet" href="{{static_url("css/projectdashboard.css") }}" type="text/css" />
-	<link rel="stylesheet" href="{{static_url("css/alternateuploadform.css") }}" type="text/css" />
+    <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" />
 {% endblock %}