Revert "Reduce 'userContributions' icon code"

This reverts commit 7b4b65a30f, which
caused a regression in the user menu part of Advanced Mobile
Contributions mode.

Bug: T244436
Change-Id: Ifce627dac35b2cd05e1c5ebe658534b6b8d0de88
This commit is contained in:
Phuedx 2020-02-06 18:26:17 +00:00 committed by Volker E
parent 4ccaf6e959
commit 6e4c6c99bc
6 changed files with 6 additions and 9 deletions

View file

@ -165,10 +165,7 @@ class ToolbarBuilder {
SpecialPage::getTitleFor( 'Contributions', $user->getName() )->getLocalURL() );
$entry->setTitle( $label )
->trackClicks( 'contributions' )
->setIcon( 'userContributions', 'element',
// FIXME: mw-ui-icon-minerva-contributions can be removed after cache has cleared
// (I6c908acd70c0dca5bcb1754d1b25d3da2389feb8)
'mw-ui-icon-with-label-desktop mw-ui-icon-minerva-contributions' );
->setIcon( 'contributions', 'element', 'mw-ui-icon-with-label-desktop' );
return $entry;
}

View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><g><path d="M6 15h3v2H6z"/><path d="M6 9h5v2H6z"/><path d="M6 3h11v2H6z"/><circle cx="2" cy="4" r="2"/><circle cx="2" cy="10" r="2"/><circle cx="2" cy="16" r="2"/><path d="M15.5 13.556c-3.33 0-4.5 1.666-4.5 2.777V18h9v-1.667c0-1.11-1.17-2.777-4.5-2.777z"/><circle cx="15.444" cy="10.5" r="2.5"/></g></svg>

After

Width:  |  Height:  |  Size: 388 B

View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><g><path d="M14 15h-3v2h3z"/><path d="M14 9H9v2h5z"/><path d="M14 3H3v2h11z"/><path d="M18 6a2 2 0 1 1 0-4 2 2 0 0 1 0 4zm0 6a2 2 0 1 1 0-4 2 2 0 0 1 0 4zm0 6a2 2 0 1 1 0-4 2 2 0 0 1 0 4zM4.5 13.556c-3.33 0-4.5 1.666-4.5 2.777V18h9v-1.667c0-1.11-1.17-2.777-4.5-2.777z"/><circle cx="4.444" cy="10.5" r="2.5"/></g></svg>

After

Width:  |  Height:  |  Size: 401 B

View file

@ -1 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>contributions</title><g><path d="M6 15h3v2H6zm0-6h5v2H6zm0-6h11v2H6z"/><circle cx="2" cy="4" r="2"/><circle cx="2" cy="10" r="2"/><circle cx="2" cy="16" r="2"/><path d="M15.5 13.556c-3.33 0-4.5 1.666-4.5 2.777V18h9v-1.667c0-1.11-1.17-2.777-4.5-2.777z"/><circle cx="15.5" cy="10.5" r="2.5"/></g></svg>

Before

Width:  |  Height:  |  Size: 428 B

View file

@ -1 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>contributions</title><g><path d="M14 15h-3v2h3zM14 9H9v2h5zM14 3H3v2h11zM18 6a2 2 0 110-4 2 2 0 010 4zm0 6a2 2 0 110-4 2 2 0 010 4zm0 6a2 2 0 110-4 2 2 0 010 4zM4.5 13.556c-3.33 0-4.5 1.666-4.5 2.777V18h9v-1.667c0-1.11-1.17-2.777-4.5-2.777z"/><circle cx="4.5" cy="10.5" r="2.5"/></g></svg>

Before

Width:  |  Height:  |  Size: 417 B

View file

@ -540,10 +540,10 @@
"defaultColor": "#4A4F53",
"useDataURI": false,
"images": {
"userContributions": {
"contributions": {
"file": {
"ltr": "resources/skins.minerva.mainMenu.icons/userContributions-ltr.svg",
"rtl": "resources/skins.minerva.mainMenu.icons/userContributions-rtl.svg"
"ltr": "resources/skins.minerva.mainMenu.icons/contributions-ltr.svg",
"rtl": "resources/skins.minerva.mainMenu.icons/contributions-rtl.svg"
}
},
"login": {