jenkins-bot has submitted this change and it was merged. Change subject: Don't pollute global wgResourceLoaderLESSImportPaths ......................................................................
Don't pollute global wgResourceLoaderLESSImportPaths There's no need to prepend this directory globally to the import scanner just to use it in a single module. Lessphp always looks for files in the local directory as well. Follows-up 7a05f59e52abc9. Change-Id: I1caa629d8266dc355a2dbe0b01ed8ed4a80c000a --- M MobileFrontend.php M resources/skins.minerva.content.styles/styles.less 2 files changed, 10 insertions(+), 11 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/MobileFrontend.php b/MobileFrontend.php index 44162a7..83eb2ea 100644 --- a/MobileFrontend.php +++ b/MobileFrontend.php @@ -171,7 +171,6 @@ // Set LESS importpath $wgResourceLoaderLESSImportPaths[] = __DIR__ . "/minerva.less/"; -$wgResourceLoaderLESSImportPaths[] = __DIR__ . "/resources/"; // ResourceLoader modules diff --git a/resources/skins.minerva.content.styles/styles.less b/resources/skins.minerva.content.styles/styles.less index 81877c4..9df0005 100644 --- a/resources/skins.minerva.content.styles/styles.less +++ b/resources/skins.minerva.content.styles/styles.less @@ -1,10 +1,10 @@ -@import "skins.minerva.content.styles/main.less"; -@import "skins.minerva.content.styles/thumbnails.less"; -@import "skins.minerva.content.styles/images.less"; -@import "skins.minerva.content.styles/headings.less"; -@import "skins.minerva.content.styles/blockquotes.less"; -@import "skins.minerva.content.styles/lists.less"; -@import "skins.minerva.content.styles/links.less"; -@import "skins.minerva.content.styles/text.less"; -@import "skins.minerva.content.styles/tables.less"; -@import "skins.minerva.content.styles/hacks.less"; +@import "main.less"; +@import "thumbnails.less"; +@import "images.less"; +@import "headings.less"; +@import "blockquotes.less"; +@import "lists.less"; +@import "links.less"; +@import "text.less"; +@import "tables.less"; +@import "hacks.less"; -- To view, visit https://gerrit.wikimedia.org/r/247510 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1caa629d8266dc355a2dbe0b01ed8ed4a80c000a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Krinkle <[email protected]> Gerrit-Reviewer: Florianschmidtwelzow <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
