]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
fixes #3694: provide override classes for .hide and .pull-right for grid columns
authorMark Otto <markotto@twitter.com>
Sun, 29 Jul 2012 23:51:24 +0000 (16:51 -0700)
committerMark Otto <markotto@twitter.com>
Sun, 29 Jul 2012 23:51:24 +0000 (16:51 -0700)
docs/assets/css/bootstrap.css
less/grid.less

index 707f5d6ddcb57146c6c8d54225ccee2f15b49e1d..d94a0294360aa65330848eb2637240d1d0e87bcd 100644 (file)
@@ -532,6 +532,16 @@ a:hover {
   *margin-left: 8.404255319148938%;
 }
 
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+  display: none;
+}
+
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+  float: right;
+}
+
 .container {
   margin-right: auto;
   margin-left: auto;
index b63005c684e182024da87bb70644b45a44136d1e..750d20351498f75e2f3dec9e588bbcbc91645bb6 100644 (file)
@@ -7,4 +7,15 @@
 #grid > .core(@gridColumnWidth, @gridGutterWidth);
 
 // Fluid (940px)
-#grid > .fluid(@fluidGridColumnWidth, @fluidGridGutterWidth);
\ No newline at end of file
+#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;
+}