jenkins-bot has submitted this change and it was merged.
Change subject: Reflect some upstream changes
......................................................................
Reflect some upstream changes
Fix appendTo -> appendToElement
New ContentOverlay module location
Bug: T97338
Change-Id: I91aa688fa5926369355ca8f3fbea3ad51bcde61d
---
M resources/ext.gather.collection.base/CollectionsContentOverlayBase.js
A resources/ext.gather.init/minerva.less
A resources/ext.gather.init/vector.less
3 files changed, 16 insertions(+), 2 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/resources/ext.gather.collection.base/CollectionsContentOverlayBase.js
b/resources/ext.gather.collection.base/CollectionsContentOverlayBase.js
index 33e95e8..64bda65 100644
--- a/resources/ext.gather.collection.base/CollectionsContentOverlayBase.js
+++ b/resources/ext.gather.collection.base/CollectionsContentOverlayBase.js
@@ -1,7 +1,7 @@
( function ( M ) {
var CollectionsContentOverlayBase,
- ContentOverlay = M.require( 'modules/tutorials/ContentOverlay'
);
+ ContentOverlay = M.require( 'ContentOverlay' );
/**
* A clickable watchstar for managing collections
@@ -13,7 +13,7 @@
* FIXME: re-evaluate content overlay default classes/css.
* @inheritdoc
*/
- appendTo: 'body',
+ appendToElement: 'body',
/** @inheritdoc */
hasFixedHeader: false,
/** @inheritdoc */
diff --git a/resources/ext.gather.init/minerva.less
b/resources/ext.gather.init/minerva.less
new file mode 100644
index 0000000..af9f9a0
--- /dev/null
+++ b/resources/ext.gather.init/minerva.less
@@ -0,0 +1,9 @@
+// FIXME: these should be unnecessary
+#page-actions {
+ li.collection-star-container {
+ a {
+ position: relative;
+ margin: 0;
+ }
+ }
+}
diff --git a/resources/ext.gather.init/vector.less
b/resources/ext.gather.init/vector.less
new file mode 100644
index 0000000..25a975d
--- /dev/null
+++ b/resources/ext.gather.init/vector.less
@@ -0,0 +1,5 @@
+.collection-star-container {
+ a {
+ padding-top: 1.25em;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/203229
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91aa688fa5926369355ca8f3fbea3ad51bcde61d
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Gather
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Jhernandez <jhernan...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
