]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip...
authorMark Otto <otto@github.com>
Tue, 2 Jul 2013 03:06:16 +0000 (20:06 -0700)
committerMark Otto <otto@github.com>
Tue, 2 Jul 2013 03:06:16 +0000 (20:06 -0700)
Conflicts:
less/mixins.less

1  2 
docs/assets/css/bootstrap.css
less/mixins.less

index 6a426850afd320faab501e692b319b9c22a14cc4,708ea42eada63ef343141b2548ff4166fa16131c..90482621e32234d279c01172a38f2cec52ab6f30
@@@ -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;
    .hidden-print {
      display: none !important;
    }
++  tr.hidden-print {
++    display: none !important;
++  }
++  th.hidden-print,
++  td.hidden-print {
++    display: none !important;
++  }
  }
index 127bc14d7a4226426509a316fab71c13328ea222,3161a845fa11be46a0dbc2e9f2920374755150b3..eb05623ac93bfb16220ab989aed92c9757344f20
    td& { display: table-cell !important; }
  }
  
 -
 -
+ .responsive-invisibility() {
+   display: none !important;
+   tr& { display: none !important; }
+   th&,
+   td& { display: none !important; }
+ }
  // Grid System
  // -----------