Drop base20 icon class suffix

Following the migration to Codex, icons do not need suffixes for
their icons.

If we merge this now, we don't need to worry about caching when working
on Bug T266361.

Bug: T266361
Change-Id: Iafeb21858c89df1af35660eb63889fa5335e2b34
This commit is contained in:
Jon Robson 2024-10-07 15:35:31 -07:00
parent 1f218c4511
commit 98521bbb68
6 changed files with 11 additions and 11 deletions

View file

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

View file

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

View file

@ -198,7 +198,7 @@ class ToolbarBuilder {
);
$iconFallback = $key === 'viewsource' ? 'editLock' : 'edit';
$icon = $editAction['icon'] ?? $iconFallback;
$entry->setIcon( $icon . '-base20' )
$entry->setIcon( $icon )
->trackClicks( $key )
->setTitle( $this->context->msg( 'tooltip-' . $id ) )
->setNodeID( $id );
@ -243,7 +243,7 @@ class ToolbarBuilder {
$historyAction['href'],
);
$icon = $historyAction['icon'] ?? 'history';
$entry->setIcon( $icon . '-base20' )
$entry->setIcon( $icon )
->trackClicks( 'history' );
return $entry;
}

View file

@ -181,7 +181,7 @@ class SkinMinerva extends SkinMustache {
*/
private function getNotificationFallbackButton(): array {
return [
'icon' => 'bellOutline-base20',
'icon' => 'bellOutline',
'href' => SpecialPage::getTitleFor( 'Mytalk' )->getLocalURL(
[ 'returnto' => $this->getTitle()->getPrefixedText() ]
),
@ -260,7 +260,7 @@ class SkinMinerva extends SkinMustache {
return $class !== 'oo-ui-icon-bellOutline';
}
);
$alert['icon'] = 'bellOutline-base20';
$alert['icon'] = 'bellOutline';
return $alert;
}
@ -357,7 +357,7 @@ class SkinMinerva extends SkinMustache {
'data-minerva-search-box' => $data['data-search-box'] + [
'data-btn' => [
'data-icon' => [
'icon' => 'search-base20',
'icon' => 'search',
],
'label' => $this->msg( 'searchbutton' )->escaped(),
'classes' => 'skin-minerva-search-trigger',
@ -371,7 +371,7 @@ class SkinMinerva extends SkinMustache {
],
'data-minerva-main-menu-btn' => [
'data-icon' => [
'icon' => 'menu-base20',
'icon' => 'menu',
],
'tag-name' => 'label',
'classes' => 'toggle-list__toggle',

View file

@ -1,6 +1,6 @@
@import '../../minerva.less/minerva.variables.less';
.minerva-icon.minerva-icon--bellOutline-base20 {
.minerva-icon.minerva-icon--bellOutline {
.cdx-mixin-css-icon( @cdx-icon-bell-outline, @color-subtle);
}

View file

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