jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350395 )
Change subject: Optimise SVGs with svgo
......................................................................
Optimise SVGs with svgo
... by running the following:
svgo --disable removeXMLProcInst --pretty --folder images/
svgo --disable removeXMLProcInst --pretty --folder
resources/ext.popups.images/
Also, add an XML declaration to resources/ext.popups.images/close.svg so
that it's recognised as an SVG by libmagic. This isn't strictly an issue
because of the way the SVG is served by the ResourceLoaderImageModule RL
module but it's consistent with the other SVGs.
Change-Id: I10b2286d6577701ba3b9a8651d5165fa81b8d293
---
M images/popups-ltr.svg
M images/popups-rtl.svg
M resources/ext.popups.images/close.svg
M resources/ext.popups.images/cog.svg
4 files changed, 61 insertions(+), 77 deletions(-)
Approvals:
jenkins-bot: Verified
Jdlrobson: Looks good to me, approved
diff --git a/images/popups-ltr.svg b/images/popups-ltr.svg
index c1f2dd5..fb9eb57 100644
--- a/images/popups-ltr.svg
+++ b/images/popups-ltr.svg
@@ -1,41 +1,34 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="264" height="162" viewBox="0 0
264 162" id="svg2">
- <defs id="defs78">
- <clipPath id="jagged-edge">
- <path id="path4183" d="M0 0v152l12 10 12-10 12 10 12-10 12 10
12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10
12 10 12-10 12 10 12-10V0z"/>
+<svg xmlns="http://www.w3.org/2000/svg"; width="264" height="162" viewBox="0 0
264 162">
+ <defs>
+ <clipPath id="a">
+ <path d="M0 0v152l12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10
12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10
12-10V0z"/>
</clipPath>
</defs>
- <g id="screenshot" clip-path="url(#jagged-edge)">
- <path fill="#fff" d="M263.5 162.25l-263-.5V.5h263z" id="background"/>
- <path fill="#e5e5e5" d="M252 162.496V29H48v133.496z" id="article"/>
- <path fill="#e5e5e5" d="M11 22c0-7.732 6.268-14 14-14s14 6.268 14
14-6.268 14-14 14-14-6.268-14-14z" id="logo"/>
- <path fill="#e5e5e5" d="M38 163.807V58H13v105.807h25z" id="sidebar"/>
- <g fill="#e5e5e5" id="personal-tools">
- <path id="path4191" d="M233 5h26v6h-26V5zm-24 0h22v6h-22zm-24
0h22v6h-22zm-23 0h13v6h-13zm15 0h6v6h-6zm-23 0h6v6h-6z"/>
+ <g clip-path="url(#a)">
+ <path fill="#fff" d="M263.5 162.25l-263-.5V.5h263z"/>
+ <path fill="#e5e5e5" d="M252 162.496V29H48v133.496zM11 22c0-7.732
6.268-14 14-14s14 6.268 14 14-6.268 14-14 14-14-6.268-14-14zm27
141.807V58H13v105.807h25zM233 5h26v6h-26V5zm-24 0h22v6h-22zm-24 0h22v6h-22zm-23
0h13v6h-13zm15 0h6v6h-6zm-23 0h6v6h-6z"/>
+ <g fill="#e5e5e5">
+ <path d="M258 16v4h-92v-4h92m1-1h-94v6h94v-6z"/>
+ <path d="M168 17h2v2h-2z"/>
</g>
- <g fill="#e5e5e5" id="search">
- <path d="M258 16v4h-92v-4h92m1-1h-94v6h94v-6z" id="path5717"/>
- <path d="M168 17h2v2h-2z" id="icon"/>
+ <path fill="#e5e5e5" d="M38 45v-5H13v5h25z"/>
+ <path fill="#e5e5e5" d="M0 0v162h264V0zm1 1h262v150.533l-11
9.166-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12
10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-11-9.168z"/>
+ <g fill="#9b9b9b">
+ <path d="M143.756 56h-38.14v7.782h38.14V56zm56.732
35.02v-8.755h-50.814v8.755h50.814zm-89.725-22.374H89.929v8.633h20.833v-8.634zm98.535
7.782v-7.782h-37.695v7.782h37.695zm-88.645
5.716H94.955v7.782h25.698v-7.782zM195.233 56h-46.207v7.782h46.207V56z"/>
+ <path d="M114.735 68.646v9.2h51.558v-9.2h-51.558z" fill="#36c"/>
</g>
- <path fill="#e5e5e5" d="M38 45v-5H13v5h25z" id="sitename"/>
- <path fill="#e5e5e5" id="border" d="M0 0v162h264V0zm1
1h262v150.533l-11 9.166-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12
10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12
10-11-9.168z"/>
- <g id="g18" fill="#9b9b9b">
- <path id="path20" d="M140.244 68h38.14v7.782h-38.14V68zm-56.732
35.02v-8.755h50.814v8.755H83.512zm89.725-22.374h20.834v8.633h-20.833v-8.634zm-98.535
7.782v-7.782h37.695v7.782H74.702zm88.645
5.716h25.698v7.782h-25.698v-7.782zM88.767 68h46.207v7.782H88.767V68z"
transform="matrix(-1 0 0 1 284 -12)"/>
- <path id="path22" d="M169.265 80.646v9.2h-51.558v-9.2h51.558z"
fill="#36c" transform="matrix(-1 0 0 1 284 -12)"/>
- </g>
- <g id="g24">
- <path id="path26" d="M170 94H95v44h75z" fill="#fff"
transform="matrix(-1 0 0 1 284 -12)"/>
- <path id="path28" d="M95 94h31v44H95V94zm18.167 24.13l-5.904
9.652-3.206-2.958-4.83 6.05 21.137.03-6.244-12.775h-.953z" fill="#36c"
transform="matrix(-1 0 0 1 284 -12)"/>
- <g id="g30" transform="translate(284 -12)" fill="#d0d0d0">
- <rect id="rect32" y="100" x="-163" rx="1" height="1"
width="20"/>
- <rect id="rect34" y="104" x="-163" rx="1" height="1"
width="20"/>
- <rect id="rect36" y="108" x="-163" rx="1" height="1"
width="20"/>
- <rect id="rect38" y="112" x="-163" rx="1" height="1"
width="28"/>
- <rect id="rect40" y="116" x="-163" rx="1" height="1"
width="28"/>
- <rect id="rect42" y="120" x="-163" rx="1" height="1"
width="28"/>
- <rect id="rect44" y="124" x="-163" rx="1" height="1"
width="28"/>
- <rect id="rect46" y="128" x="-163" rx="1" height="1"
width="28"/>
- </g>
+ <path d="M114 82h75v44h-75z" fill="#fff"/>
+ <path d="M189 82h-31v44h31V82zm-18.167 24.13l5.904 9.652 3.206-2.958
4.83 6.05-21.137.03 6.244-12.775h.953z" fill="#36c"/>
+ <g transform="translate(284 -12)" fill="#d0d0d0">
+ <rect y="100" x="-163" rx="1" height="1" width="20"/>
+ <rect y="104" x="-163" rx="1" height="1" width="20"/>
+ <rect y="108" x="-163" rx="1" height="1" width="20"/>
+ <rect y="112" x="-163" rx="1" height="1" width="28"/>
+ <rect y="116" x="-163" rx="1" height="1" width="28"/>
+ <rect y="120" x="-163" rx="1" height="1" width="28"/>
+ <rect y="124" x="-163" rx="1" height="1" width="28"/>
+ <rect y="128" x="-163" rx="1" height="1" width="28"/>
</g>
</g>
</svg>
diff --git a/images/popups-rtl.svg b/images/popups-rtl.svg
index 65c7ae9..ac733b2 100644
--- a/images/popups-rtl.svg
+++ b/images/popups-rtl.svg
@@ -1,41 +1,34 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"; width="264" height="162" viewBox="0 0
264 162" id="svg2">
- <defs id="defs78">
- <clipPath id="jagged-edge">
- <path id="path4183" d="M0 0v152l12 10 12-10 12 10 12-10 12 10
12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10
12 10 12-10 12 10 12-10V0z"/>
+<svg xmlns="http://www.w3.org/2000/svg"; width="264" height="162" viewBox="0 0
264 162">
+ <defs>
+ <clipPath id="a">
+ <path d="M0 0v152l12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10
12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10 12-10 12 10
12-10V0z"/>
</clipPath>
</defs>
- <g transform="matrix(-1 0 0 1 264 0)" id="screenshot"
clip-path="url(#jagged-edge)">
- <path d="M263.5 162.25l-263-.5V.5h263z" id="background" fill="#fff"/>
- <path d="M252 162.496V29H48v133.496z" id="article" fill="#e5e5e5"/>
- <path d="M11 22c0-7.732 6.268-14 14-14s14 6.268 14 14-6.268 14-14
14-14-6.268-14-14z" id="logo" fill="#e5e5e5"/>
- <path d="M38 163.807V58H13v105.807h25z" id="sidebar" fill="#e5e5e5"/>
- <g id="personal-tools" fill="#e5e5e5">
- <path id="path4191" d="M233 5h26v6h-26V5zm-24 0h22v6h-22zm-24
0h22v6h-22zm-23 0h13v6h-13zm15 0h6v6h-6zm-23 0h6v6h-6z"/>
+ <g transform="matrix(-1 0 0 1 264 0)" clip-path="url(#a)">
+ <path d="M263.5 162.25l-263-.5V.5h263z" fill="#fff"/>
+ <path d="M252 162.496V29H48v133.496zM11 22c0-7.732 6.268-14 14-14s14
6.268 14 14-6.268 14-14 14-14-6.268-14-14zm27 141.807V58H13v105.807h25zM233
5h26v6h-26V5zm-24 0h22v6h-22zm-24 0h22v6h-22zm-23 0h13v6h-13zm15 0h6v6h-6zm-23
0h6v6h-6z" fill="#e5e5e5"/>
+ <g fill="#e5e5e5">
+ <path d="M258 16v4h-92v-4h92m1-1h-94v6h94v-6z"/>
+ <path d="M168 17h2v2h-2z"/>
</g>
- <g id="search" fill="#e5e5e5">
- <path d="M258 16v4h-92v-4h92m1-1h-94v6h94v-6z" id="path5717"/>
- <path d="M168 17h2v2h-2z" id="icon"/>
+ <path d="M38 45v-5H13v5h25z" fill="#e5e5e5"/>
+ <path d="M0 0v162h264V0zm1 1h262v150.533l-11 9.166-12-10-12
10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12
10-12-10-12 10-12-10-12 10-12-10-12 10-11-9.168z" fill="#e5e5e5"/>
+ <g fill="#9b9b9b">
+ <path d="M143.756 56h-38.14v7.782h38.14V56zm56.732
35.02v-8.755h-50.814v8.755h50.814zm-89.725-22.374H89.929v8.633h20.833v-8.634zm98.535
7.782v-7.782h-37.695v7.782h37.695zm-88.645
5.716H94.955v7.782h25.698v-7.782zM195.233 56h-46.207v7.782h46.207V56z"/>
+ <path d="M114.735 68.646v9.2h51.558v-9.2h-51.558z" fill="#36c"/>
</g>
- <path d="M38 45v-5H13v5h25z" id="sitename" fill="#e5e5e5"/>
- <path id="border" d="M0 0v162h264V0zm1 1h262v150.533l-11
9.166-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12
10-12-10-12 10-12-10-12 10-12-10-12 10-12-10-12 10-11-9.168z" fill="#e5e5e5"/>
- <g id="g18" fill="#9b9b9b">
- <path id="path20" d="M140.244 68h38.14v7.782h-38.14V68zm-56.732
35.02v-8.755h50.814v8.755H83.512zm89.725-22.374h20.834v8.633h-20.833v-8.634zm-98.535
7.782v-7.782h37.695v7.782H74.702zm88.645
5.716h25.698v7.782h-25.698v-7.782zM88.767 68h46.207v7.782H88.767V68z"
transform="matrix(-1 0 0 1 284 -12)"/>
- <path id="path22" d="M169.265 80.646v9.2h-51.558v-9.2h51.558z"
fill="#36c" transform="matrix(-1 0 0 1 284 -12)"/>
- </g>
- <g id="g24">
- <path id="path26" d="M170 94H95v44h75z" fill="#fff"
transform="matrix(-1 0 0 1 284 -12)"/>
- <path id="path28" d="M95 94h31v44H95V94zm18.167 24.13l-5.904
9.652-3.206-2.958-4.83 6.05 21.137.03-6.244-12.775h-.953z" fill="#36c"
transform="matrix(-1 0 0 1 284 -12)"/>
- <g id="g30" transform="translate(284 -12)" fill="#d0d0d0">
- <rect id="rect32" y="100" x="-163" rx="1" height="1"
width="20"/>
- <rect id="rect34" y="104" x="-163" rx="1" height="1"
width="20"/>
- <rect id="rect36" y="108" x="-163" rx="1" height="1"
width="20"/>
- <rect id="rect38" y="112" x="-163" rx="1" height="1"
width="28"/>
- <rect id="rect40" y="116" x="-163" rx="1" height="1"
width="28"/>
- <rect id="rect42" y="120" x="-163" rx="1" height="1"
width="28"/>
- <rect id="rect44" y="124" x="-163" rx="1" height="1"
width="28"/>
- <rect id="rect46" y="128" x="-163" rx="1" height="1"
width="28"/>
- </g>
+ <path d="M114 82h75v44h-75z" fill="#fff"/>
+ <path d="M189 82h-31v44h31V82zm-18.167 24.13l5.904 9.652 3.206-2.958
4.83 6.05-21.137.03 6.244-12.775h.953z" fill="#36c"/>
+ <g transform="translate(284 -12)" fill="#d0d0d0">
+ <rect y="100" x="-163" rx="1" height="1" width="20"/>
+ <rect y="104" x="-163" rx="1" height="1" width="20"/>
+ <rect y="108" x="-163" rx="1" height="1" width="20"/>
+ <rect y="112" x="-163" rx="1" height="1" width="28"/>
+ <rect y="116" x="-163" rx="1" height="1" width="28"/>
+ <rect y="120" x="-163" rx="1" height="1" width="28"/>
+ <rect y="124" x="-163" rx="1" height="1" width="28"/>
+ <rect y="128" x="-163" rx="1" height="1" width="28"/>
</g>
</g>
</svg>
diff --git a/resources/ext.popups.images/close.svg
b/resources/ext.popups.images/close.svg
index 2e06148..772a0ef 100644
--- a/resources/ext.popups.images/close.svg
+++ b/resources/ext.popups.images/close.svg
@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24"><path d="M4.983
1.606l17.465 17.466-2.97 2.97L2.014 4.575z"/><path d="M19.407 1.605l2.97
2.97L4.914 22.042l-2.97-2.97z"/></svg>
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path d="M4.983 1.606l17.465 17.466-2.97 2.97L2.014 4.575z"/>
+ <path d="M19.407 1.605l2.97 2.97L4.914 22.042l-2.97-2.97z"/>
+</svg>
diff --git a/resources/ext.popups.images/cog.svg
b/resources/ext.popups.images/cog.svg
index 8f1fb47..af2a5e7 100644
--- a/resources/ext.popups.images/cog.svg
+++ b/resources/ext.popups.images/cog.svg
@@ -1,10 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
- viewBox="0 0 24 24" enable-background="new 0 0 24 24"
xml:space="preserve">
-<path fill="#555555"
d="M20,14.5v-2.9l-1.8-0.3c-0.1-0.4-0.3-0.8-0.6-1.4l1.1-1.5l-2.1-2.1l-1.5,1.1c-0.5-0.3-1-0.5-1.4-0.6L13.5,5h-2.9l-0.3,1.8
-
C9.8,6.9,9.4,7.1,8.9,7.4L7.4,6.3L5.3,8.4l1,1.5c-0.3,0.5-0.4,0.9-0.6,1.4L4,11.5v2.9l1.8,0.3c0.1,0.5,0.3,0.9,0.6,1.4l-1,1.5
-
l2.1,2.1l1.5-1c0.4,0.2,0.9,0.4,1.4,0.6l0.3,1.8h3l0.3-1.8c0.5-0.1,0.9-0.3,1.4-0.6l1.5,1.1l2.1-2.1l-1.1-1.5c0.3-0.5,0.5-1,0.6-1.4
- L20,14.5z M12,16c-1.7,0-3-1.3-3-3s1.3-3,3-3s3,1.3,3,3S13.7,16,12,16z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg"; viewBox="0 0 24 24">
+ <path fill="#555" d="M20
14.5v-2.9l-1.8-.3c-.1-.4-.3-.8-.6-1.4l1.1-1.5-2.1-2.1-1.5
1.1c-.5-.3-1-.5-1.4-.6L13.5 5h-2.9l-.3 1.8c-.5.1-.9.3-1.4.6L7.4 6.3 5.3 8.4l1
1.5c-.3.5-.4.9-.6 1.4l-1.7.2v2.9l1.8.3c.1.5.3.9.6 1.4l-1 1.5 2.1 2.1
1.5-1c.4.2.9.4 1.4.6l.3 1.8h3l.3-1.8c.5-.1.9-.3 1.4-.6l1.5 1.1
2.1-2.1-1.1-1.5c.3-.5.5-1 .6-1.4l1.5-.3zM12 16c-1.7 0-3-1.3-3-3s1.3-3 3-3 3 1.3
3 3-1.3 3-3 3z"/>
+</svg>
--
To view, visit https://gerrit.wikimedia.org/r/350395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10b2286d6577701ba3b9a8651d5165fa81b8d293
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Phuedx <[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
