mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-responsive-tables

Browse Source 
Conflicts:
	less/mixins.less
This commit is contained in:
Mark Otto
2013-07-01 20:06:16 -07:00
parent 9ed9fba460 fea69df80c
commit a049dcb7f6
3 changed files with 126 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/mixins.less
+7
View File
@@ -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
// -----------
less/responsive-utilities.less
+34 -12
View File
@@ -36,13 +36,19 @@
// Visibility utilities
// For Phones
.visible-sm {
.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();
}
}