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

Merge branch 'master' into drop_recess_for_less

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-12-08 23:00:01 -08:00
parent e4c1ef7c6d 6df909ad9b
commit 2a4621b71f
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/css/bootstrap.css
Vendored
+2
View File
@@ -6116,6 +6116,8 @@ td.visible-print {
td.visible-print { td.visible-print {
display: table-cell !important; display: table-cell !important;
} }
}
@media print {
.hidden-print, .hidden-print,
tr.hidden-print, tr.hidden-print,
th.hidden-print, th.hidden-print,
dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
less/responsive-utilities.less
+9 -4
View File
@@ -194,16 +194,21 @@
} }
} }
// Print utilities // Print utilities
//
// Media queries are placed on the inside to be mixin-friendly.
.visible-print { .visible-print {
.responsive-invisibility(); .responsive-invisibility();
}
@media print { @media print {
.visible-print {
.responsive-visibility(); .responsive-visibility();
} }
.hidden-print { }
.hidden-print {
@media print {
.responsive-invisibility(); .responsive-invisibility();
} }
} }