jenkins-bot has submitted this change and it was merged.
Change subject: Replace erroneously removed cite styles
......................................................................
Replace erroneously removed cite styles
Generating these requires the 'cite' role in mw-vagrant, which I didn't
have before (leading to an error generating the CSS).
Thus, I removed the reference from the CSS generation script.
This puts back the needed styles. I'll update the mobileapp role in a
follow-up patch to require the cite role.
Bug: T132253
Change-Id: I7a9c8ef804301bc81932886a2aec74fe96ba3f84
---
M app/src/main/assets/preview.css
M app/src/main/assets/styles.css
M scripts/make-css-assets.bash
3 files changed, 166 insertions(+), 2 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/assets/preview.css b/app/src/main/assets/preview.css
index 8c85468..84e0395 100644
--- a/app/src/main/assets/preview.css
+++ b/app/src/main/assets/preview.css
@@ -467,6 +467,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;
diff --git a/app/src/main/assets/styles.css b/app/src/main/assets/styles.css
index ad191a6..e29697a 100644
--- a/app/src/main/assets/styles.css
+++ b/app/src/main/assets/styles.css
@@ -467,6 +467,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 {
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/282483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a9c8ef804301bc81932886a2aec74fe96ba3f84
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
