From f2695a5bf3670aa0e7861345fffdeabcf30651e0 Mon Sep 17 00:00:00 2001 From: Volker E Date: Fri, 25 Oct 2019 13:46:51 -0700 Subject: [PATCH] hygiene: Make LESS imports non-ambigious Some LESS parsers will get confused with the lack of file extension. It's better to be explicit and in alignment with recent change in core I379334d7729e587a2a00. It was already weirdly mixed in this repo with some imports featuring extension and some not. Change-Id: If5065cf9e30289de9b4fd33315bd65b75959ecb7 --- components/common.less | 2 +- components/navigation.less | 8 ++++---- components/search.less | 4 ++-- components/tabs.less | 4 ++-- components/watchstar.less | 4 ++-- responsive.less | 2 +- skinStyles/mediawiki.notification.less | 2 +- variables.less | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/components/common.less b/components/common.less index 3cac165..700354e 100644 --- a/components/common.less +++ b/components/common.less @@ -3,7 +3,7 @@ * prepended with @noflip in a comment block. * */ -@import 'mediawiki.mixins'; +@import 'mediawiki.mixins.less'; /* Framework */ html { diff --git a/components/navigation.less b/components/navigation.less index 1a553c3..b061a01 100644 --- a/components/navigation.less +++ b/components/navigation.less @@ -1,7 +1,7 @@ -@import 'mediawiki.mixins'; -@import 'personalNavigation'; -@import 'search'; -@import 'tabs'; +@import 'mediawiki.mixins.less'; +@import 'personalNavigation.less'; +@import 'search.less'; +@import 'tabs.less'; /* Hide, but keep accessible for screen-readers */ #mw-navigation h2 { diff --git a/components/search.less b/components/search.less index 8498dda..37baa51 100644 --- a/components/search.less +++ b/components/search.less @@ -1,5 +1,5 @@ -@import 'mediawiki.mixins'; -@import 'mediawiki.ui/variables'; +@import 'mediawiki.mixins.less'; +@import 'mediawiki.ui/variables.less'; /* Search */ #p-search { diff --git a/components/tabs.less b/components/tabs.less index dffff0d..4a66c1b 100644 --- a/components/tabs.less +++ b/components/tabs.less @@ -1,5 +1,5 @@ -@import '../variables'; -@import 'mediawiki.mixins'; +@import '../variables.less'; +@import 'mediawiki.mixins.less'; /** * Styling for namespace tabs (page, discussion) and views (read, edit, view history, watch and other actions) diff --git a/components/watchstar.less b/components/watchstar.less index 2dbd5d0..aaea6d0 100644 --- a/components/watchstar.less +++ b/components/watchstar.less @@ -1,5 +1,5 @@ -@import '../variables'; -@import 'mediawiki.mixins.rotation'; +@import '../variables.less'; +@import 'mediawiki.mixins.rotation.less'; /* Watch/Unwatch Icon Styling */ /* Only use icon if the menu item is not collapsed into the "More" dropdown diff --git a/responsive.less b/responsive.less index 22448c6..1926c18 100644 --- a/responsive.less +++ b/responsive.less @@ -3,7 +3,7 @@ instead of to the side of it. They also hide the logo, as there's no space left for it. */ -@import 'mediawiki.ui/variables'; +@import 'mediawiki.ui/variables.less'; @media screen and ( max-width: @width-breakpoint-tablet ) { #mw-head { diff --git a/skinStyles/mediawiki.notification.less b/skinStyles/mediawiki.notification.less index 399f61c..78e0ab7 100644 --- a/skinStyles/mediawiki.notification.less +++ b/skinStyles/mediawiki.notification.less @@ -1,4 +1,4 @@ -@import 'mediawiki.ui/variables'; +@import 'mediawiki.ui/variables.less'; @import '../variables.less'; /* mediawiki.notification */ diff --git a/variables.less b/variables.less index 44ccc9e..01858cb 100644 --- a/variables.less +++ b/variables.less @@ -1,4 +1,4 @@ -@import 'mediawiki.ui/variables'; +@import 'mediawiki.ui/variables.less'; @font-size-root: 100%; @font-size-browser: 16; // Assumed browser default of `16px`