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:
commit
2a4621b71f
2
dist/css/bootstrap.css
vendored
2
dist/css/bootstrap.css
vendored
@ -6116,6 +6116,8 @@ td.visible-print {
|
||||
td.visible-print {
|
||||
display: table-cell !important;
|
||||
}
|
||||
}
|
||||
@media print {
|
||||
.hidden-print,
|
||||
tr.hidden-print,
|
||||
th.hidden-print,
|
||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -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();
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user