mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-29 21:52:22 +01:00
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
This commit is contained in:
commit
a049dcb7f6
85
docs/assets/css/bootstrap.css
vendored
85
docs/assets/css/bootstrap.css
vendored
@ -4575,14 +4575,41 @@ td.visible-sm {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
tr.visible-md {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
th.visible-md,
|
||||
td.visible-md {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.visible-lg {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
tr.visible-lg {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
th.visible-lg,
|
||||
td.visible-lg {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.hidden-sm {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
tr.hidden-sm {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
th.hidden-sm,
|
||||
td.hidden-sm {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.hidden-md {
|
||||
display: block !important;
|
||||
}
|
||||
@ -4613,6 +4640,13 @@ td.hidden-lg {
|
||||
.visible-sm {
|
||||
display: none !important;
|
||||
}
|
||||
tr.visible-sm {
|
||||
display: none !important;
|
||||
}
|
||||
th.visible-sm,
|
||||
td.visible-sm {
|
||||
display: none !important;
|
||||
}
|
||||
.visible-md {
|
||||
display: block !important;
|
||||
}
|
||||
@ -4626,6 +4660,13 @@ td.hidden-lg {
|
||||
.visible-lg {
|
||||
display: none !important;
|
||||
}
|
||||
tr.visible-lg {
|
||||
display: none !important;
|
||||
}
|
||||
th.visible-lg,
|
||||
td.visible-lg {
|
||||
display: none !important;
|
||||
}
|
||||
.hidden-sm {
|
||||
display: block !important;
|
||||
}
|
||||
@ -4639,6 +4680,13 @@ td.hidden-lg {
|
||||
.hidden-md {
|
||||
display: none !important;
|
||||
}
|
||||
tr.hidden-md {
|
||||
display: none !important;
|
||||
}
|
||||
th.hidden-md,
|
||||
td.hidden-md {
|
||||
display: none !important;
|
||||
}
|
||||
.hidden-lg {
|
||||
display: block !important;
|
||||
}
|
||||
@ -4655,9 +4703,23 @@ td.hidden-lg {
|
||||
.visible-sm {
|
||||
display: none !important;
|
||||
}
|
||||
tr.visible-sm {
|
||||
display: none !important;
|
||||
}
|
||||
th.visible-sm,
|
||||
td.visible-sm {
|
||||
display: none !important;
|
||||
}
|
||||
.visible-md {
|
||||
display: none !important;
|
||||
}
|
||||
tr.visible-md {
|
||||
display: none !important;
|
||||
}
|
||||
th.visible-md,
|
||||
td.visible-md {
|
||||
display: none !important;
|
||||
}
|
||||
.visible-lg {
|
||||
display: block !important;
|
||||
}
|
||||
@ -4691,12 +4753,28 @@ td.hidden-lg {
|
||||
.hidden-lg {
|
||||
display: none !important;
|
||||
}
|
||||
tr.hidden-lg {
|
||||
display: none !important;
|
||||
}
|
||||
th.hidden-lg,
|
||||
td.hidden-lg {
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
.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 +4789,11 @@ td.hidden-lg {
|
||||
.hidden-print {
|
||||
display: none !important;
|
||||
}
|
||||
tr.hidden-print {
|
||||
display: none !important;
|
||||
}
|
||||
th.hidden-print,
|
||||
td.hidden-print {
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
|
@ -411,6 +411,13 @@
|
||||
td& { display: table-cell !important; }
|
||||
}
|
||||
|
||||
.responsive-invisibility() {
|
||||
display: none !important;
|
||||
tr& { display: none !important; }
|
||||
th&,
|
||||
td& { display: none !important; }
|
||||
}
|
||||
|
||||
// Grid System
|
||||
// -----------
|
||||
|
||||
|
@ -39,10 +39,16 @@
|
||||
.visible-sm {
|
||||
.responsive-visibility();
|
||||
}
|
||||
.visible-md { display: none !important; }
|
||||
.visible-lg { display: none !important; }
|
||||
.visible-md {
|
||||
.responsive-invisibility();
|
||||
}
|
||||
.visible-lg {
|
||||
.responsive-invisibility();
|
||||
}
|
||||
|
||||
.hidden-sm { display: none !important; }
|
||||
.hidden-sm {
|
||||
.responsive-invisibility();
|
||||
}
|
||||
.hidden-md {
|
||||
.responsive-visibility();
|
||||
}
|
||||
@ -53,16 +59,22 @@
|
||||
|
||||
// Tablets & small desktops only
|
||||
@media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) {
|
||||
.visible-sm { display: none !important; }
|
||||
.visible-sm {
|
||||
.responsive-invisibility();
|
||||
}
|
||||
.visible-md {
|
||||
.responsive-visibility();
|
||||
}
|
||||
.visible-lg { display: none !important; }
|
||||
.visible-lg {
|
||||
.responsive-invisibility();
|
||||
}
|
||||
|
||||
.hidden-sm {
|
||||
.responsive-visibility();
|
||||
}
|
||||
.hidden-md { display: none !important; }
|
||||
.hidden-md {
|
||||
.responsive-invisibility();
|
||||
}
|
||||
.hidden-lg {
|
||||
.responsive-visibility();
|
||||
}
|
||||
@ -70,8 +82,12 @@
|
||||
|
||||
// For desktops
|
||||
@media (min-width: @screen-desktop) {
|
||||
.visible-sm { display: none !important; }
|
||||
.visible-md { display: none !important; }
|
||||
.visible-sm {
|
||||
.responsive-invisibility();
|
||||
}
|
||||
.visible-md {
|
||||
.responsive-invisibility();
|
||||
}
|
||||
.visible-lg {
|
||||
.responsive-visibility();
|
||||
}
|
||||
@ -82,16 +98,22 @@
|
||||
.hidden-md {
|
||||
.responsive-visibility();
|
||||
}
|
||||
.hidden-lg { display: none !important; }
|
||||
.hidden-lg {
|
||||
.responsive-invisibility();
|
||||
}
|
||||
}
|
||||
|
||||
// Print utilities
|
||||
.visible-print { display: none !important; }
|
||||
.visible-print {
|
||||
.responsive-invisibility();
|
||||
}
|
||||
.hidden-print { }
|
||||
|
||||
@media print {
|
||||
.visible-print {
|
||||
.responsive-visibility();
|
||||
}
|
||||
.hidden-print { display: none !important; }
|
||||
.hidden-print {
|
||||
.responsive-invisibility();
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user