0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

Merge branch 'master' into drop_recess_for_less

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto 2013-12-08 23:00:01 -08:00
commit 2a4621b71f
3 changed files with 12 additions and 5 deletions

View File

@ -6116,6 +6116,8 @@ td.visible-print {
td.visible-print {
display: table-cell !important;
}
}
@media print {
.hidden-print,
tr.hidden-print,
th.hidden-print,

File diff suppressed because one or more lines are too long

View File

@ -194,16 +194,21 @@
}
}
// Print utilities
//
// Media queries are placed on the inside to be mixin-friendly.
.visible-print {
.responsive-invisibility();
}
@media print {
.visible-print {
@media print {
.responsive-visibility();
}
.hidden-print {
}
.hidden-print {
@media print {
.responsive-invisibility();
}
}