jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374086 )
Change subject: Update skin to match changes done to vector
..
Update skin to match changes done to vector
Bug: T174292
Change-Id: I9ae5a0c772279193a93c53259f8c39989628af04
---
M Gruntfile.js
M MetrolookTemplate.php
M README.md
A ResourceLoaderLessModule.php
M SkinMetrolook.php
M components/custom/common.less
M components/custom/externalLinks.less
M components/custom/navigation.less
M components/custom/search.less
M components/custom/tabs.less
M components/main/common.less
M components/main/externalLinks.less
M components/main/navigation.less
M components/main/search.less
M components/main/tabs.less
M js/collapsibleTabs.js
M js/vector.js
A print.less
M skin.json
A skinStyles/mediawiki.action.view.redirectPage.less
M skinStyles/mediawiki.notification.less
M skinStyles/mediawiki.special.preferences.styles.less
M variables.less
23 files changed, 619 insertions(+), 338 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index 963ac50..0d7a788 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,6 +11,7 @@
'*.js',
'**/*.js',
'!node_modules/**',
+ '!vendor/**',
'!js/overthrow.js'
]
},
@@ -22,7 +23,9 @@
all: [
'*.json',
'**/*.json',
- '!node_modules/**'
+ '.stylelintrc',
+ '!node_modules/**',
+ '!vendor/**'
]
}
} );
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index a93ee41..a44710d 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -117,50 +117,22 @@
*/
public function execute() {
$skin = $this->getSkin();
- // Build additional attributes for navigation urls
- $nav = $this->data['content_navigation'];
+ $this->data['namespace_urls'] =
$this->data['content_navigation']['namespaces'];
+ $this->data['view_urls'] =
$this->data['content_navigation']['views'];
+ $this->data['action_urls'] =
$this->data['content_navigation']['actions'];
+ $this->data['variant_urls'] =
$this->data['content_navigation']['variants'];
+ // Move the watch/unwatch star outside of the collapsed
"actions" menu to the main "views" menu
if ( $this->config->get( 'MetrolookUseIconWatch' ) ) {
$mode = $skin->getUser()->isWatched(
$skin->getRelevantTitle() )
? 'unwatch'
: 'watch';
- if ( isset( $nav['actions'][$mode] ) ) {
- $nav['views'][$mode] = $nav['actions'][$mode];
- $nav['views'][$mode]['class'] = rtrim( 'icon '
. $nav['views'][$mode]['class'], ' ' );
- $nav['views'][$mode]['primary'] = true;
- unset( $nav['actions'][$mode] );
+ if ( isset( $this->data['action_urls'][$mode] ) ) {
+ $this->data['view_urls'][$mode] =
$this->data['action_urls'][$mode];
+ unset( $this->data['action_urls'][$mode] );
}
}
-
- $xmlID = '';
- foreach ( $nav as $section => $links ) {
- foreach ( $links as $key => $link ) {
- if ( $section == 'views' && !( isset(
$link['primary'] ) && $link['primary'] ) ) {
- $link['class'] = rtrim( 'collapsible '
. $link['class'], ' ' );
- }
-
- $xmlID = isset( $link['id'] ) ? $link['id'] :
'ca-' . $xmlID;
- $nav[$section][$key]['attributes'] =
- ' id="' . Sanitizer::escapeId( $xmlID )
. '"';
- if ( $link['class'] ) {
- $nav[$section][$key]['attributes'] .=
- ' class="' . htmlspecialchars(
$link['class'] ) . '"';
- unset( $nav[$section][$key]['class'] );
- }
- if ( isset( $link['tooltiponly'] ) &&
$link['tooltiponly'] ) {
- $nav[$section][$key]['key'] =
- Linker::tooltip( $xmlID
