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
This commit is contained in:
Timo Tijhof 2018-05-19 20:17:31 +02:00 committed by Krinkle
parent 91a3adacb7
commit 64134bd8a6
46 changed files with 70 additions and 80 deletions

View file

@ -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

View file

@ -1,4 +1,4 @@
@import 'minerva.variables';
@import '../../minerva.less/minerva.variables';
@import 'mediawiki.mixins.less';
.backtotop {

View file

@ -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,

View file

@ -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
//

View file

@ -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 {

View file

@ -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;

View file

@ -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);

View file

@ -1,5 +1,5 @@
@import 'minerva.variables';
@import 'minerva.mixins';
@import '../../../minerva.less/minerva.variables';
@import '../../../minerva.less/minerva.mixins';
@dividerHeight: 2px;
@dividerSpacing: 28px;

View file

@ -1,5 +1,5 @@
@import 'minerva.variables';
@import 'minerva.mixins';
@import '../../../minerva.less/minerva.variables';
@import '../../../minerva.less/minerva.mixins';
.printfooter {
display: block;

View file

@ -1,4 +1,4 @@
@import 'minerva.variables';
@import '../../../minerva.less/minerva.variables';
@media print {
.noprint,

View file

@ -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 */

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -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 {

View file

@ -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.

View file

@ -1,5 +1,5 @@
@import 'minerva.variables';
@import 'minerva.mixins';
@import '../../minerva.less/minerva.variables';
@import '../../minerva.less/minerva.mixins';
// Content formatting and typography
//

View file

@ -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,

View file

@ -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 {

View file

@ -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
//

View file

@ -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

View file

@ -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 */

View file

@ -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 {

View file

@ -1,4 +1,4 @@
@import 'minerva.variables';
@import '../../minerva.less/minerva.variables';
@colorTutorial: #2e76ff;

View file

@ -1,4 +1,4 @@
@import 'minerva.variables';
@import '../../minerva.less/minerva.variables';
.last-modified-bar {
&.active {

View file

@ -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 ) {

View file

@ -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 ) {

View file

@ -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;

View file

@ -12,7 +12,6 @@
"MobileFrontend": ">= 2.1.0"
}
},
"callback": "MinervaHooks::onRegistration",
"config": {
"MinervaDownloadNamespaces": [ 0 ],
"MinervaEnableSiteNotice": false,

View file

@ -1,4 +1,4 @@
@import 'minerva.variables';
@import '../../minerva.less/minerva.variables';
.mw-echo-ui-notificationsInboxWidget {
&-cell {

View file

@ -1,5 +1,5 @@
// Additional Styles for no-js editing mode
@import 'minerva.mixins';
@import '../../minerva.less/minerva.mixins';
.mw-editform {
.editHelp, .cancelLink {

View file

@ -1,4 +1,4 @@
@import 'minerva.variables.less';
@import '../../minerva.less/minerva.variables';
/**
* This tweaks the default mediawiki.hlist module to provide performance optimisations

View file

@ -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 ) {

View file

@ -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 {

View file

@ -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 {

View file

@ -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,

View file

@ -1,5 +1,5 @@
@import 'mediawiki.mixins.less';
@import 'minerva.variables';
@import '../../minerva.less/minerva.variables';
.editor-overlay-ve {
.content {

View file

@ -1,4 +1,4 @@
@import 'minerva.variables';
@import '../../minerva.less/minerva.variables';
@media screen and ( min-width: @width-breakpoint-desktop ) {
.language-overlay {

View file

@ -1,4 +1,4 @@
@import 'minerva.variables';
@import '../../minerva.less/minerva.variables';
.notifications-overlay .overlay-content {
top: @headerHeight;

View file

@ -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

View file

@ -1,4 +1,4 @@
@import 'minerva.variables';
@import '../../minerva.less/minerva.variables';
body.navigation-full-screen {
background-color: @primaryNavBackgroundColor;

View file

@ -1,4 +1,4 @@
@import 'minerva.variables';
@import '../../minerva.less/minerva.variables';
@media all and ( min-width: @deviceWidthTablet ) {
.ns-special .pre-content {

View file

@ -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 {

View file

@ -1,5 +1,5 @@
@import 'minerva.variables';
@import 'minerva.mixins';
@import '../../minerva.less/minerva.variables';
@import '../../minerva.less/minerva.mixins';
.overlay {
padding-top: @headerHeight;

View file

@ -1,5 +1,5 @@
@import 'minerva.variables';
@import 'minerva.mixins';
@import '../../minerva.less/minerva.variables';
@import '../../minerva.less/minerva.mixins';
// Toast notifications
//

View file

@ -1,4 +1,4 @@
@import 'minerva.variables';
@import '../../minerva.less/minerva.variables';
.client-js {
.collapsible-heading,