jenkins-bot has submitted this change and it was merged.
Change subject: Fix RelatedPages placement in Monobook
......................................................................
Fix RelatedPages placement in Monobook
* Load skin specific styles only in that skin;
* Vector styles are default for all skins unless overwritten;
* Allow monobook styles to inherit from vector styles;
* Do not load visual editor related rules in minerva;
* Remove an unused CSS rule.
Bug: T126149
Change-Id: I1e657de7a45fb4812c42ca7b99624b585dc4b7dd
---
M includes/FooterHooks.php
A resources/ext.relatedArticles.readMore/readMore.default.less
M resources/ext.relatedArticles.readMore/readMore.less
A resources/ext.relatedArticles.readMore/readMore.minerva.less
A resources/ext.relatedArticles.readMore/readMore.monobook.less
5 files changed, 36 insertions(+), 25 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/FooterHooks.php b/includes/FooterHooks.php
index e0d7650..c28f185 100644
--- a/includes/FooterHooks.php
+++ b/includes/FooterHooks.php
@@ -142,6 +142,14 @@
"styles" => array(
"resources/ext.relatedArticles.readMore/readMore.less"
),
+ "skinStyles" => array(
+ "default" =>
"resources/ext.relatedArticles.readMore/readMore.default.less",
+ "monobook" => array(
+
"resources/ext.relatedArticles.readMore/readMore.default.less",
+
"resources/ext.relatedArticles.readMore/readMore.monobook.less"
+ ),
+ "minerva" =>
"resources/ext.relatedArticles.readMore/readMore.minerva.less"
+ ),
"messages" => array(
"relatedarticles-read-more-heading"
),
diff --git a/resources/ext.relatedArticles.readMore/readMore.default.less
b/resources/ext.relatedArticles.readMore/readMore.default.less
new file mode 100644
index 0000000..795723e
--- /dev/null
+++ b/resources/ext.relatedArticles.readMore/readMore.default.less
@@ -0,0 +1,15 @@
+// Hide RelatedArticles when VE is activated
(https://phabricator.wikimedia.org/T120443)
+.ve-activated {
+ .ra-read-more {
+ display: none;
+ }
+}
+
+.ra-read-more {
+ margin: 0 0 0 10em;
+ padding: 1em;
+
+ .ext-cards-card-list {
+ margin-left: 0;
+ }
+}
diff --git a/resources/ext.relatedArticles.readMore/readMore.less
b/resources/ext.relatedArticles.readMore/readMore.less
index d07d0f6..7f613eb 100644
--- a/resources/ext.relatedArticles.readMore/readMore.less
+++ b/resources/ext.relatedArticles.readMore/readMore.less
@@ -1,16 +1,6 @@
@import "mediawiki.ui/variables";
-// Hide RelatedArticles when VE is activated
(https://phabricator.wikimedia.org/T120443)
-.ve-activated {
- .ra-read-more {
- display: none;
- }
-}
-
.ra-read-more {
- margin-top: 35px;
- margin-bottom: 70px;
-
h2 {
border-bottom: none;
font-size: .8em;
@@ -19,20 +9,5 @@
padding-bottom: 0.5em;
text-transform: uppercase;
letter-spacing: 1px;
- }
-
- .page-list {
- border-top: 1px solid @colorGray14;
- }
-}
-
-body.skin-vector {
- .ra-read-more {
- margin: 0 0 0 10em;
- padding: 1em;
-
- .ext-cards-card-list {
- margin-left: 0;
- }
}
}
diff --git a/resources/ext.relatedArticles.readMore/readMore.minerva.less
b/resources/ext.relatedArticles.readMore/readMore.minerva.less
new file mode 100644
index 0000000..9c77aab
--- /dev/null
+++ b/resources/ext.relatedArticles.readMore/readMore.minerva.less
@@ -0,0 +1,7 @@
+@import "mediawiki.ui/variables";
+
+.ra-read-more {
+ margin-top: 35px;
+ margin-bottom: 70px;
+}
+
diff --git a/resources/ext.relatedArticles.readMore/readMore.monobook.less
b/resources/ext.relatedArticles.readMore/readMore.monobook.less
new file mode 100644
index 0000000..59e0a03
--- /dev/null
+++ b/resources/ext.relatedArticles.readMore/readMore.monobook.less
@@ -0,0 +1,6 @@
+// inherits from vector styles
+
+.ra-read-more {
+ margin: 0 0 0 12.2em;
+ padding: 1em 0;
+}
--
To view, visit https://gerrit.wikimedia.org/r/271580
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e657de7a45fb4812c42ca7b99624b585dc4b7dd
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/RelatedArticles
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jhobs <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
