From 42bfc8ff7eb46f5bccf3fadf6d9f98a8f2c0c30a Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Fri, 3 Mar 2017 21:07:27 +0000 Subject: [PATCH] Change mw-body ancestor selector to mw-body-content mw-body-content can be applied to other elements on the page, such as content snippets in global overlays. The mw-body class applies layout styles and so can't be used in this way. Bug: T155863 Bug: T159578 Depends-On: I036d4def3f61d4a604c804c5368d74ec74883d2e Depends-On: Id3b89933ed49b6f1395ca407ebf167ad4c55c81f Change-Id: If2ea04d32677e2c33a6a10213f80f472bb72f440 --- .../src/mediawiki.legacy/commonPrint.css | 8 +-- .../content.externallinks.css | 68 +++++++++---------- resources/src/mediawiki.skinning/elements.css | 16 ++--- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/resources/src/mediawiki.legacy/commonPrint.css b/resources/src/mediawiki.legacy/commonPrint.css index b047f626c5..e3e80d858c 100644 --- a/resources/src/mediawiki.legacy/commonPrint.css +++ b/resources/src/mediawiki.legacy/commonPrint.css @@ -169,16 +169,16 @@ a { } /* Expand URLs for printing */ -.mw-body a.external.text:after, -.mw-body a.external.autonumber:after { +.mw-body-content a.external.text:after, +.mw-body-content a.external.autonumber:after { content: ' (' attr( href ) ')'; word-break: break-all; word-wrap: break-word; } /* Expand protocol-relative URLs for printing */ -.mw-body a.external.text[href^='//']:after, -.mw-body a.external.autonumber[href^='//']:after { +.mw-body-content a.external.text[href^='//']:after, +.mw-body-content a.external.autonumber[href^='//']:after { content: ' (https:' attr( href ) ')'; } diff --git a/resources/src/mediawiki.skinning/content.externallinks.css b/resources/src/mediawiki.skinning/content.externallinks.css index b3922594b9..cd674ef92e 100644 --- a/resources/src/mediawiki.skinning/content.externallinks.css +++ b/resources/src/mediawiki.skinning/content.externallinks.css @@ -9,7 +9,7 @@ * compatibility ( browsers able to understand gradient syntax support also SVG ). * http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */ -.mw-body a.external, +.mw-body-content a.external, .link-https { background: url( images/external-ltr.png ) center right no-repeat; /* @embed */ @@ -19,7 +19,7 @@ padding-right: 15px; } -.mw-body a.external[href^='mailto:'], +.mw-body-content a.external[href^='mailto:'], .link-mailto { background: url( images/mail.png ) center right no-repeat; /* @embed */ @@ -27,7 +27,7 @@ padding-right: 15px; } -.mw-body a.external[href^='ftp://'], +.mw-body-content a.external[href^='ftp://'], .link-ftp { background: url( images/ftp-ltr.png ) center right no-repeat; /* @embed */ @@ -35,8 +35,8 @@ padding-right: 15px; } -.mw-body a.external[href^='irc://'], -.mw-body a.external[href^='ircs://'], +.mw-body-content a.external[href^='irc://'], +.mw-body-content a.external[href^='ircs://'], .link-irc { background: url( images/chat-ltr.png ) center right no-repeat; /* @embed */ @@ -44,18 +44,18 @@ padding-right: 15px; } -.mw-body a.external[href$='.ogg'], -.mw-body a.external[href$='.OGG'], -.mw-body a.external[href$='.mid'], -.mw-body a.external[href$='.MID'], -.mw-body a.external[href$='.midi'], -.mw-body a.external[href$='.MIDI'], -.mw-body a.external[href$='.mp3'], -.mw-body a.external[href$='.MP3'], -.mw-body a.external[href$='.wav'], -.mw-body a.external[href$='.WAV'], -.mw-body a.external[href$='.wma'], -.mw-body a.external[href$='.WMA'], +.mw-body-content a.external[href$='.ogg'], +.mw-body-content a.external[href$='.OGG'], +.mw-body-content a.external[href$='.mid'], +.mw-body-content a.external[href$='.MID'], +.mw-body-content a.external[href$='.midi'], +.mw-body-content a.external[href$='.MIDI'], +.mw-body-content a.external[href$='.mp3'], +.mw-body-content a.external[href$='.MP3'], +.mw-body-content a.external[href$='.wav'], +.mw-body-content a.external[href$='.WAV'], +.mw-body-content a.external[href$='.wma'], +.mw-body-content a.external[href$='.WMA'], .link-audio { background: url( images/audio-ltr.png ) center right no-repeat; /* @embed */ @@ -63,14 +63,14 @@ padding-right: 15px; } -.mw-body a.external[href$='.ogm'], -.mw-body a.external[href$='.OGM'], -.mw-body a.external[href$='.avi'], -.mw-body a.external[href$='.AVI'], -.mw-body a.external[href$='.mpeg'], -.mw-body a.external[href$='.MPEG'], -.mw-body a.external[href$='.mpg'], -.mw-body a.external[href$='.MPG'], +.mw-body-content a.external[href$='.ogm'], +.mw-body-content a.external[href$='.OGM'], +.mw-body-content a.external[href$='.avi'], +.mw-body-content a.external[href$='.AVI'], +.mw-body-content a.external[href$='.mpeg'], +.mw-body-content a.external[href$='.MPEG'], +.mw-body-content a.external[href$='.mpg'], +.mw-body-content a.external[href$='.MPG'], .link-video { background: url( images/video.png ) center right no-repeat; /* @embed */ @@ -78,12 +78,12 @@ padding-right: 15px; } -.mw-body a.external[href$='.pdf'], -.mw-body a.external[href$='.PDF'], -.mw-body a.external[href*='.pdf#'], -.mw-body a.external[href*='.PDF#'], -.mw-body a.external[href*='.pdf?'], -.mw-body a.external[href*='.PDF?'], +.mw-body-content a.external[href$='.pdf'], +.mw-body-content a.external[href$='.PDF'], +.mw-body-content a.external[href*='.pdf#'], +.mw-body-content a.external[href*='.PDF#'], +.mw-body-content a.external[href*='.pdf?'], +.mw-body-content a.external[href*='.PDF?'], .link-document { background: url( images/document-ltr.png ) center right no-repeat; /* @embed */ @@ -92,12 +92,12 @@ } /* Interwiki styling */ -.mw-body a.extiw, -.mw-body a.extiw:active { +.mw-body-content a.extiw, +.mw-body-content a.extiw:active { color: #36b; } /* External link color */ -.mw-body a.external { +.mw-body-content a.external { color: #36b; } diff --git a/resources/src/mediawiki.skinning/elements.css b/resources/src/mediawiki.skinning/elements.css index 46de7b5085..d204d5d5ac 100644 --- a/resources/src/mediawiki.skinning/elements.css +++ b/resources/src/mediawiki.skinning/elements.css @@ -53,33 +53,33 @@ a.new:visited, } /* Interwiki Styling */ -.mw-body a.extiw, -.mw-body a.extiw:active { +.mw-body-content a.extiw, +.mw-body-content a.extiw:active { color: #36b; } -.mw-body a.extiw:visited { +.mw-body-content a.extiw:visited { color: #636; } -.mw-body a.extiw:active { +.mw-body-content a.extiw:active { color: #b63; } /* External links */ -.mw-body a.external { +.mw-body-content a.external { color: #36b; } -.mw-body a.external:visited { +.mw-body-content a.external:visited { color: #636; /* T5112 */ } -.mw-body a.external:active { +.mw-body-content a.external:active { color: #b63; } -.mw-body a.external.free { +.mw-body-content a.external.free { word-wrap: break-word; } -- 2.20.1