From: Mark Otto <markotto@twitter.com>
Date: Sun, 29 Jul 2012 23:51:24 +0000 (-0700)
Subject: fixes #3694: provide override classes for .hide and .pull-right for grid columns
X-Git-Tag: v2.1.0~2^2~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22a9a8365640cd8b09ee50580e7220e6d1d60e33;p=thirdparty%2Fbootstrap.git

fixes #3694: provide override classes for .hide and .pull-right for grid columns
---

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 707f5d6ddc..d94a029436 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -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;
diff --git a/less/grid.less b/less/grid.less
index b63005c684..750d203514 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -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;
+}