jenkins-bot has submitted this change and it was merged. Change subject: Align to CSS coding guidelines and fix CSSLint errors & warnings ......................................................................
Align to CSS coding guidelines and fix CSSLint errors & warnings Fixes included are: - Coding guidelines: align colors - Coding guidelines: put every selector of combined selectors on one line - Coding guidelines: use `border: 0` instead of `border: none` and put border shortcut structure into same order across selectors for better gzipping - Coding guidelines: whitespace in parenthesis - CSSLint: disable applying `margin` for inline elements - General: clean-up comments - General: join pagination and 'Generic HTML elements'' rules - General: add `word-wrap: break-word` to `pre, .mw-code` selector to aggressively wrap long words - General: swap `1px` border values with `1pt` - General: integrate `word-wrap: break-word` on `.external` links with possible overlong URLs - General: do the `list-style` shorthand property right. Bug: T120154 Change-Id: I29bf055e2b4fc0e26ce84243f6b612b4a6214b02 --- M resources/src/mediawiki.legacy/commonPrint.css 1 file changed, 83 insertions(+), 83 deletions(-) Approvals: Jdlrobson: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/src/mediawiki.legacy/commonPrint.css b/resources/src/mediawiki.legacy/commonPrint.css index 3e6ee56..975ec2a 100644 --- a/resources/src/mediawiki.legacy/commonPrint.css +++ b/resources/src/mediawiki.legacy/commonPrint.css @@ -1,12 +1,10 @@ /** - * MediaWiki Print style sheet for CSS2-capable browsers. - * Copyright Gabriel Wicke, http://www.aulinx.de/ + * MediaWiki print style sheet + * Largely based on work by Gabriel Wicke * - * Derived from the plone (http://plone.org/) styles + * Originally derived from Plone (https://plone.org/) styles * Copyright Alexander Limi */ - -/* Thanks to A List Apart (http://alistapart.com/) for useful extras */ /** * Hide all the elements irrelevant for printing @@ -18,73 +16,83 @@ div#column-one, .mw-editsection, .mw-editsection-like, -div#f-poweredbyico, -div#f-copyrightico, -li#about, -li#disclaimer, -li#mobileview, -li#privacy, #footer-places, .mw-hidden-catlinks, .usermessage, .patrollink, .ns-0 .mw-redirectedfrom, +div.magnify, #mw-navigation, -#siteNotice { +#siteNotice, +/* Deprecated, changed in core */ +div#f-poweredbyico, +div#f-copyrightico, +li#about, +li#disclaimer, +li#mobileview, +li#privacy { display: none; -} - -/** - * Pagination - */ -.wikitable, .thumb, img { - page-break-inside: avoid; -} - -h2, h3, h4, h5, h6 { - page-break-after: avoid; -} - -p { - widows: 3; - orphans: 3; } /** * Generic HTML elements */ body { - background: white; - color: black; + background: #fff; + color: #000; margin: 0; padding: 0; } -ul { - list-style-type: square; -} - -h1, h2, h3, h4, h5, h6 { +h1, +h2, +h3, +h4, +h5, +h6 { font-weight: bold; + /* Pagination */ + page-break-after: avoid; } dt { font-weight: bold; } +ul { + list-style-type: square; +} + p { margin: 1em 0; line-height: 1.2em; + /* Pagination */ + orphans: 3; + widows: 3; } -pre, .mw-code { - border: 1pt dashed black; - white-space: pre; - font-size: 8pt; - overflow: auto; +pre, +.mw-code { + background: #fff; + color: #000; + border: 1pt dashed #000; padding: 1em 0; - background: white; - color: black; + font-size: 8pt; + white-space: pre; + word-wrap: break-word; + overflow: auto; +} + +img, +.wikitable, +.thumb { + /* Pagination */ + page-break-inside: avoid; +} + +img { + border: 0; + vertical-align: middle; } /** @@ -96,12 +104,12 @@ } .mw-body { - background: white; - border: none !important; + background: #fff; + color: #000; + border: 0 !important; padding: 0 !important; margin: 0 !important; direction: ltr; - color: black; } #column-content { @@ -114,8 +122,8 @@ } #toc { - border: 1px solid #aaaaaa; background-color: #f9f9f9; + border: 1pt solid #aaa; padding: 5px; display: table; } @@ -145,16 +153,11 @@ } #footer { - background: white; - color: black; + background: #fff; + color: #000; margin-top: 1em; - border-top: 1px solid #AAA; + border-top: 1pt solid #aaa; direction: ltr; -} - -img { - border: none; - vertical-align: middle; } /** @@ -168,13 +171,14 @@ /* Expand URLs for printing */ .mw-body a.external.text:after, .mw-body a.external.autonumber:after { - content: " (" attr(href) ")"; + content: " (" attr( href ) ")"; + word-wrap: break-word; } /* Expand protocol-relative URLs for printing */ .mw-body a.external.text[href^='//']:after, .mw-body a.external.autonumber[href^='//']:after { - content: " (https:" attr(href) ")"; + content: " (https:" attr( href ) ")"; } /* MSIE/Win doesn't understand 'inherit' */ @@ -182,7 +186,7 @@ a.external, a.new, a.stub { - color: black !important; + color: #000 !important; text-decoration: none !important; } @@ -230,23 +234,23 @@ * Thumbnails */ div.thumb { - border: none; + background-color: transparent; + border: 0; width: auto; margin-top: 0.5em; margin-bottom: 0.8em; - background-color: transparent; } div.thumbinner { - border: 1px solid #cccccc; + background-color: #fff; + border: 1pt solid #ccc; padding: 3px !important; - background-color: White; font-size: 94%; text-align: center; } html .thumbimage { - border: 1px solid #cccccc; + border: 1pt solid #ccc; } html .thumbcaption { @@ -257,10 +261,6 @@ font-size: 94%; overflow: hidden; word-wrap: break-word; -} - -div.magnify { - display: none; } /* @noflip */ @@ -278,7 +278,7 @@ } img.thumbborder { - border: 1px solid #dddddd; + border: 1pt solid #ddd; } /** @@ -287,25 +287,28 @@ */ table.wikitable, table.mw_metadata { + background: #fff; margin: 1em 0; - border: 1px #aaa solid; - background: white; + border: 1pt solid #aaa; border-collapse: collapse; } -table.wikitable > tr > th, table.wikitable > tr > td, -table.wikitable > * > tr > th, table.wikitable > * > tr > td, -.mw_metadata th, .mw_metadata td { - border: 1px #aaa solid; +table.wikitable > tr > th, +table.wikitable > tr > td, +table.wikitable > * > tr > th, +table.wikitable > * > tr > td, +.mw_metadata th, +.mw_metadata td { + border: 1pt solid #aaa; padding: 0.2em; } table.wikitable > tr > th, table.wikitable > * > tr > th, .mw_metadata th { - text-align: center; - background: white; + background: #fff; font-weight: bold; + text-align: center; } table.wikitable > caption, @@ -315,7 +318,7 @@ table.listing, table.listing td { - border: 1pt solid black; + border: 1pt solid #000; border-collapse: collapse; } @@ -328,26 +331,23 @@ */ .catlinks ul { display: inline; - margin: 0; padding: 0; - list-style: none; - list-style-type: none; - list-style-image: none; + list-style: none none; } .catlinks li { display: inline-block; line-height: 1.15em; padding: 0 .4em; - border-left: 1px solid #AAA; + border-left: 1pt solid #aaa; margin: 0.1em 0; } .catlinks li:first-child { padding-left: .2em; - border-left: none; + border-left: 0; } .printfooter { - padding: 1em 0 1em 0; + padding: 1em 0; } -- To view, visit https://gerrit.wikimedia.org/r/256619 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I29bf055e2b4fc0e26ce84243f6b612b4a6214b02 Gerrit-PatchSet: 8 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: VolkerE <[email protected]> Gerrit-Reviewer: Bartosz Dziewoński <[email protected]> Gerrit-Reviewer: Edokter <[email protected]> Gerrit-Reviewer: Fomafix Gerrit-Reviewer: GWicke <[email protected]> Gerrit-Reviewer: Jack Phoenix <[email protected]> Gerrit-Reviewer: Jdlrobson <[email protected]> Gerrit-Reviewer: TheDJ <[email protected]> Gerrit-Reviewer: VolkerE <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
