From 121ecb1913f2716ed95af330fe7d53d65c5709ce Mon Sep 17 00:00:00 2001
From: "Brian E. Granger" <ellisonbg@gmail.com>
Date: Thu, 16 May 2013 11:35:56 -0700
Subject: [PATCH] Going back to a single style.less and style.min.css.

---
 .../html/notebook/static/auth/less/style.less |  4 ----
 .../notebook/static/notebooks/less/style.less |  7 ------
 .../static/notebooks/less/variables.less      |  4 +---
 .../html/notebook/static/style/style.less     | 24 +++++++++++++++++++
 .../html/notebook/static/tree/less/style.less |  4 ----
 5 files changed, 25 insertions(+), 18 deletions(-)
 delete mode 100644 IPython/frontend/html/notebook/static/auth/less/style.less
 delete mode 100644 IPython/frontend/html/notebook/static/notebooks/less/style.less
 create mode 100644 IPython/frontend/html/notebook/static/style/style.less
 delete mode 100644 IPython/frontend/html/notebook/static/tree/less/style.less

diff --git a/IPython/frontend/html/notebook/static/auth/less/style.less b/IPython/frontend/html/notebook/static/auth/less/style.less
deleted file mode 100644
index 464f817a5..000000000
--- a/IPython/frontend/html/notebook/static/auth/less/style.less
+++ /dev/null
@@ -1,4 +0,0 @@
-@import "../../base/less/base.less";
-@import "variables.less";
-@import "login.less";
-@import "logout.less";
diff --git a/IPython/frontend/html/notebook/static/notebooks/less/style.less b/IPython/frontend/html/notebook/static/notebooks/less/style.less
deleted file mode 100644
index 1dd538c27..000000000
--- a/IPython/frontend/html/notebook/static/notebooks/less/style.less
+++ /dev/null
@@ -1,7 +0,0 @@
-@import "../../base/less/base.less";
-@import "variables.less";
-@import "notebook.less";
-@import "renderedhtml.less";
-@import "tooltip.less";
-@import "celltoolbar.less";
-@import "highlight.less";
diff --git a/IPython/frontend/html/notebook/static/notebooks/less/variables.less b/IPython/frontend/html/notebook/static/notebooks/less/variables.less
index b4c18fece..4a63350e7 100644
--- a/IPython/frontend/html/notebook/static/notebooks/less/variables.less
+++ b/IPython/frontend/html/notebook/static/notebooks/less/variables.less
@@ -1,7 +1,5 @@
-// Bootstrap customizations specific to this page.
 
-
-// Our own global variables for this page
+// Our own variables for this page
 
 @notebook_background: 			white;
 @cell_selected_background: 		darken(@notebook_background, 2%);
diff --git a/IPython/frontend/html/notebook/static/style/style.less b/IPython/frontend/html/notebook/static/style/style.less
new file mode 100644
index 000000000..6f9bb9925
--- /dev/null
+++ b/IPython/frontend/html/notebook/static/style/style.less
@@ -0,0 +1,24 @@
+// Bootstrap
+@import "../../components/bootstrap/less/bootstrap.less";
+
+// base
+@import "variables.less";
+@import "mixins.less";
+@import "flexbox.less";
+@import "page.less";
+
+// auth
+@import "login.less";
+@import "logout.less";
+
+// notebooks
+@import "notebook.less";
+@import "renderedhtml.less";
+@import "tooltip.less";
+@import "celltoolbar.less";
+@import "highlight.less";
+
+// tree
+@import "variables.less";
+@import "altuploadform.less";
+@import "tree.less";
\ No newline at end of file
diff --git a/IPython/frontend/html/notebook/static/tree/less/style.less b/IPython/frontend/html/notebook/static/tree/less/style.less
deleted file mode 100644
index d8596179e..000000000
--- a/IPython/frontend/html/notebook/static/tree/less/style.less
+++ /dev/null
@@ -1,4 +0,0 @@
-@import "../../base/less/base.less";
-@import "variables.less";
-@import "altuploadform.less";
-@import "tree.less";
\ No newline at end of file