diff options
| author | Mark Otto <[email protected]> | 2012-07-29 16:51:24 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-07-29 16:51:24 -0700 |
| commit | 22a9a8365640cd8b09ee50580e7220e6d1d60e33 (patch) | |
| tree | 7920019b25129e6cd6bebba31b143bb88fb9e1e6 | |
| parent | d63ebe3f3c885be05d93a1133d6feaa5be302536 (diff) | |
| download | bootstrap-22a9a8365640cd8b09ee50580e7220e6d1d60e33.tar.xz bootstrap-22a9a8365640cd8b09ee50580e7220e6d1d60e33.zip | |
fixes #3694: provide override classes for .hide and .pull-right for grid columns
| -rw-r--r-- | docs/assets/css/bootstrap.css | 10 | ||||
| -rw-r--r-- | less/grid.less | 13 |
2 files changed, 22 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 707f5d6dd..d94a02943 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 b63005c68..750d20351 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; +} |