wikimedia/mediawiki-skins-MinervaNeue
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue synced 2024-11-30 17:04:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove watch and watched icons from repository in favor of Wikimedia UI

Browse source 
Note, because of the two versions of the watch icon, this will temporarily
make the watchstar not display for JavaScript users. The accompanying patch
Ic974b4d6dff14b0d72b8ca71b02c5ef73b1b1d93 will restore this.

Bug: T231613
Change-Id: I16ca70f2892d7418ff245e15f838dfc2b092f3aa
This commit is contained in:
jdlrobson 2019-09-17 14:30:33 -07:00
parent 3ad1dfbcf5
commit 98d91a66f3
5 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -213,12 +213,12 @@ class ToolbarBuilder {
if ( $isWatched ) { if ( $isWatched ) {
$msg = $this->messageLocalizer->msg( 'unwatchthispage' ); $msg = $this->messageLocalizer->msg( 'unwatchthispage' );
$icon = 'watched'; $icon = 'unStar-progressive';
} else { } else {
$msg = $this->messageLocalizer->msg( 'watchthispage' ); $msg = $this->messageLocalizer->msg( 'watchthispage' );
$icon = 'watch'; $icon = 'star-base20';
} }
$iconClass = MinervaUI::iconClass( $icon, 'element', 'watch-this-article', 'mf' ) . ' jsonly'; $iconClass = MinervaUI::iconClass( $icon, 'element', 'watch-this-article', 'wikimedia' );
if ( $isWatched ) { if ( $isWatched ) {
$iconClass .= ' watched'; $iconClass .= ' watched';
} }

5
resources/skins.minerva.base.styles/pageactions.less
View file

@ -69,11 +69,6 @@
right: -@icon-padding-md; right: -@icon-padding-md;
} }
// overriding common.less `display:inherit` (which causes `display: flex;` in this instance).
.client-js .jsonly#ca-watch {
display: list-item;
}
// Watchstar is hidden for anonymous no-js users // Watchstar is hidden for anonymous no-js users
// While we could link the icon to the login/signup form, this is not // While we could link the icon to the login/signup form, this is not
// a perfect experience and could be confusing. // a perfect experience and could be confusing.

1
resources/skins.minerva.icons.images/watch.svg
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>star</title><path d="M20 7h-7L10 .5 7 7H0l5.46 5.47-1.64 7 6.18-3.7 6.18 3.73-1.63-7zm-10 6.9l-3.76 2.27 1-4.28L3.5 8.5h4.61L10 4.6l1.9 3.9h4.6l-3.73 3.4 1 4.28z"/></svg>
Side by side

Before

Width:  |  Height:  |  Size: 298 B

1
resources/skins.minerva.icons.images/watched.svg
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>un-star</title><path d="M20 7h-7L10 .5 7 7H0l5.46 5.47-1.64 7 6.18-3.7 6.18 3.73-1.63-7z"/></svg>
Side by side

Before

Width:  |  Height:  |  Size: 225 B

5
skin.json
View file

@ -304,11 +304,12 @@
] ]
}, },
"skins.minerva.icons.wikimedia": { "skins.minerva.icons.wikimedia": {
"selectorWithVariant": ".mw-ui-icon-wikimedia-{name}-{variant}:before",
"selectorWithoutVariant": ".mw-ui-icon-wikimedia-{name}-base20:before, .mw-ui-background-icon-{name}", "selectorWithoutVariant": ".mw-ui-icon-wikimedia-{name}-base20:before, .mw-ui-background-icon-{name}",
"useDataURI": false, "useDataURI": false,
"defaultColor": "#54595d", "defaultColor": "#54595d",
"class": "ResourceLoaderOOUIIconPackModule", "class": "ResourceLoaderOOUIIconPackModule",
"icons": [ "search", "userAvatar" ] "icons": [ "search", "userAvatar", "star", "unStar" ]
}, },
"skins.minerva.icons.images": { "skins.minerva.icons.images": {
"class": "ResourceLoaderImageModule", "class": "ResourceLoaderImageModule",
@ -333,8 +334,6 @@
"rtl": "resources/skins.minerva.icons.images/toc-rtl.svg" "rtl": "resources/skins.minerva.icons.images/toc-rtl.svg"
} }
}, },
"watch": "resources/skins.minerva.icons.images/watch.svg",
"watched": "resources/skins.minerva.icons.images/watched.svg",
"warning": "resources/skins.minerva.icons.images/warning.svg", "warning": "resources/skins.minerva.icons.images/warning.svg",
"mainmenu": "resources/skins.minerva.icons.images/hamburger.svg", "mainmenu": "resources/skins.minerva.icons.images/hamburger.svg",
"edit": "resources/skins.minerva.icons.images/editLocked.svg", "edit": "resources/skins.minerva.icons.images/editLocked.svg",