jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387732 )
Change subject: build: Organise Gruntfile.js more consistently
......................................................................
build: Organise Gruntfile.js more consistently
This also adds linting for skinStyles, with a few fixes to make these pass.
Change-Id: Id26b0bad21850d985eaaceda24fa50ad6f886458
---
M Gruntfile.js
M skinStyles/mediawiki.hlist/minerva.less
M skinStyles/mediawiki.special.preferences.styles/styles.less
M skinStyles/mobile.startup/Overlay.less
4 files changed, 28 insertions(+), 24 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/Gruntfile.js b/Gruntfile.js
index c4352eb..a0f8cd2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,10 +13,10 @@
eslint: {
all: [
'**/*.js',
- '!libs/**',
- '!vendor/**',
'!docs/**',
- '!node_modules/**'
+ '!libs/**',
+ '!node_modules/**',
+ '!vendor/**'
]
},
stylelint: {
@@ -24,17 +24,30 @@
syntax: 'less'
},
all: [
- 'minerva.less/**/*.less',
- 'resources/**/*.less'
+ '**/*.less',
+ '!docs/**',
+ '!libs/**',
+ '!node_modules/**',
+ '!vendor/**'
]
},
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!docs/**',
+ '!libs/**',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ },
+ banana: conf.MessagesDirs,
watch: {
lint: {
- files: [ 'resources/**/*.js',
'tests/qunit/**/*.js' ],
+ files: [
'{resources,tests/qunit}/**/*.{js,less}' ],
tasks: [ 'lint' ]
},
scripts: {
- files: [ 'resources/**/*.js',
'tests/qunit/**/*.js' ],
+ files: [ '{resources,tests/qunit}/**/*.js' ],
tasks: [ 'test' ]
},
configFiles: {
@@ -43,19 +56,10 @@
reload: true
}
}
- },
- banana: conf.MessagesDirs,
- jsonlint: {
- all: [
- '*.json',
- '**/*.json',
- '!node_modules/**',
- '!vendor/**'
- ]
}
} );
- grunt.registerTask( 'lint', [ 'eslint', 'jsonlint', 'banana',
'stylelint' ] );
+ grunt.registerTask( 'lint', [ 'eslint', 'stylelint', 'jsonlint',
'banana' ] );
grunt.registerTask( 'test', [ 'lint' ] );
grunt.registerTask( 'default', [ 'test' ] );
diff --git a/skinStyles/mediawiki.hlist/minerva.less
b/skinStyles/mediawiki.hlist/minerva.less
index abe6279..a436568 100644
--- a/skinStyles/mediawiki.hlist/minerva.less
+++ b/skinStyles/mediawiki.hlist/minerva.less
@@ -1,4 +1,4 @@
- @import 'minerva.variables.less';
+@import 'minerva.variables.less';
/**
* This tweaks the default mediawiki.hlist module to provide performance
optimisations
@@ -7,7 +7,7 @@
// FIXME: to support hlists on enwiki projects - this should be deprecated
.hlist > ul,
-.hlist > dl,.hlist > ul,
+.hlist > dl,
// Horizontal Lists
//
// Use hlist class when dealing with lists where items should be horizontal.
diff --git a/skinStyles/mediawiki.special.preferences.styles/styles.less
b/skinStyles/mediawiki.special.preferences.styles/styles.less
index 2e6814d..7e5599b 100644
--- a/skinStyles/mediawiki.special.preferences.styles/styles.less
+++ b/skinStyles/mediawiki.special.preferences.styles/styles.less
@@ -46,4 +46,4 @@
border: solid 1px @colorFieldBorder;
padding: 8px;
}
-}
\ No newline at end of file
+}
diff --git a/skinStyles/mobile.startup/Overlay.less
b/skinStyles/mobile.startup/Overlay.less
index c0b123c..3d44a02 100644
--- a/skinStyles/mobile.startup/Overlay.less
+++ b/skinStyles/mobile.startup/Overlay.less
@@ -4,6 +4,10 @@
.overlay {
padding-top: @headerHeight;
+ > ul, button {
+ width: @headerHeight;
+ }
+
.license {
.secondary-text();
}
@@ -17,10 +21,6 @@
.slider-button {
top: @headerHeight;
- }
-
- > ul, button {
- width: @headerHeight;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/387732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id26b0bad21850d985eaaceda24fa50ad6f886458
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Pmiazga <pmia...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
