jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392138 )
Change subject: wikimedia-page-library -> 4.7.4
......................................................................
wikimedia-page-library -> 4.7.4
Change-Id: I7e438d889dac343042b2ab374ebcdbc05146b336
---
M app/src/main/assets/bundle.js
M app/src/main/assets/preview.js
M app/src/main/assets/wikimedia-page-library.css
M www/package-lock.json
M www/package.json
5 files changed, 22 insertions(+), 16 deletions(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index bab059e..108fc69 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -1280,8 +1280,11 @@
/* en > Away colours > 793128975 */
/* en > Manchester United F.C. > 793244653 */
/* en > Pantone > 792312384 */
- Polyfill.querySelectorAll(element, 'div.color_swatch div,
div[style*="position: absolute"]').forEach(function (div) {
- div.classList.add(CONSTRAINT.DIV_DO_NOT_APPLY_BASELINE);
+ /* en > Wikipedia:Graphs_and_charts > 801754530 */
+ /* en > PepsiCo > 807406166 */
+ var selector = ['div.color_swatch div', 'div[style*="position: absolute"]',
'div.barbox table div[style*="background:"]', 'div.chart
div[style*="background-color"]', 'div.chart ul li
span[style*="background-color"]', 'span.legend-color'].join();
+ Polyfill.querySelectorAll(element, selector).forEach(function (element) {
+ return element.classList.add(CONSTRAINT.DIV_DO_NOT_APPLY_BASELINE);
});
};
diff --git a/app/src/main/assets/preview.js b/app/src/main/assets/preview.js
index 73a1a24..51da04e 100644
--- a/app/src/main/assets/preview.js
+++ b/app/src/main/assets/preview.js
@@ -432,8 +432,11 @@
/* en > Away colours > 793128975 */
/* en > Manchester United F.C. > 793244653 */
/* en > Pantone > 792312384 */
- Polyfill.querySelectorAll(element, 'div.color_swatch div,
div[style*="position: absolute"]').forEach(function (div) {
- div.classList.add(CONSTRAINT.DIV_DO_NOT_APPLY_BASELINE);
+ /* en > Wikipedia:Graphs_and_charts > 801754530 */
+ /* en > PepsiCo > 807406166 */
+ var selector = ['div.color_swatch div', 'div[style*="position: absolute"]',
'div.barbox table div[style*="background:"]', 'div.chart
div[style*="background-color"]', 'div.chart ul li
span[style*="background-color"]', 'span.legend-color'].join();
+ Polyfill.querySelectorAll(element, selector).forEach(function (element) {
+ return element.classList.add(CONSTRAINT.DIV_DO_NOT_APPLY_BASELINE);
});
};
diff --git a/app/src/main/assets/wikimedia-page-library.css
b/app/src/main/assets/wikimedia-page-library.css
index 64b2424..e34821f 100644
--- a/app/src/main/assets/wikimedia-page-library.css
+++ b/app/src/main/assets/wikimedia-page-library.css
@@ -3,7 +3,7 @@
/* --- CSS from '/src/transform/ThemeTransform.css' --- */
- /*
+ /*
The styles referred to as 'baseline' in the comments below are critical
because they ensure
a theme colors are more universally applied even by elements colored via
inline styles. These are
particularly difficult to theme otherwise. We can build on top of, so to
speak, these baseline
@@ -29,7 +29,7 @@
}
/* external anchor */
-.pagelib_theme_dark a.external,
+.pagelib_theme_dark a.external,
.pagelib_theme_sepia a.external {
background-image:
url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAGJJREFUKFN1jdENgCAMBYmJn47Bak7DZrhTpc/XIm34OAjXA4qIgHI/dSBbLGTcOKjBryFlinGmjDQGiOF0MQkxI3v5wq6L38qR7SnsAx8ul37igPjAd+o5Oz2MRA+xY4ZSXuaW6wYouOLpAAAAAElFTkSuQmCC);
}
@@ -47,12 +47,12 @@
.pagelib_theme_sepia .content tr,
.pagelib_theme_sepia .content th {
background: #f0e6d6 !important;
- color: #222 !important;
+ color: #222 !important;
}
/* baseline div, span, ul, li */
.pagelib_theme_dark .content div:not(.pagelib_theme_div_do_not_apply_baseline),
-.pagelib_theme_dark .content span,
+.pagelib_theme_dark .content
span:not(.pagelib_theme_div_do_not_apply_baseline),
.pagelib_theme_dark .content ul,
.pagelib_theme_dark .content ol,
.pagelib_theme_dark .content li {
@@ -60,12 +60,12 @@
color: #f8f9fa !important;
}
.pagelib_theme_sepia .content
div:not(.pagelib_theme_div_do_not_apply_baseline),
-.pagelib_theme_sepia .content span,
+.pagelib_theme_sepia .content
span:not(.pagelib_theme_div_do_not_apply_baseline),
.pagelib_theme_sepia .content ul,
.pagelib_theme_sepia .content ol,
.pagelib_theme_sepia .content li {
background-color: inherit !important;
- color: #222 !important;
+ color: #222 !important;
}
/* baseline border color */
@@ -83,7 +83,7 @@
.pagelib_theme_dark .content div.quotebox {
background: #27292d !important;
}
-.pagelib_theme_sepia .content blockquote,
+.pagelib_theme_sepia .content blockquote,
.pagelib_theme_sepia .content div.quotebox {
background: #f0e6d6 !important;
}
@@ -99,7 +99,7 @@
}
/* caption color */
-/* en > Barack Obama > 793008506 */
+/* en > Barack Obama > 793008506 */
.pagelib_theme_default .content .thumbcaption,
.pagelib_theme_default .content figcaption {
color: #72777d !important;
diff --git a/www/package-lock.json b/www/package-lock.json
index 1d9ef78..1261d6e 100644
--- a/www/package-lock.json
+++ b/www/package-lock.json
@@ -3079,9 +3079,9 @@
"dev": true
},
"wikimedia-page-library": {
- "version": "4.7.3",
- "resolved":
"https://registry.npmjs.org/wikimedia-page-library/-/wikimedia-page-library-4.7.1.tgz";,
- "integrity": "sha1-KdcgUbKg3LRGtqXdW8KeKJyvFQo="
+ "version": "4.7.4",
+ "resolved":
"https://registry.npmjs.org/wikimedia-page-library/-/wikimedia-page-library-4.7.4.tgz";,
+ "integrity": "sha1-Q5C9DHD4MIUlcbZBDrGBULQ4FHk="
},
"wrappy": {
"version": "1.0.2",
diff --git a/www/package.json b/www/package.json
index 18a0a9a..515a961 100644
--- a/www/package.json
+++ b/www/package.json
@@ -4,7 +4,7 @@
"test": "grunt test"
},
"dependencies": {
- "wikimedia-page-library": "^4.7.3"
+ "wikimedia-page-library": "^4.7.4"
},
"devDependencies": {
"browserify": "^14.4.0",
--
To view, visit https://gerrit.wikimedia.org/r/392138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e438d889dac343042b2ab374ebcdbc05146b336
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Cooltey <cf...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Sharvaniharan <sha...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
