From: Mark Otto Date: Tue, 2 Jul 2013 03:06:16 +0000 (-0700) Subject: Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip... X-Git-Tag: v3.0.0-rc1~193 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a049dcb7f60def107be3a141de811e5a875e8049;p=thirdparty%2Fbootstrap.git Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-responsive-tables Conflicts: less/mixins.less --- a049dcb7f60def107be3a141de811e5a875e8049 diff --cc docs/assets/css/bootstrap.css index 6a426850af,708ea42ead..90482621e3 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@@ -4696,7 -4768,14 +4765,16 @@@ td.hidden-lg .visible-print { display: none !important; } + + tr.visible-print { + display: none !important; + } ++ + th.visible-print, + td.visible-print { + display: none !important; + } + @media print { .visible-print { display: block !important; @@@ -4711,4 -4790,4 +4789,11 @@@ .hidden-print { display: none !important; } ++ tr.hidden-print { ++ display: none !important; ++ } ++ th.hidden-print, ++ td.hidden-print { ++ display: none !important; ++ } } diff --cc less/mixins.less index 127bc14d7a,3161a845fa..eb05623ac9 --- a/less/mixins.less +++ b/less/mixins.less @@@ -411,6 -411,15 +411,13 @@@ td& { display: table-cell !important; } } + .responsive-invisibility() { + display: none !important; + tr& { display: none !important; } + th&, + td& { display: none !important; } + } + - - // Grid System // -----------