From 64134bd8a69ff8f218bcf4928a1e687d703409b5 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Sat, 19 May 2018 20:17:31 +0200 Subject: [PATCH] Remove minerva.less from global import path Use local imports instead given all relevant files are within the same repository, and don't vary by configuraion. Bug: T140807 Depends-On: If3edac9a35b346af0320c12f70c0d978a6346201 Change-Id: Ife3cc345a63aff452e93accbe0a593fbaa358732 --- includes/MinervaHooks.php | 9 --------- resources/skins.minerva.backtotop/backtotop.less | 2 +- resources/skins.minerva.base.reset/reset.less | 2 +- resources/skins.minerva.base.styles/common.less | 4 ++-- resources/skins.minerva.base.styles/footer.less | 4 ++-- resources/skins.minerva.base.styles/images.less | 4 ++-- resources/skins.minerva.base.styles/pageactions.less | 4 ++-- resources/skins.minerva.base.styles/print/article.less | 4 ++-- resources/skins.minerva.base.styles/print/footer.less | 4 ++-- resources/skins.minerva.base.styles/print/styles.less | 2 +- resources/skins.minerva.base.styles/ui.less | 4 ++-- resources/skins.minerva.content.styles/blockquotes.less | 4 ++-- resources/skins.minerva.content.styles/hacks.less | 4 ++-- resources/skins.minerva.content.styles/headings.less | 4 ++-- resources/skins.minerva.content.styles/images.less | 4 ++-- resources/skins.minerva.content.styles/links.less | 4 ++-- resources/skins.minerva.content.styles/main.less | 4 ++-- resources/skins.minerva.content.styles/tables.less | 4 ++-- resources/skins.minerva.content.styles/text.less | 4 ++-- resources/skins.minerva.content.styles/thumbnails.less | 4 ++-- resources/skins.minerva.loggedin.styles/styles.less | 2 +- resources/skins.minerva.mainMenu.styles/mainmenu.less | 4 ++-- resources/skins.minerva.mainPage.styles/common.less | 4 ++-- resources/skins.minerva.newusers/PointerOverlay.less | 2 +- resources/skins.minerva.scripts/styles.less | 2 +- resources/skins.minerva.tablet.styles/common.less | 4 ++-- resources/skins.minerva.tablet.styles/hacks.less | 4 ++-- resources/skins.minerva.userpage.styles/userpage.less | 4 ++-- skin.json | 1 - .../SpecialNotificationsOverlay.less | 2 +- skinStyles/mediawiki.action.edit.styles/minerva.less | 2 +- skinStyles/mediawiki.hlist/minerva.less | 2 +- skinStyles/mediawiki.page.gallery.styles/tablet.less | 4 ++-- .../mediawiki.special.preferences.styles/styles.less | 2 +- skinStyles/mediawiki.special.search.styles/minerva.less | 4 ++-- .../minerva.less | 4 ++-- skinStyles/mobile.editor.ve/minerva.less | 2 +- .../mobile.languages.structured/LanguageOverlay.less | 2 +- skinStyles/mobile.notifications.overlay/minerva.less | 2 +- skinStyles/mobile.search/SearchOverlay.less | 2 +- skinStyles/mobile.special.mobilemenu.styles/minerva.less | 2 +- .../mobile.special.mobileoptions.styles/minerva.less | 2 +- skinStyles/mobile.special.styles/minerva.less | 2 +- skinStyles/mobile.startup/Overlay.less | 4 ++-- skinStyles/mobile.startup/toast.less | 4 ++-- skinStyles/mobile.toggle/minerva.less | 2 +- 46 files changed, 70 insertions(+), 80 deletions(-) diff --git a/includes/MinervaHooks.php b/includes/MinervaHooks.php index 9d62636a5..0a52ca45b 100644 --- a/includes/MinervaHooks.php +++ b/includes/MinervaHooks.php @@ -60,15 +60,6 @@ class MinervaHooks { } } - /** - * Skin registration callback. - */ - public static function onRegistration() { - // Set LESS importpath - global $wgResourceLoaderLESSImportPaths; - $wgResourceLoaderLESSImportPaths[] = dirname( __DIR__ ) . "/minerva.less/"; - } - /** * ResourceLoaderTestModules hook handler * @see https://www.mediawiki.org/wiki/Manual:Hooks/ResourceLoaderTestModules diff --git a/resources/skins.minerva.backtotop/backtotop.less b/resources/skins.minerva.backtotop/backtotop.less index c9f24d048..3302ccc3d 100644 --- a/resources/skins.minerva.backtotop/backtotop.less +++ b/resources/skins.minerva.backtotop/backtotop.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; @import 'mediawiki.mixins.less'; .backtotop { diff --git a/resources/skins.minerva.base.reset/reset.less b/resources/skins.minerva.base.reset/reset.less index 544c9da19..a2e32b273 100644 --- a/resources/skins.minerva.base.reset/reset.less +++ b/resources/skins.minerva.base.reset/reset.less @@ -2,7 +2,7 @@ v2.0 | 20110126 License: none (public domain) */ -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.mixins'; html, body, div, span, h1, h2, h3, h4, h5, h6, p, blockquote, pre, diff --git a/resources/skins.minerva.base.styles/common.less b/resources/skins.minerva.base.styles/common.less index b52a6ab50..3ef7932be 100644 --- a/resources/skins.minerva.base.styles/common.less +++ b/resources/skins.minerva.base.styles/common.less @@ -1,6 +1,6 @@ @import 'mediawiki.mixins.less'; -@import 'minerva.variables.less'; -@import 'minerva.mixins.less'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; // Reusable components // diff --git a/resources/skins.minerva.base.styles/footer.less b/resources/skins.minerva.base.styles/footer.less index 9da4443cf..783999cd7 100644 --- a/resources/skins.minerva.base.styles/footer.less +++ b/resources/skins.minerva.base.styles/footer.less @@ -1,5 +1,5 @@ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; // style that applies only to minerva footer .minerva-footer { diff --git a/resources/skins.minerva.base.styles/images.less b/resources/skins.minerva.base.styles/images.less index 42ff210ae..c653cc2c7 100644 --- a/resources/skins.minerva.base.styles/images.less +++ b/resources/skins.minerva.base.styles/images.less @@ -1,5 +1,5 @@ -@import 'minerva.variables.less'; -@import 'minerva.mixins.less'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; @import 'mediawiki.mixins.animation'; @animationDuration: 0.3s; diff --git a/resources/skins.minerva.base.styles/pageactions.less b/resources/skins.minerva.base.styles/pageactions.less index fa722f930..b4b086093 100644 --- a/resources/skins.minerva.base.styles/pageactions.less +++ b/resources/skins.minerva.base.styles/pageactions.less @@ -1,5 +1,5 @@ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; .heading-holder { @pageActionsHeight: @pageActionFontSize + (2 * @iconGutterWidth); diff --git a/resources/skins.minerva.base.styles/print/article.less b/resources/skins.minerva.base.styles/print/article.less index dca999c65..9b96ef3de 100644 --- a/resources/skins.minerva.base.styles/print/article.less +++ b/resources/skins.minerva.base.styles/print/article.less @@ -1,5 +1,5 @@ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../../minerva.less/minerva.variables'; +@import '../../../minerva.less/minerva.mixins'; @dividerHeight: 2px; @dividerSpacing: 28px; diff --git a/resources/skins.minerva.base.styles/print/footer.less b/resources/skins.minerva.base.styles/print/footer.less index aae452e75..8d301e18e 100644 --- a/resources/skins.minerva.base.styles/print/footer.less +++ b/resources/skins.minerva.base.styles/print/footer.less @@ -1,5 +1,5 @@ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../../minerva.less/minerva.variables'; +@import '../../../minerva.less/minerva.mixins'; .printfooter { display: block; diff --git a/resources/skins.minerva.base.styles/print/styles.less b/resources/skins.minerva.base.styles/print/styles.less index 6c4c995bb..28874ff2d 100644 --- a/resources/skins.minerva.base.styles/print/styles.less +++ b/resources/skins.minerva.base.styles/print/styles.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../../minerva.less/minerva.variables'; @media print { .noprint, diff --git a/resources/skins.minerva.base.styles/ui.less b/resources/skins.minerva.base.styles/ui.less index d5c492d81..b88303cbf 100644 --- a/resources/skins.minerva.base.styles/ui.less +++ b/resources/skins.minerva.base.styles/ui.less @@ -1,5 +1,5 @@ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; @import 'mediawiki.mixins'; /* stylelint-disable no-descending-specificity */ diff --git a/resources/skins.minerva.content.styles/blockquotes.less b/resources/skins.minerva.content.styles/blockquotes.less index 2eb18dfdb..a4024b819 100644 --- a/resources/skins.minerva.content.styles/blockquotes.less +++ b/resources/skins.minerva.content.styles/blockquotes.less @@ -7,8 +7,8 @@ // // Styleguide 1.8. @import 'mediawiki.mixins.less'; -@import 'minerva.variables.less'; -@import 'minerva.mixins.less'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; blockquote { border-left: 3px solid @colorGray12; diff --git a/resources/skins.minerva.content.styles/hacks.less b/resources/skins.minerva.content.styles/hacks.less index 82bc6eefa..d5f58767b 100644 --- a/resources/skins.minerva.content.styles/hacks.less +++ b/resources/skins.minerva.content.styles/hacks.less @@ -9,8 +9,8 @@ https://www.mediawiki.org/wiki/Requests_for_comment/Allow_styling_in_templates FIXME: Review all of these hacks to see if they still apply. */ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; .collapsible td { width: auto !important; diff --git a/resources/skins.minerva.content.styles/headings.less b/resources/skins.minerva.content.styles/headings.less index ea316395c..a33f8e27d 100644 --- a/resources/skins.minerva.content.styles/headings.less +++ b/resources/skins.minerva.content.styles/headings.less @@ -22,8 +22,8 @@ // // Styleguide 1.1. @import 'mediawiki.mixins.less'; -@import 'minerva.variables.less'; -@import 'minerva.mixins.less'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; @headingLineHeight: 1.3; diff --git a/resources/skins.minerva.content.styles/images.less b/resources/skins.minerva.content.styles/images.less index b53543419..55f926447 100644 --- a/resources/skins.minerva.content.styles/images.less +++ b/resources/skins.minerva.content.styles/images.less @@ -16,8 +16,8 @@ // // Styleguide 1.3. @import 'mediawiki.mixins.less'; -@import 'minerva.variables.less'; -@import 'minerva.mixins.less'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; .content { diff --git a/resources/skins.minerva.content.styles/links.less b/resources/skins.minerva.content.styles/links.less index 4b445259e..317dec705 100644 --- a/resources/skins.minerva.content.styles/links.less +++ b/resources/skins.minerva.content.styles/links.less @@ -1,6 +1,6 @@ @import 'mediawiki.mixins.less'; -@import 'minerva.variables.less'; -@import 'minerva.mixins.less'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; /** * Note that certain links may not have an href selector. diff --git a/resources/skins.minerva.content.styles/main.less b/resources/skins.minerva.content.styles/main.less index 69a138547..0fa7466ec 100644 --- a/resources/skins.minerva.content.styles/main.less +++ b/resources/skins.minerva.content.styles/main.less @@ -1,5 +1,5 @@ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; // Content formatting and typography // diff --git a/resources/skins.minerva.content.styles/tables.less b/resources/skins.minerva.content.styles/tables.less index c34923773..b2f45198f 100644 --- a/resources/skins.minerva.content.styles/tables.less +++ b/resources/skins.minerva.content.styles/tables.less @@ -1,7 +1,7 @@ // Tables @import 'mediawiki.mixins.less'; -@import 'minerva.variables.less'; -@import 'minerva.mixins.less'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; // These are only intended for smaller screens. // This avoids having to undo them from another media query, diff --git a/resources/skins.minerva.content.styles/text.less b/resources/skins.minerva.content.styles/text.less index 5b8bef0b4..ee3a7fe55 100644 --- a/resources/skins.minerva.content.styles/text.less +++ b/resources/skins.minerva.content.styles/text.less @@ -1,6 +1,6 @@ @import 'mediawiki.mixins.less'; -@import 'minerva.variables.less'; -@import 'minerva.mixins.less'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; .content { p { diff --git a/resources/skins.minerva.content.styles/thumbnails.less b/resources/skins.minerva.content.styles/thumbnails.less index bb3865844..497caadf6 100644 --- a/resources/skins.minerva.content.styles/thumbnails.less +++ b/resources/skins.minerva.content.styles/thumbnails.less @@ -1,6 +1,6 @@ @import 'mediawiki.mixins.less'; -@import 'minerva.variables.less'; -@import 'minerva.mixins.less'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; // Thumbnails // diff --git a/resources/skins.minerva.loggedin.styles/styles.less b/resources/skins.minerva.loggedin.styles/styles.less index b459d1ac9..0ca61f5ee 100644 --- a/resources/skins.minerva.loggedin.styles/styles.less +++ b/resources/skins.minerva.loggedin.styles/styles.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; .user-button { // Make sure count is positioned correctly in relation to bell icon diff --git a/resources/skins.minerva.mainMenu.styles/mainmenu.less b/resources/skins.minerva.mainMenu.styles/mainmenu.less index 4610374c7..e34c9e2e4 100644 --- a/resources/skins.minerva.mainMenu.styles/mainmenu.less +++ b/resources/skins.minerva.mainMenu.styles/mainmenu.less @@ -1,7 +1,7 @@ // Component of ui.less // FIXME: Move to components/ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; /* stylelint-disable no-descending-specificity */ diff --git a/resources/skins.minerva.mainPage.styles/common.less b/resources/skins.minerva.mainPage.styles/common.less index f97c3d579..ed8d895fa 100644 --- a/resources/skins.minerva.mainPage.styles/common.less +++ b/resources/skins.minerva.mainPage.styles/common.less @@ -1,5 +1,5 @@ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; .page-Main_Page { #section_0 { diff --git a/resources/skins.minerva.newusers/PointerOverlay.less b/resources/skins.minerva.newusers/PointerOverlay.less index 638a0cbc6..c3a671a9d 100644 --- a/resources/skins.minerva.newusers/PointerOverlay.less +++ b/resources/skins.minerva.newusers/PointerOverlay.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; @colorTutorial: #2e76ff; diff --git a/resources/skins.minerva.scripts/styles.less b/resources/skins.minerva.scripts/styles.less index 651da2d8d..405646961 100644 --- a/resources/skins.minerva.scripts/styles.less +++ b/resources/skins.minerva.scripts/styles.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; .last-modified-bar { &.active { diff --git a/resources/skins.minerva.tablet.styles/common.less b/resources/skins.minerva.tablet.styles/common.less index d8c3cd524..fbd587ca8 100644 --- a/resources/skins.minerva.tablet.styles/common.less +++ b/resources/skins.minerva.tablet.styles/common.less @@ -2,8 +2,8 @@ A file for css that optimises the Minerva skin on larger devices. */ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; @paddingVertical: 1.4em; @media screen and ( min-width: @width-breakpoint-tablet ) { diff --git a/resources/skins.minerva.tablet.styles/hacks.less b/resources/skins.minerva.tablet.styles/hacks.less index 83f7ebdd3..c7e8b609c 100644 --- a/resources/skins.minerva.tablet.styles/hacks.less +++ b/resources/skins.minerva.tablet.styles/hacks.less @@ -8,8 +8,8 @@ https://www.mediawiki.org/wiki/Requests_for_comment/Allow_styling_in_templates FIXME: Review all of these hacks to see if they still apply. */ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; /* Tablet specific styling */ @media all and ( min-width: @width-breakpoint-tablet ) { diff --git a/resources/skins.minerva.userpage.styles/userpage.less b/resources/skins.minerva.userpage.styles/userpage.less index 2094fae82..8d189c695 100644 --- a/resources/skins.minerva.userpage.styles/userpage.less +++ b/resources/skins.minerva.userpage.styles/userpage.less @@ -1,5 +1,5 @@ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; .user-links { margin: 15px 0 0 0; diff --git a/skin.json b/skin.json index e7de7bea0..cfac3ea86 100644 --- a/skin.json +++ b/skin.json @@ -12,7 +12,6 @@ "MobileFrontend": ">= 2.1.0" } }, - "callback": "MinervaHooks::onRegistration", "config": { "MinervaDownloadNamespaces": [ 0 ], "MinervaEnableSiteNotice": false, diff --git a/skinStyles/ext.echo.styles.special/SpecialNotificationsOverlay.less b/skinStyles/ext.echo.styles.special/SpecialNotificationsOverlay.less index 293d22215..5176cbcb2 100644 --- a/skinStyles/ext.echo.styles.special/SpecialNotificationsOverlay.less +++ b/skinStyles/ext.echo.styles.special/SpecialNotificationsOverlay.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; .mw-echo-ui-notificationsInboxWidget { &-cell { diff --git a/skinStyles/mediawiki.action.edit.styles/minerva.less b/skinStyles/mediawiki.action.edit.styles/minerva.less index a7366feed..03a8048a5 100644 --- a/skinStyles/mediawiki.action.edit.styles/minerva.less +++ b/skinStyles/mediawiki.action.edit.styles/minerva.less @@ -1,5 +1,5 @@ // Additional Styles for no-js editing mode -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.mixins'; .mw-editform { .editHelp, .cancelLink { diff --git a/skinStyles/mediawiki.hlist/minerva.less b/skinStyles/mediawiki.hlist/minerva.less index a436568b4..91c6b8770 100644 --- a/skinStyles/mediawiki.hlist/minerva.less +++ b/skinStyles/mediawiki.hlist/minerva.less @@ -1,4 +1,4 @@ -@import 'minerva.variables.less'; +@import '../../minerva.less/minerva.variables'; /** * This tweaks the default mediawiki.hlist module to provide performance optimisations diff --git a/skinStyles/mediawiki.page.gallery.styles/tablet.less b/skinStyles/mediawiki.page.gallery.styles/tablet.less index 7bc3e9736..09d67dd39 100644 --- a/skinStyles/mediawiki.page.gallery.styles/tablet.less +++ b/skinStyles/mediawiki.page.gallery.styles/tablet.less @@ -1,5 +1,5 @@ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; // Hacks to render galleries and multicol tables better on mobile @media all and ( max-width: @deviceWidthTablet ) { diff --git a/skinStyles/mediawiki.special.preferences.styles/styles.less b/skinStyles/mediawiki.special.preferences.styles/styles.less index 0883264cc..7671aa621 100644 --- a/skinStyles/mediawiki.special.preferences.styles/styles.less +++ b/skinStyles/mediawiki.special.preferences.styles/styles.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; // FIXME: All this code can be removed when T117781/T171238 is resolved. #preftoc { diff --git a/skinStyles/mediawiki.special.search.styles/minerva.less b/skinStyles/mediawiki.special.search.styles/minerva.less index 4f42a4c68..53bc39392 100644 --- a/skinStyles/mediawiki.special.search.styles/minerva.less +++ b/skinStyles/mediawiki.special.search.styles/minerva.less @@ -1,5 +1,5 @@ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; .mw-mobile-mode .searchresults { ul.mw-search-results { diff --git a/skinStyles/mediawiki.special.userlogin.common.styles/minerva.less b/skinStyles/mediawiki.special.userlogin.common.styles/minerva.less index 5811f698a..4a173a4dd 100644 --- a/skinStyles/mediawiki.special.userlogin.common.styles/minerva.less +++ b/skinStyles/mediawiki.special.userlogin.common.styles/minerva.less @@ -1,5 +1,5 @@ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; // hide the texts inside these selectors because they push the login form below the fold #userloginprompt, diff --git a/skinStyles/mobile.editor.ve/minerva.less b/skinStyles/mobile.editor.ve/minerva.less index c8027659c..5f853a83f 100644 --- a/skinStyles/mobile.editor.ve/minerva.less +++ b/skinStyles/mobile.editor.ve/minerva.less @@ -1,5 +1,5 @@ @import 'mediawiki.mixins.less'; -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; .editor-overlay-ve { .content { diff --git a/skinStyles/mobile.languages.structured/LanguageOverlay.less b/skinStyles/mobile.languages.structured/LanguageOverlay.less index 6e96b07bd..de47f1db6 100644 --- a/skinStyles/mobile.languages.structured/LanguageOverlay.less +++ b/skinStyles/mobile.languages.structured/LanguageOverlay.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; @media screen and ( min-width: @width-breakpoint-desktop ) { .language-overlay { diff --git a/skinStyles/mobile.notifications.overlay/minerva.less b/skinStyles/mobile.notifications.overlay/minerva.less index fad64fe13..2891804fa 100644 --- a/skinStyles/mobile.notifications.overlay/minerva.less +++ b/skinStyles/mobile.notifications.overlay/minerva.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; .notifications-overlay .overlay-content { top: @headerHeight; diff --git a/skinStyles/mobile.search/SearchOverlay.less b/skinStyles/mobile.search/SearchOverlay.less index f1a0d7733..59b223c45 100644 --- a/skinStyles/mobile.search/SearchOverlay.less +++ b/skinStyles/mobile.search/SearchOverlay.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; // These styles transform the SearchOverlay appearance in the Minerva skin. // Since SearchOverlay can be used by other skins, these styles are kept separate from diff --git a/skinStyles/mobile.special.mobilemenu.styles/minerva.less b/skinStyles/mobile.special.mobilemenu.styles/minerva.less index dbf6b4abb..1278ba183 100644 --- a/skinStyles/mobile.special.mobilemenu.styles/minerva.less +++ b/skinStyles/mobile.special.mobilemenu.styles/minerva.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; body.navigation-full-screen { background-color: @primaryNavBackgroundColor; diff --git a/skinStyles/mobile.special.mobileoptions.styles/minerva.less b/skinStyles/mobile.special.mobileoptions.styles/minerva.less index f326b5e96..a726b3ec2 100644 --- a/skinStyles/mobile.special.mobileoptions.styles/minerva.less +++ b/skinStyles/mobile.special.mobileoptions.styles/minerva.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; @media all and ( min-width: @deviceWidthTablet ) { .ns-special .pre-content { diff --git a/skinStyles/mobile.special.styles/minerva.less b/skinStyles/mobile.special.styles/minerva.less index 38f9d2f70..019ec4e26 100644 --- a/skinStyles/mobile.special.styles/minerva.less +++ b/skinStyles/mobile.special.styles/minerva.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; // FIXME [mediawiki ui] These rules should not be needed in the mobile context .mw-ui-button-group { diff --git a/skinStyles/mobile.startup/Overlay.less b/skinStyles/mobile.startup/Overlay.less index 3d44a0226..7c541283c 100644 --- a/skinStyles/mobile.startup/Overlay.less +++ b/skinStyles/mobile.startup/Overlay.less @@ -1,5 +1,5 @@ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; .overlay { padding-top: @headerHeight; diff --git a/skinStyles/mobile.startup/toast.less b/skinStyles/mobile.startup/toast.less index 01d89855e..ce0648a5e 100644 --- a/skinStyles/mobile.startup/toast.less +++ b/skinStyles/mobile.startup/toast.less @@ -1,5 +1,5 @@ -@import 'minerva.variables'; -@import 'minerva.mixins'; +@import '../../minerva.less/minerva.variables'; +@import '../../minerva.less/minerva.mixins'; // Toast notifications // diff --git a/skinStyles/mobile.toggle/minerva.less b/skinStyles/mobile.toggle/minerva.less index 5164c84a6..eb23a60fa 100644 --- a/skinStyles/mobile.toggle/minerva.less +++ b/skinStyles/mobile.toggle/minerva.less @@ -1,4 +1,4 @@ -@import 'minerva.variables'; +@import '../../minerva.less/minerva.variables'; .client-js { .collapsible-heading,