Commit 2a4621b7 authored by Mark Otto's avatar Mark Otto

Merge branch 'master' into drop_recess_for_less

Conflicts:
	dist/css/bootstrap.min.css
parents e4c1ef7c 6df909ad
...@@ -6116,6 +6116,8 @@ td.visible-print { ...@@ -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,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -194,16 +194,21 @@ ...@@ -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();
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment