wikimedia/mediawiki-skins-MinervaNeue
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue synced 2024-09-23 10:19:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Remove old :before icon selectors and update selectors to not use minerva and wikimedia prefixes"

Browse source
This commit is contained in:
jenkins-bot 2023-09-07 18:46:41 +00:00 committed by Gerrit Code Review
parent e09c41b011 269bd5bdaf
commit 5a6016b708
16 changed files with 38 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Menu/Entries/LanguageSelectorEntry.php
View file

@ -73,7 +73,7 @@ class LanguageSelectorEntry implements IMenuEntry {
$this->title = $title;
$this->doesPageHaveLanguages = $doesPageHaveLanguages;
$this->messageLocalizer = $messageLocalizer;
$this->icon = 'wikimedia-language-base20';
$this->icon = 'language-base20';
$this->label = $label;
$this->classes = $classes;
}

2
includes/Menu/Entries/ProfileMenuEntry.php
View file

@ -85,7 +85,7 @@ final class ProfileMenuEntry implements IProfileMenuEntry {
$username = $this->user->getName();
return [ [
'data-icon' => [
'icon' => 'wikimedia-userAvatar-base20',
'icon' => 'userAvatar-base20',
],
'label' => $this->customProfileLabel ?? $username,
'array-attributes' => [

7
includes/Menu/Entries/SingleMenuEntry.php
View file

@ -72,7 +72,7 @@ class SingleMenuEntry implements IMenuEntry {
* @return $this
*/
public function overrideIcon( $icon ) {
$this->setIcon( str_replace( 'minerva-', '', $icon ) );
$this->setIcon( $icon );
return $this;
}
@ -163,12 +163,11 @@ class SingleMenuEntry implements IMenuEntry {
/**
* Set the Menu entry icon
* @param string|null $iconName
* @param string $iconPrefix either `wikimedia` or `minerva`
* @return $this
*/
public function setIcon( $iconName, $iconPrefix = 'minerva' ) {
public function setIcon( $iconName ) {
if ( $iconName !== null ) {
$this->attributes['data-icon']['icon'] = $iconPrefix . '-' . $iconName;
$this->attributes['data-icon']['icon'] = $iconName;
} else {
$this->attributes['data-icon'] = null;
}

2
includes/Menu/PageActions/PageActionsDirector.php
View file

@ -83,7 +83,7 @@ final class PageActionsDirector {
'data-btn' => [
'tag-name' => 'label',
'data-icon' => [
'icon' => 'minerva-ellipsis',
'icon' => 'ellipsis',
],
'classes' => 'toggle-list__toggle',
'array-attributes' => [

6
includes/Menu/PageActions/ToolbarBuilder.php
View file

@ -215,7 +215,7 @@ class ToolbarBuilder {
$title->getLocalURL( $editArgs ),
'edit-page'
);
$entry->setIcon( $editOrCreate ? 'edit-base20' : 'editLock-base20', 'wikimedia' )
$entry->setIcon( $editOrCreate ? 'edit-base20' : 'editLock-base20' )
->trackClicks( 'edit' )
->setTitle( $this->messageLocalizer->msg( 'mobile-frontend-pageaction-edit-tooltip' ) )
->setNodeID( 'ca-edit' );
@ -263,7 +263,7 @@ class ToolbarBuilder {
$btnClass . ' mw-watchlink'
);
return $entry->trackClicks( $newModeToSet )
->setIcon( $icon, 'wikimedia' )
->setIcon( $icon )
->setTitle( $msg )
->setNodeID( 'ca-watch' );
}
@ -280,7 +280,7 @@ class ToolbarBuilder {
$this->messageLocalizer->msg( 'minerva-page-actions-history' )->escaped(),
$this->getHistoryUrl( $this->title )
);
$entry->setIcon( 'history-base20', 'wikimedia' )
$entry->setIcon( 'history-base20' )
->trackClicks( 'history' );
return $entry;
}

2
includes/Menu/User/UserMenuDirector.php
View file

@ -66,7 +66,7 @@ final class UserMenuDirector {
'data-btn' => [
'tag-name' => 'label',
'data-icon' => [
'icon' => 'minerva-userAvatarOutline',
'icon' => 'userAvatarOutline',
],
'classes' => 'toggle-list__toggle',
'array-attributes' => [

2
includes/Skins/SearchBox.mustache
View file

@ -1,7 +1,7 @@
<form action="{{form-action}}" method="get" class="minerva-search-form">
<div class="search-box">
<input type="hidden" name="title" value="{{page-title}}"/>
<input class="search mw-ui-background-icon-search skin-minerva-search-trigger" type="search" name="search" id="searchInput"
<input class="search minerva-icon--search skin-minerva-search-trigger" type="search" name="search" id="searchInput"
{{{html-input-attributes}}}">
</div>
{{!

12
includes/Skins/SkinMinerva.php
View file

@ -135,7 +135,7 @@ class SkinMinerva extends SkinMustache {
*/
private function getNotificationFallbackButton() {
return [
'icon' => 'wikimedia-bellOutline-base20',
'icon' => 'bellOutline-base20',
'href' => SpecialPage::getTitleFor( 'Mytalk' )->getLocalURL(
[ 'returnto' => $this->getTitle()->getPrefixedText() ]
),
@ -214,7 +214,7 @@ class SkinMinerva extends SkinMustache {
return $class !== 'oo-ui-icon-bellOutline';
}
);
$alert['icon'] = 'wikimedia-bellOutline-base20';
$alert['icon'] = 'bellOutline-base20';
return $alert;
}
@ -297,7 +297,7 @@ class SkinMinerva extends SkinMustache {
$usermessage = $data['html-user-message'] ?? '';
if ( $usermessage ) {
$data['html-user-message'] = Html::warningBox(
'<span class="minerva-icon minerva-icon--wikimedia-userTalk-warning"></span>&nbsp;'
'<span class="minerva-icon minerva-icon--userTalk-warning"></span>&nbsp;'
. $usermessage,
'minerva-anon-talk-message'
);
@ -312,7 +312,7 @@ class SkinMinerva extends SkinMustache {
'data-minerva-search-box' => $data['data-search-box'] + [
'data-btn' => [
'data-icon' => [
'icon' => 'wikimedia-search-base20',
'icon' => 'search-base20',
],
'label' => $this->msg( 'searchbutton' )->escaped(),
'classes' => 'skin-minerva-search-trigger',
@ -326,7 +326,7 @@ class SkinMinerva extends SkinMustache {
],
'data-minerva-main-menu-btn' => [
'data-icon' => [
'icon' => 'wikimedia-menu-base20',
'icon' => 'menu-base20',
],
'tag-name' => 'label',
'classes' => 'toggle-list__toggle',
@ -568,7 +568,7 @@ class SkinMinerva extends SkinMustache {
$html .= $templateParser->processTemplate( 'Button', [
'tag-name' => 'a',
'data-icon' => [
'icon' => 'wikimedia-edit-base20'
'icon' => 'edit-base20'
],
'array-attributes' => [
[

4
resources/skins.minerva.scripts/downloadPageAction.js
View file

@ -77,7 +77,7 @@
* @param {Icon} spinner
*/
function onClick( portletItem, spinner ) {
var icon = portletItem.querySelector( '.minerva-icon--minerva-download' );
var icon = portletItem.querySelector( '.minerva-icon--download' );
function doPrint() {
printSetTimeoutReference = clearTimeout( printSetTimeoutReference );
track( 'minerva.downloadAsPDF', {
@ -154,7 +154,7 @@
} );
iconElement = portletLink.querySelector( '.minerva-icon' );
if ( iconElement ) {
iconElement.classList.add( 'minerva-icon--minerva-download' );
iconElement.classList.add( 'minerva-icon--download' );
}
spinner.$el.hide().insertBefore(
$( portletLink ).find( '.minerva-icon' )

12
resources/skins.minerva.scripts/initMobile.js
View file

@ -6,10 +6,6 @@
* framework or upstreamed from MobileFrotend to core) should be and moved into ./setup.js
* @todo anything left should be moved to MobileFrontend extension and removed from here.
*/
// TODO: T319260 - History/arrow icon DOM manipulation can be removed
// once Codex icons are in place.
var HISTORY_ICON_CLASS = 'mw-ui-icon-wikimedia-history-base20';
var HISTORY_ARROW_CLASS = 'mw-ui-icon-mf-expand-gray';
module.exports = function () {
var
@ -186,14 +182,6 @@ module.exports = function () {
if ( time.isRecent( delta ) ) {
$bar = $lastModifiedLink.closest( '.last-modified-bar' );
$bar.addClass( 'active' );
// TODO: T319260 - Delete this icon manipulation
// on Codex icons are in place.
$bar.find( '.' + HISTORY_ICON_CLASS )
.addClass( HISTORY_ICON_CLASS.replace( '-base20', '-invert' ) )
.removeClass( HISTORY_ICON_CLASS );
$bar.find( '.' + HISTORY_ARROW_CLASS )
.addClass( HISTORY_ARROW_CLASS.replace( '-gray', '-invert' ) )
.removeClass( HISTORY_ARROW_CLASS );
}
$msg = $( '<span>' )

6
resources/skins.minerva.scripts/watchStar.less
View file

@ -1,12 +1,10 @@
.minerva-animations-ready .mw-watchlink {
.minerva-icon,
.mw-ui-icon::before {
.minerva-icon {
transform: rotate( 0deg );
transition: transform 0.5s;
}
.minerva-icon--wikimedia-unStar-progressive,
.mw-ui-icon-wikimedia-unStar-progressive::before {
.minerva-icon--unStar-progressive {
transform: rotate( 72deg );
}
}

8
resources/skins.minerva.scripts/watchstar.js
View file

@ -3,9 +3,9 @@ var watchstar = mw.loader.require( 'mediawiki.page.watch.ajax' ).watchstar;
( function () {
var
WATCHED_ICON_CLASS = 'mw-ui-icon-wikimedia-unStar-progressive',
TEMP_WATCHED_ICON_CLASS = 'mw-ui-icon-wikimedia-halfStar-progressive',
UNWATCHED_ICON_CLASS = 'mw-ui-icon-wikimedia-star-base20';
WATCHED_ICON_CLASS = 'minerva-icon--unStar-progressive',
TEMP_WATCHED_ICON_CLASS = 'minerva-icon--halfStar-progressive',
UNWATCHED_ICON_CLASS = 'minerva-icon--star-base20';
/**
* Tweaks the global watchstar handler in core to use the correct classes for Minerva.
@ -24,7 +24,7 @@ var watchstar = mw.loader.require( 'mediawiki.page.watch.ajax' ).watchstar;
* @param {string} expiry
*/
function toggleClasses( $link, isWatched, expiry ) {
var $icon = $link.find( '.minerva-icon, .mw-ui-icon' );
var $icon = $link.find( '.minerva-icon' );
$icon.removeClass( [ WATCHED_ICON_CLASS, UNWATCHED_ICON_CLASS, TEMP_WATCHED_ICON_CLASS ] )
.addClass( function () {
var classes = UNWATCHED_ICON_CLASS;

16
skin.json
View file

@ -300,7 +300,7 @@
"useDataURI": false,
"defaultColor": "#54595d",
"variants": [],
"selectorWithoutVariant": ".minerva-icon--wikimedia-{name}-base20, .mw-ui-icon-wikimedia-{name}-base20:before",
"selectorWithoutVariant": ".minerva-icon--{name}-base20, .minerva-icon--wikimedia-{name}-base20",
"icons": [
"bellOutline"
]
@ -311,7 +311,7 @@
]
},
"skins.minerva.overflow.icons": {
"selectorWithoutVariant": ".minerva-icon--minerva-{name}, .mw-ui-icon-minerva-{name}:before",
"selectorWithoutVariant": ".minerva-icon--{name}, .minerva-icon--minerva-{name}",
"useDataURI": false,
"defaultColor": "#54595d",
"class": "ResourceLoaderOOUIIconPackModule",
@ -338,8 +338,8 @@
]
},
"skins.minerva.icons.wikimedia": {
"selectorWithVariant": ".minerva-icon--wikimedia-{name}-{variant}, .mw-ui-icon-wikimedia-{name}-{variant}:before",
"selectorWithoutVariant": ".minerva-icon--wikimedia-{name}-base20, .minerva-icon--minerva-{name}, .mw-ui-icon-wikimedia-{name}-base20:before, .mw-ui-icon-minerva-{name}:before, .mw-ui-background-icon-{name}",
"selectorWithVariant": ".minerva-icon--{name}-{variant}, .minerva-icon--wikimedia-{name}-{variant}",
"selectorWithoutVariant": ".minerva-icon--{name}-base20, .minerva-icon--wikimedia-{name}-base20, .minerva-icon--minerva-{name}, .minerva-icon--{name}, .mw-ui-background-icon-{name}",
"useDataURI": false,
"defaultColor": "#54595d",
"variants": {
@ -373,7 +373,7 @@
},
"skins.minerva.icons.images.scripts.misc": {
"class": "ResourceLoaderOOUIIconPackModule",
"selectorWithoutVariant": ".minerva-icon--minerva-{name}, .mw-ui-icon-minerva-{name}:before",
"selectorWithoutVariant": ".minerva-icon--{name}, .minerva-icon--minerva-{name}",
"defaultColor": "#54595d",
"icons": [
"download",
@ -433,7 +433,7 @@
},
"skins.minerva.personalMenu.icons": {
"class": "ResourceLoaderOOUIIconPackModule",
"selectorWithoutVariant": ".minerva-icon--minerva-{name}, .mw-ui-icon-minerva-{name}:before",
"selectorWithoutVariant": ".minerva-icon--{name}, .minerva-icon--minerva-{name}",
"defaultColor": "#54595d",
"icons": [
"sandbox"
@ -442,7 +442,7 @@
},
"skins.minerva.mainMenu.advanced.icons": {
"class": "ResourceLoaderOOUIIconPackModule",
"selectorWithoutVariant": ".minerva-icon--minerva-{name}, .mw-ui-icon-minerva-{name}:before",
"selectorWithoutVariant": ".minerva-icon--{name}, .minerva-icon--minerva-{name}",
"defaultColor": "#54595d",
"icons": [
"recentChanges",
@ -454,7 +454,7 @@
"skins.minerva.mainMenu.icons": {
"class": "ResourceLoaderOOUIIconPackModule",
"variants": [],
"selectorWithoutVariant": ".minerva-icon--minerva-{name}, .mw-ui-icon-minerva-{name}:before",
"selectorWithoutVariant": ".minerva-icon--{name}, .minerva-icon--minerva-{name}",
"defaultColor": "#54595d",
"useDataURI": false,
"icons": [

4
tests/phpunit/menu/GroupTest.php
View file

@ -81,7 +81,7 @@ class GroupTest extends MediaWikiIntegrationTestCase {
],
'classes' => 'menu__item--home',
'data-icon' => [
'icon' => 'minerva-home',
'icon' => 'home',
],
]
],
@ -143,7 +143,7 @@ class GroupTest extends MediaWikiIntegrationTestCase {
],
'classes' => 'menu__item--nearby',
'data-icon' => [
'icon' => 'minerva-nearby',
'icon' => 'nearby',
]
]
],

4
tests/phpunit/skins/SkinMinervaTest.php
View file

@ -202,7 +202,7 @@ class SkinMinervaTest extends MediaWikiIntegrationTestCase {
],
],
'data-icon' => [
'icon' => 'wikimedia-bellOutline-base20'
'icon' => 'bellOutline-base20'
],
'label' => 'Alerts (13)',
],
@ -215,7 +215,7 @@ class SkinMinervaTest extends MediaWikiIntegrationTestCase {
'class' => 'mw-list-item',
'array-links' => [
[
'icon' => 'wikimedia-bellOutline-base20',
'icon' => 'bellOutline-base20',
'array-attributes' => [
self::ATTRIBUTE_NOTIFICATION_HREF,
self::ATTRIBUTE_NOTIFICATION_DATA_COUNTER_TEXT,

2
tests/selenium/features/support/pages/article_page.js
View file

@ -20,7 +20,7 @@ class ArticlePage extends MinervaPage {
get talk_tab_element() { return $( '.minerva__tab-container a[rel="discussion"]' ); }
get mask_element() { return $( '.mw-mf-page-center__mask' ); }
get drawer_mask_element() { return $( '.drawer-container__mask--visible' ); }
get watched_element() { return $( '.mw-ui-icon-wikimedia-unStar-progressive, .mw-ui-icon-mf-watched' ); }
get watched_element() { return $( '.minerva-icon--unStar-progressive, .mw-ui-icon-mf-watched' ); }
get menu_button_element() { return $( '#mw-mf-main-menu-button' ); }
get search_icon_element() { return $( '#searchIcon' ); }
get menu_element() { return $( 'nav' ); }