golem
/
MinervaNeue
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge profile icon with user-avatar icon 

Both are the same but different variants - so use the variants
ResourceLoader module to keep this modules consistent in color
and form.

Change-Id: Ib75e1ff741fa46ad9698e89c4433b6edbad4d376
This commit is contained in:
jdlrobson 2018-05-08 09:32:03 -07:00 committed by Jdlrobson
parent d32e74d46c
commit f7e8df65b2
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/skins/SkinMinerva.php
View File

@ -685,7 +685,7 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin {
->addComponent(
$username,
Title::newFromText( $username, NS_USER )->getLocalUrl(),
MinervaUI::iconClass( 'profile', 'before', 'truncated-text primary-action' ),
MinervaUI::iconClass( 'profile-gray', 'before', 'truncated-text primary-action' ),
[ 'data-event-name' => 'profile' ]
)
->addComponent(

2
resources/skins.minerva.editor/BlockMessage.js
View File

@ -25,7 +25,7 @@
userIcon: new Icon( {
tagName: 'span',
glyphPrefix: 'minerva',
name: 'user-avatar'
name: 'profile'
} ).options,
okButton: new Button( {
label: mw.msg( 'ok' ),

1
resources/skins.minerva.icons.images.scripts/user-avatar.svg
View File

@ -1 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><title>user avatar</title><path d="M10 12.5c-5.92 0-9 3.5-9 5.5v1h18v-1c0-2-3.08-5.5-9-5.5z"/><circle cx="10" cy="6" r="5"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 251 B

1
resources/skins.minerva.icons.images.variants/profile.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M12 14.5c5.917 0 9 3.5 9 5.5v1H3v-1c0-2 3.083-5.5 9-5.5zM17 8A5 5 0 1 1 7 8a5 5 0 0 1 10 0z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 250 B

1
resources/skins.minerva.mainMenu.icons/profile.svg
View File

@ -1 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#54595d" fill-rule="evenodd" d="M12 14.5c5.917 0 9 3.5 9 5.5v1H3v-1c0-2 3.083-5.5 9-5.5zM17 8A5 5 0 1 1 7 8a5 5 0 0 1 10 0z"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 265 B

6
skin.json
View File

@ -209,6 +209,7 @@
}
},
"images": {
"profile": "resources/skins.minerva.icons.images.variants/profile.svg",
"clock": "resources/skins.minerva.icons.images.variants/clock.svg"
}
},
@ -225,8 +226,7 @@
"issue-content": "resources/skins.minerva.icons.images.scripts/issue-content.svg",
"issue-move": "resources/skins.minerva.icons.images.scripts/issue-move.svg",
"download": "resources/skins.minerva.icons.images.scripts/download.svg",
"stop-hand": "resources/skins.minerva.icons.images.scripts/stop-hand.svg",
"user-avatar": "resources/skins.minerva.icons.images.scripts/user-avatar.svg"
"stop-hand": "resources/skins.minerva.icons.images.scripts/stop-hand.svg"
}
},
"skins.minerva.mainPage.styles": {
@ -262,7 +262,6 @@
"home": "resources/skins.minerva.mainMenu.icons/home.svg",
"logout": "resources/skins.minerva.mainMenu.icons/logout.svg",
"nearby": "resources/skins.minerva.mainMenu.icons/nearby.svg",
"profile": "resources/skins.minerva.mainMenu.icons/profile.svg",
"random": "resources/skins.minerva.mainMenu.icons/random.svg",
"settings": "resources/skins.minerva.mainMenu.icons/settings.svg",
"watchlist": "resources/skins.minerva.mainMenu.icons/watchlist.svg",
@ -284,6 +283,7 @@
"desktop"
],
"dependencies": [
"skins.minerva.icons.images.variants",
"skins.minerva.mainMenu.icons",
"skins.minerva.mainMenu.styles",
"mobile.startup"