Hygiene: Merge skins.minerva.print.styles with skins.minerva.base.styles

We no longer need to keep this as a separate entry point now we do not
feature flag our print styles

Please enter the commit message for your changes. Lines starting

Change-Id: I6bf12980aa929e84f239931beb0a505809231830
This commit is contained in:
jdlrobson 2017-08-28 15:51:20 -05:00 committed by Jdlrobson
parent 98a77c7d16
commit c323c6858a
9 changed files with 31 additions and 42 deletions

View file

@ -317,8 +317,6 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin {
public function initPage( OutputPage $out ) {
parent::initPage( $out );
$styles = [];
// FIXME: Merge this module with skins.minerva.base.styles
$styles[] = 'skins.minerva.print.styles';
$out->addModuleStyles( $styles );
$out->addJsConfigVars( $this->getSkinConfigVariables() );

View file

@ -1,29 +0,0 @@
@media print {
.noprint,
.banner-container,
.header,
.pre-content,
.post-content {
display: none;
}
h1,
h2,
h3,
h4,
h5,
h6 {
page-break-after: avoid;
}
table,
figure,
img,
.lazy-image-placeholder {
page-break-inside: avoid;
}
img {
max-width: 100%;
}
}

View file

@ -1,3 +1,33 @@
@media print {
.noprint,
.banner-container,
.header,
.pre-content,
.post-content {
display: none;
}
h1,
h2,
h3,
h4,
h5,
h6 {
page-break-after: avoid;
}
table,
figure,
img,
.lazy-image-placeholder {
page-break-inside: avoid;
}
img {
max-width: 100%;
}
}
@media print and ( max-device-width: @deviceWidthTablet ) {
// Chrome: override the default margins and reveal the footer
// Experimental technology (see https://developer.mozilla.org/en-US/docs/Web/CSS/@page/size)

View file

@ -109,7 +109,7 @@
"resources/skins.minerva.base.styles/icons.less",
"resources/skins.minerva.base.styles/images.less",
"resources/skins.minerva.base.styles/footer.less",
"resources/skins.minerva.base.styles/print.less"
"resources/skins.minerva.base.styles/print/styles.less"
]
},
"skins.minerva.content.styles": {
@ -122,16 +122,6 @@
"resources/skins.minerva.content.styles/styles.less"
]
},
"skins.minerva.print.styles": {
"targets": [
"mobile",
"desktop"
],
"position": "top",
"styles": [
"resources/skins.minerva.print.styles/styles.less"
]
},
"skins.minerva.tablet.styles": {
"targets": [
"mobile",