From 5bc82b2dbf4fccfd6b73c226deac8c9437370110 2013-01-26 10:05:35
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: 2013-01-26 10:05:35
Subject: [PATCH] use bootstrap as component with bower

---

diff --git a/IPython/frontend/html/notebook/static/component.json b/IPython/frontend/html/notebook/static/component.json
new file mode 100644
index 0000000..e7f0fea
--- /dev/null
+++ b/IPython/frontend/html/notebook/static/component.json
@@ -0,0 +1,8 @@
+{
+  "name": "ipython-notebook",
+  "version": "0.0.1",
+  "dependencies": {
+    "bootstrap": "~2.2.2",
+    "codemirror": "codemirror"
+  }
+}
diff --git a/IPython/frontend/html/notebook/static/less/bootstrap-custom.less b/IPython/frontend/html/notebook/static/less/bootstrap-custom.less
new file mode 100644
index 0000000..beb5928
--- /dev/null
+++ b/IPython/frontend/html/notebook/static/less/bootstrap-custom.less
@@ -0,0 +1,63 @@
+/*!
+ * Bootstrap v2.2.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+// CSS Reset
+@import "../components/bootstrap/less/reset.less";
+
+// Core variables and mixins
+@import "../components/bootstrap/less/variables.less"; // Modify this for custom colors, font-sizes, etc
+@import "../components/bootstrap/less/mixins.less";
+
+// Grid system and page structure
+@import "../components/bootstrap/less/scaffolding.less";
+@import "../components/bootstrap/less/grid.less";
+@import "../components/bootstrap/less/layouts.less";
+
+// Base CSS
+@import "../components/bootstrap/less/type.less";
+//@import "../components/bootstrap/less/code.less";
+@import "../components/bootstrap/less/forms.less";
+@import "../components/bootstrap/less/tables.less";
+
+// Components: common
+@import "../components/bootstrap/less/sprites.less";
+@import "../components/bootstrap/less/dropdowns.less";
+@import "../components/bootstrap/less/wells.less";
+@import "../components/bootstrap/less/component-animations.less";
+@import "../components/bootstrap/less/close.less";
+
+// Components: Buttons & Alerts
+@import "../components/bootstrap/less/buttons.less";
+@import "../components/bootstrap/less/button-groups.less";
+@import "../components/bootstrap/less/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
+
+// Components: Nav
+@import "../components/bootstrap/less/navs.less";
+@import "../components/bootstrap/less/navbar.less";
+@import "../components/bootstrap/less/breadcrumbs.less";
+@import "../components/bootstrap/less/pagination.less";
+@import "../components/bootstrap/less/pager.less";
+
+// Components: Popovers
+@import "../components/bootstrap/less/modals.less";
+@import "../components/bootstrap/less/tooltip.less";
+@import "../components/bootstrap/less/popovers.less";
+
+// Components: Misc
+@import "../components/bootstrap/less/thumbnails.less";
+@import "../components/bootstrap/less/media.less";
+@import "../components/bootstrap/less/labels-badges.less";
+@import "../components/bootstrap/less/progress-bars.less";
+@import "../components/bootstrap/less/accordion.less";
+@import "../components/bootstrap/less/carousel.less";
+@import "../components/bootstrap/less/hero-unit.less";
+
+// Utility classes
+@import "../components/bootstrap/less/utilities.less"; // Has to be last to override when necessary
diff --git a/IPython/frontend/html/notebook/static/less/style.less b/IPython/frontend/html/notebook/static/less/style.less
index 7979ae8..dc903ec 100644
--- a/IPython/frontend/html/notebook/static/less/style.less
+++ b/IPython/frontend/html/notebook/static/less/style.less
@@ -4,4 +4,4 @@
 @import "renderedhtml.less";
 @import "tooltip.less";
 @import "variables.less";
-@import "../components/bootstrap/less/bootstrap";
+@import "bootstrap-custom";