Merge master

2013-06-10 12:51:39 -05:00
parent 5e0b0a263e 4cd6cea04d
commit 273c2e3f72
76 changed files with 513 additions and 277 deletions
--- a/assets/less/bootstrap/grid.less
+++ b/assets/less/bootstrap/grid.less
@@ -0,0 +1,21 @@
+//
+// Grid system
+// --------------------------------------------------
+
+
+// Fixed (940px)
+#grid > .core(@gridColumnWidth, @gridGutterWidth);
+
+// Fluid (940px)
+#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
+
+// Reset utility classes due to specificity
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+  display: none;
+}
+
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+  float: right;
+}