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:
parent
d32e74d46c
commit
f7e8df65b2
|
@ -685,7 +685,7 @@ class SkinMinerva extends SkinTemplate implements ICustomizableSkin {
|
||||||
->addComponent(
|
->addComponent(
|
||||||
$username,
|
$username,
|
||||||
Title::newFromText( $username, NS_USER )->getLocalUrl(),
|
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' ]
|
[ 'data-event-name' => 'profile' ]
|
||||||
)
|
)
|
||||||
->addComponent(
|
->addComponent(
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
userIcon: new Icon( {
|
userIcon: new Icon( {
|
||||||
tagName: 'span',
|
tagName: 'span',
|
||||||
glyphPrefix: 'minerva',
|
glyphPrefix: 'minerva',
|
||||||
name: 'user-avatar'
|
name: 'profile'
|
||||||
} ).options,
|
} ).options,
|
||||||
okButton: new Button( {
|
okButton: new Button( {
|
||||||
label: mw.msg( 'ok' ),
|
label: mw.msg( 'ok' ),
|
||||||
|
|
|
@ -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>
|
|
Before Width: | Height: | Size: 251 B |
|
@ -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>
|
After Width: | Height: | Size: 250 B |
|
@ -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>
|
|
Before Width: | Height: | Size: 265 B |
|
@ -209,6 +209,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"images": {
|
"images": {
|
||||||
|
"profile": "resources/skins.minerva.icons.images.variants/profile.svg",
|
||||||
"clock": "resources/skins.minerva.icons.images.variants/clock.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-content": "resources/skins.minerva.icons.images.scripts/issue-content.svg",
|
||||||
"issue-move": "resources/skins.minerva.icons.images.scripts/issue-move.svg",
|
"issue-move": "resources/skins.minerva.icons.images.scripts/issue-move.svg",
|
||||||
"download": "resources/skins.minerva.icons.images.scripts/download.svg",
|
"download": "resources/skins.minerva.icons.images.scripts/download.svg",
|
||||||
"stop-hand": "resources/skins.minerva.icons.images.scripts/stop-hand.svg",
|
"stop-hand": "resources/skins.minerva.icons.images.scripts/stop-hand.svg"
|
||||||
"user-avatar": "resources/skins.minerva.icons.images.scripts/user-avatar.svg"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"skins.minerva.mainPage.styles": {
|
"skins.minerva.mainPage.styles": {
|
||||||
|
@ -262,7 +262,6 @@
|
||||||
"home": "resources/skins.minerva.mainMenu.icons/home.svg",
|
"home": "resources/skins.minerva.mainMenu.icons/home.svg",
|
||||||
"logout": "resources/skins.minerva.mainMenu.icons/logout.svg",
|
"logout": "resources/skins.minerva.mainMenu.icons/logout.svg",
|
||||||
"nearby": "resources/skins.minerva.mainMenu.icons/nearby.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",
|
"random": "resources/skins.minerva.mainMenu.icons/random.svg",
|
||||||
"settings": "resources/skins.minerva.mainMenu.icons/settings.svg",
|
"settings": "resources/skins.minerva.mainMenu.icons/settings.svg",
|
||||||
"watchlist": "resources/skins.minerva.mainMenu.icons/watchlist.svg",
|
"watchlist": "resources/skins.minerva.mainMenu.icons/watchlist.svg",
|
||||||
|
@ -284,6 +283,7 @@
|
||||||
"desktop"
|
"desktop"
|
||||||
],
|
],
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
"skins.minerva.icons.images.variants",
|
||||||
"skins.minerva.mainMenu.icons",
|
"skins.minerva.mainMenu.icons",
|
||||||
"skins.minerva.mainMenu.styles",
|
"skins.minerva.mainMenu.styles",
|
||||||
"mobile.startup"
|
"mobile.startup"
|
||||||
|
|
Loading…
Reference in New Issue