jenkins-bot has submitted this change and it was merged.
Change subject: Update watchstar icons
......................................................................
Update watchstar icons
* Make watchstar icons bigger in alpha
* Add SVG versions of the icons
* Fix watchstar animation
* Make watchstar icon size bigger in search results overlay in alpha
Bug: 73050
Bug: 73053
Change-Id: Id053c553224e3648027845d4e281151bf82d7118
---
M less/iconsNew.less
A less/images/icons/watch.png
A less/images/icons/watch.svg
A less/images/icons/watched.png
A less/images/icons/watched.svg
M less/modules/watchstar.less
M less/pageactions.less
7 files changed, 125 insertions(+), 11 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/less/iconsNew.less b/less/iconsNew.less
index e206998..0073f83 100644
--- a/less/iconsNew.less
+++ b/less/iconsNew.less
@@ -10,7 +10,7 @@
}
.mw-ui-icon-watch {
- .m-background-image('images/watch.png');
+ .m-background-image-svg-quick('images/icons/watch');
}
.mw-ui-icon-edit {
@@ -30,7 +30,7 @@
}
.mw-ui-icon-watched {
- .m-background-image('images/watched.png');
+ .m-background-image-svg-quick('images/icons/watched');
}
// Menu set
diff --git a/less/images/icons/watch.png b/less/images/icons/watch.png
new file mode 100644
index 0000000..e10a36d
--- /dev/null
+++ b/less/images/icons/watch.png
Binary files differ
diff --git a/less/images/icons/watch.svg b/less/images/icons/watch.svg
new file mode 100644
index 0000000..3ec63fb
--- /dev/null
+++ b/less/images/icons/watch.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ id="Layer_1"
+ x="0px"
+ y="0px"
+ viewBox="0 0 24.000001 22.909092"
+ enable-background="new 0 0 24 24"
+ xml:space="preserve"
+ inkscape:version="0.48.5 r10040"
+ width="100%"
+ height="100%"
+ sodipodi:docname="watch.svg"><metadata
+ id="metadata11"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/></cc:Work></rdf:RDF></metadata><defs
+ id="defs9" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1280"
+ inkscape:window-height="751"
+ id="namedview7"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="9.8333333"
+ inkscape:cx="8.7999999"
+ inkscape:cy="7.1998957"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="Layer_1" /><g
+ transform="matrix(1.3636364,0,0,-1.3636364,-4.3636365,2230.3637)"
+ id="g3"><path
+ d="m 13.4,1628.2 -1.4,2.8 -1.4,-2.8 -3.1,-0.5 2.2,-2.2 -0.5,-3.1
2.8,1.5 2.8,-1.5 -0.5,3.1 2.2,2.2 -3.1,0.5 z m -4.1,1.9 2.7,5.5 2.7,-5.5
6.1,-0.9 -4.4,-4.3 1,-6.1 -5.4,2.9 -5.4,-2.8 1,6.1 -4.4,4.3 6.1,0.8 z"
+ id="path5"
+ inkscape:connector-curvature="0"
+ style="fill:#777777" /></g></svg>
\ No newline at end of file
diff --git a/less/images/icons/watched.png b/less/images/icons/watched.png
new file mode 100644
index 0000000..4e5fc7c
--- /dev/null
+++ b/less/images/icons/watched.png
Binary files differ
diff --git a/less/images/icons/watched.svg b/less/images/icons/watched.svg
new file mode 100644
index 0000000..91c98e8
--- /dev/null
+++ b/less/images/icons/watched.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ id="Layer_1"
+ x="0px"
+ y="0px"
+ viewBox="0 0 24 22.915254"
+ enable-background="new 0 0 24 24"
+ xml:space="preserve"
+ inkscape:version="0.48.5 r10040"
+ width="100%"
+ height="100%"
+ sodipodi:docname="watched.svg"><metadata
+ id="metadata11"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/></cc:Work></rdf:RDF></metadata><defs
+ id="defs9" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1280"
+ inkscape:window-height="751"
+ id="namedview7"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="13.906433"
+ inkscape:cx="5.3816677"
+ inkscape:cy="10.064073"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="Layer_1" /><g
+ transform="matrix(1.3559322,0,0,-1.3559322,-4.2033898,2217.8983)"
+ id="g3"><path
+ d="m 9.3,1630.1 2.7,5.6 2.7,-5.6 6.1,-0.9 -4.4,-4.3 1.1,-6.1 -5.5,2.9
-5.5,-2.8 1,6.1 -4.4,4.3 6.2,0.8 z"
+ id="path5"
+ inkscape:connector-curvature="0"
+ style="fill:#00af89" /></g></svg>
\ No newline at end of file
diff --git a/less/modules/watchstar.less b/less/modules/watchstar.less
index dd12dd1..6eb25cf 100644
--- a/less/modules/watchstar.less
+++ b/less/modules/watchstar.less
@@ -14,19 +14,19 @@
height: @watchThisArticleSize;
}
+// FIXME: This shouldn't be needed. (but the icon looks smaller compared to
beta, even though the SVG width is 24px)
+.alpha {
+ .page-list .watch-this-article {
+ font-size: 1.1em;
+ }
+}
+
.animations {
- .mw-ui-icon-watch {
- .transition-transform( .5s );
- }
-
- .mw-ui-icon-watched {
- .transform( rotate(72deg) );
- }
-
- // FIXME: Remove when mw-ui-icon in stable
+ .mw-ui-icon.watch-this-article,
.icon.watch-this-article {
.transition-transform( .5s );
+ &.mw-ui-icon-watched,
&.icon-watched {
.transform( rotate(72deg) );
}
diff --git a/less/pageactions.less b/less/pageactions.less
index ad514e2..a0f06f0 100644
--- a/less/pageactions.less
+++ b/less/pageactions.less
@@ -60,6 +60,10 @@
&.mw-ui-icon {
font-size: 1.3em;
margin-right: 0;
+ // FIXME: remove this once other icons are also SVGs,
they looks smaller because they are PNGs
+ &.watch-this-article {
+ font-size: 1.1em;
+ }
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/172883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id053c553224e3648027845d4e281151bf82d7118
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Bmansurov <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
