From 5a0932835a017f3cba4b9cf32c256d79d8dd09c8 Mon Sep 17 00:00:00 2001 From: Jon Robson Date: Wed, 12 Jan 2022 11:36:45 -0800 Subject: [PATCH] Cleanup: Only need to import one variable file Change-Id: I120a66ec7013d249e8c42e6e631ae568effaa925 --- resources/common/components/SearchBox.less | 1 - resources/common/variables.less | 2 +- resources/skins.vector.styles/components/checkboxHack.less | 3 +-- skinStyles/ext.echo.styles.alert.less | 3 +-- skinStyles/mediawiki.notification.less | 1 - 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/resources/common/components/SearchBox.less b/resources/common/components/SearchBox.less index bb19953..d7fe3bc 100644 --- a/resources/common/components/SearchBox.less +++ b/resources/common/components/SearchBox.less @@ -1,5 +1,4 @@ @import 'mediawiki.mixins.less'; -@import 'mediawiki.ui/variables.less'; @import '../../common/variables.less'; // Defined as `div`. diff --git a/resources/common/variables.less b/resources/common/variables.less index f60ab85..4aeb3c7 100644 --- a/resources/common/variables.less +++ b/resources/common/variables.less @@ -1,5 +1,5 @@ -@import 'mediawiki.ui/variables.less'; @import 'mediawiki.skin.variables.less'; +@import 'mediawiki.ui/variables.less'; // Sizing calculation primitives. @font-size-root: 100%; diff --git a/resources/skins.vector.styles/components/checkboxHack.less b/resources/skins.vector.styles/components/checkboxHack.less index 335285b..b77f8d3 100644 --- a/resources/skins.vector.styles/components/checkboxHack.less +++ b/resources/skins.vector.styles/components/checkboxHack.less @@ -29,8 +29,7 @@ // display: none; // } -@import 'mediawiki.ui/variables.less'; -@import 'mediawiki.mixins.less'; +@import '../../common/variables.less'; .mw-checkbox-hack-checkbox { // We don't want the browser to focus on the checkbox so we remove it from the diff --git a/skinStyles/ext.echo.styles.alert.less b/skinStyles/ext.echo.styles.alert.less index 74bf34f..e79f865 100644 --- a/skinStyles/ext.echo.styles.alert.less +++ b/skinStyles/ext.echo.styles.alert.less @@ -1,5 +1,4 @@ -@import 'mediawiki.ui/variables.less'; -@import 'mediawiki.skin.variables.less'; +@import '../resources/common/variables.less'; .vector-user-links { .vector-menu-content-list { diff --git a/skinStyles/mediawiki.notification.less b/skinStyles/mediawiki.notification.less index 597887a..27b27c3 100644 --- a/skinStyles/mediawiki.notification.less +++ b/skinStyles/mediawiki.notification.less @@ -1,4 +1,3 @@ -@import 'mediawiki.ui/variables.less'; @import '../resources/common/variables.less'; /* mediawiki.notification */