jenkins-bot has submitted this change and it was merged. Change subject: Include CSS styles for Parsoid Cite extension ......................................................................
Include CSS styles for Parsoid Cite extension The HTML for references has changed to use a different CSS rule with Parsoid: <span class="mw-ref"> vs. <sup> in mobileview. I found the CSS rules through: view-source:https://en.wikipedia.org/api/rest_v1/page/html/Cat <link rel="stylesheet" href="//en.wikipedia.org/w/load.php?modules=mediawiki.legacy.commonPrint,shared|mediawiki.skinning.elements|mediawiki.skinning.content|mediawiki.skinning.interface|skins.vector.styles|site|mediawiki.skinning.content.parsoid|ext.cite.style&only=styles&skin=vector"/> --> https://en.wikipedia.org/w/load.php?debug=true&modules=ext.cite.style&only=styles&skin=vector --> https://en.wikipedia.org/static/1.27.0-wmf.3/extensions/Cite/modules/ext.cite.style.css So, I had to add "ext.cite.style" to the list of modules to be loaded. Will see if we can make that an automatic dependency in mw-vagrant. In the meantime you should enabled the role "cite" as well. Bug: T116390 Change-Id: I5f01e8c1aeb129e2aa4bd42211f36d329ca4aac7 --- M app/src/main/assets/preview.css M app/src/main/assets/styles.css M scripts/make-css-assets.bash 3 files changed, 168 insertions(+), 4 deletions(-) Approvals: Sniedzielski: Looks good to me, approved Mholloway: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/app/src/main/assets/preview.css b/app/src/main/assets/preview.css index 1e9d8fe..6371534 100644 --- a/app/src/main/assets/preview.css +++ b/app/src/main/assets/preview.css @@ -494,6 +494,88 @@ display: block !important; width: auto !important; } +}/* CSS for Parsoid Cite extension */ + +/* Style for <ref>s */ +span.mw-ref { + vertical-align: super; + line-height: 1; + font-size: smaller; + /* Make sure the brackets and the numbers aren't jumbled after LTR words in RTL wikis */ + unicode-bidi: embed; +} + +/* With a group set */ +span.mw-ref a[data-mw-group]::after { + content: "[" attr(data-mw-group) " " counter(mw-Ref, decimal) "]"} + +/* Groups with special appearance */ +span.mw-ref a[data-mw-group="decimal"]::after { + content: "[" counter(mw-Ref, decimal) "]"; +} +span.mw-ref a[data-mw-group="lower-alpha"]::after { + content: "[" counter(mw-Ref, lower-alpha) "]"; +} +span.mw-ref a[data-mw-group="upper-alpha"]::after { + content: "[" counter(mw-Ref, upper-alpha) "]"; +} +span.mw-ref a[data-mw-group="lower-greek"]::after { + content: "[" counter(mw-Ref, lower-greek) "]"; +} +span.mw-ref a[data-mw-group="lower-roman"]::after { + content: "[" counter(mw-Ref, lower-roman) "]"; +} +span.mw-ref a[data-mw-group="upper-roman"]::after { + content: "[" counter(mw-Ref, upper-roman) "]"; +} +span.mw-ref a[data-mw-group="error-test"]::after { + content: "[" counter(mw-Ref, symbols(cyclic "first" "second" "last!")) "]"; +} + +/* Without a group */ +span.mw-ref a::after { + content: "[" counter(mw-Ref, decimal) "]"; +} + +/* Hide the default rendering in browsers that support content + * generation by selecting for ::after pseudo-element.*/ +x-thereisnoelementwiththisname::after, span.mw-reflink-text { + display: none; +} + +/* Style for linkbacks from <references> to <ref>s */ +ol.mw-references { + counter-reset: mw-ref-linkback; +} + +ol.mw-references li { + counter-increment: mw-ref-linkback; +} + +[rel="mw:referencedBy"] { + counter-reset: mw-ref-linkback -1; +} + +[rel="mw:referencedBy"]::before { + content: "↑ "; +} + +span[rel="mw:referencedBy"] a::before { + counter-increment: mw-ref-linkback; + content: counters(mw-ref-linkback, ".", decimal); + vertical-align: super; + line-height: 1; + font-size: smaller; +} + +span[rel="mw:referencedBy"] a::after { + content: " "; +} + +/* Hide the default rendering in browsers that support content + * generation by selecting for ::after pseudo-element.*/ +x-thereisnoelementwiththisname[rel="mw:referencedBy"]::before, span.mw-linkback-text { + display: none; }/* Hide the stupid editlink */ .edit-page { display: none; @@ -836,4 +918,4 @@ max-width: 100%; margin-left: auto; margin-right: auto; -} \ No newline at end of file +} diff --git a/app/src/main/assets/styles.css b/app/src/main/assets/styles.css index 4b58175..131672d 100644 --- a/app/src/main/assets/styles.css +++ b/app/src/main/assets/styles.css @@ -494,6 +494,88 @@ display: block !important; width: auto !important; } +}/* CSS for Parsoid Cite extension */ + +/* Style for <ref>s */ +span.mw-ref { + vertical-align: super; + line-height: 1; + font-size: smaller; + /* Make sure the brackets and the numbers aren't jumbled after LTR words in RTL wikis */ + unicode-bidi: embed; +} + +/* With a group set */ +span.mw-ref a[data-mw-group]::after { + content: "[" attr(data-mw-group) " " counter(mw-Ref, decimal) "]"} + +/* Groups with special appearance */ +span.mw-ref a[data-mw-group="decimal"]::after { + content: "[" counter(mw-Ref, decimal) "]"; +} +span.mw-ref a[data-mw-group="lower-alpha"]::after { + content: "[" counter(mw-Ref, lower-alpha) "]"; +} +span.mw-ref a[data-mw-group="upper-alpha"]::after { + content: "[" counter(mw-Ref, upper-alpha) "]"; +} +span.mw-ref a[data-mw-group="lower-greek"]::after { + content: "[" counter(mw-Ref, lower-greek) "]"; +} +span.mw-ref a[data-mw-group="lower-roman"]::after { + content: "[" counter(mw-Ref, lower-roman) "]"; +} +span.mw-ref a[data-mw-group="upper-roman"]::after { + content: "[" counter(mw-Ref, upper-roman) "]"; +} +span.mw-ref a[data-mw-group="error-test"]::after { + content: "[" counter(mw-Ref, symbols(cyclic "first" "second" "last!")) "]"; +} + +/* Without a group */ +span.mw-ref a::after { + content: "[" counter(mw-Ref, decimal) "]"; +} + +/* Hide the default rendering in browsers that support content + * generation by selecting for ::after pseudo-element.*/ +x-thereisnoelementwiththisname::after, span.mw-reflink-text { + display: none; +} + +/* Style for linkbacks from <references> to <ref>s */ +ol.mw-references { + counter-reset: mw-ref-linkback; +} + +ol.mw-references li { + counter-increment: mw-ref-linkback; +} + +[rel="mw:referencedBy"] { + counter-reset: mw-ref-linkback -1; +} + +[rel="mw:referencedBy"]::before { + content: "↑ "; +} + +span[rel="mw:referencedBy"] a::before { + counter-increment: mw-ref-linkback; + content: counters(mw-ref-linkback, ".", decimal); + vertical-align: super; + line-height: 1; + font-size: smaller; +} + +span[rel="mw:referencedBy"] a::after { + content: " "; +} + +/* Hide the default rendering in browsers that support content + * generation by selecting for ::after pseudo-element.*/ +x-thereisnoelementwiththisname[rel="mw:referencedBy"]::before, span.mw-linkback-text { + display: none; }/* Loading animation in pure CSS Thanks to http://dabblet.com/gist/7708654 */ .loading { @@ -1079,4 +1161,4 @@ } div.gallerytext > p { margin-top: 0px !important; -} \ No newline at end of file +} diff --git a/scripts/make-css-assets.bash b/scripts/make-css-assets.bash index bd32bd9..77beb4c 100755 --- a/scripts/make-css-assets.bash +++ b/scripts/make-css-assets.bash @@ -3,6 +3,6 @@ PREFIX="http://127.0.0.1:8080/w"; BASE_PATH="`dirname $0`/.." -wget "$PREFIX/load.php?debug=true&lang=en&modules=skins.minerva.base.reset|skins.minerva.content.styles|mobile.app.pagestyles.android&only=styles&skin=vector&version=&*" -O "$BASE_PATH/app/src/main/assets/styles.css" -wget "$PREFIX/load.php?debug=true&lang=en&modules=skins.minerva.base.reset|skins.minerva.content.styles|mobile.app.preview&only=styles&skin=vector&version=&*" -O "$BASE_PATH/app/src/main/assets/preview.css" +wget "$PREFIX/load.php?debug=true&lang=en&modules=skins.minerva.base.reset|skins.minerva.content.styles|ext.cite.style|mobile.app.pagestyles.android&only=styles&skin=vector&version=&*" -O "$BASE_PATH/app/src/main/assets/styles.css" +wget "$PREFIX/load.php?debug=true&lang=en&modules=skins.minerva.base.reset|skins.minerva.content.styles|ext.cite.style|mobile.app.preview&only=styles&skin=vector&version=&*" -O "$BASE_PATH/app/src/main/assets/preview.css" wget "$PREFIX/load.php?debug=true&lang=en&modules=mobile.app.pagestyles.android.night&only=styles&skin=vector&version=&*" -O "$BASE_PATH/app/src/main/assets/night.css" -- To view, visit https://gerrit.wikimedia.org/r/248364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f01e8c1aeb129e2aa4bd42211f36d329ca4aac7 Gerrit-PatchSet: 4 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: BearND <[email protected]> Gerrit-Reviewer: BearND <[email protected]> Gerrit-Reviewer: Brion VIBBER <[email protected]> Gerrit-Reviewer: Dbrant <[email protected]> Gerrit-Reviewer: Mholloway <[email protected]> Gerrit-Reviewer: Niedzielski <[email protected]> Gerrit-Reviewer: Sniedzielski <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
