jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/341185 )
Change subject: icons: Remove 'teardrop' from MediaWiki theme close icon ...................................................................... icons: Remove 'teardrop' from MediaWiki theme close icon Removed the 'teardrop' effect from the close icon in MediaWiki theme, making it vertically symmetrical, and re-crush both MediaWiki and Apex themes' close icons with SVGO. Bug: T142613 Change-Id: I3f610f700e4027e2899ebafc08c2fb2b5ab55c50 --- M src/themes/apex/images/icons/close.svg M src/themes/mediawiki/icons.json D src/themes/mediawiki/images/icons/close-ltr.svg D src/themes/mediawiki/images/icons/close-rtl.svg A src/themes/mediawiki/images/icons/close.svg 5 files changed, 6 insertions(+), 19 deletions(-) Approvals: Rho: Looks good to me, but someone else must approve jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/src/themes/apex/images/icons/close.svg b/src/themes/apex/images/icons/close.svg index d058d65..b379e18 100644 --- a/src/themes/apex/images/icons/close.svg +++ b/src/themes/apex/images/icons/close.svg @@ -1,6 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"> - <g id="close"> - <path id="cross" d="M17.717 7.697l-1.414-1.414L12 10.586 7.697 6.283 6.283 7.697 10.586 12l-4.303 4.303 1.414 1.414L12 13.414l4.303 4.303 1.414-1.414L13.414 12z"/> - </g> + <path d="M17.717 7.697l-1.414-1.414L12 10.586 7.697 6.283 6.283 7.697 10.586 12l-4.303 4.303 1.414 1.414L12 13.414l4.303 4.303 1.414-1.414L13.414 12z"/> </svg> diff --git a/src/themes/mediawiki/icons.json b/src/themes/mediawiki/icons.json index 4666fd1..9a625bf 100644 --- a/src/themes/mediawiki/icons.json +++ b/src/themes/mediawiki/icons.json @@ -28,10 +28,7 @@ "cancel": { "file": "images/icons/cancel.svg", "variants": [ "destructive" ] }, "check": { "file": "images/icons/check.svg", "variants": [ "constructive", "progressive", "destructive" ] }, "circle": { "file": "images/icons/circle.svg", "variants": [ "constructive", "progressive" ] }, - "close": { "file": { - "ltr": "images/icons/close-ltr.svg", - "rtl": "images/icons/close-rtl.svg" - } }, + "close": { "file": "images/icons/close.svg" }, "code": { "file": "images/icons/code.svg" }, "collapse": { "file": "images/icons/collapse.svg" }, "comment": { "file": "images/icons/comment.svg" }, diff --git a/src/themes/mediawiki/images/icons/close-ltr.svg b/src/themes/mediawiki/images/icons/close-ltr.svg deleted file mode 100644 index c269316..0000000 --- a/src/themes/mediawiki/images/icons/close-ltr.svg +++ /dev/null @@ -1,6 +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"> - <g id="close"> - <path id="cross" d="M17.4 8.1c.8-.8.8-2 0-2.8L12 10.8 7.4 6.2 6 7.6l4.6 4.6-4 4c-.8.8-.8 2 0 2.8l5.4-5.4 4.6 4.6 1.4-1.4-4.6-4.6z"/> - </g> -</svg> diff --git a/src/themes/mediawiki/images/icons/close-rtl.svg b/src/themes/mediawiki/images/icons/close-rtl.svg deleted file mode 100644 index 36e58ec..0000000 --- a/src/themes/mediawiki/images/icons/close-rtl.svg +++ /dev/null @@ -1,6 +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"> - <g id="close"> - <path id="cross" d="M6.6 8.1c-.8-.8-.8-2 0-2.8l5.4 5.5 4.6-4.6L18 7.6l-4.6 4.6 4 4c.8.8.8 2 0 2.8L12 13.6l-4.6 4.6L6 16.8l4.6-4.6z"/> - </g> -</svg> diff --git a/src/themes/mediawiki/images/icons/close.svg b/src/themes/mediawiki/images/icons/close.svg new file mode 100644 index 0000000..88ffb56 --- /dev/null +++ b/src/themes/mediawiki/images/icons/close.svg @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"> + <path d="M18 7.6l-1.4-1.4-4.6 4.6-4.6-4.6L6 7.6l4.6 4.6L6 16.8l1.4 1.4 4.6-4.6 4.6 4.6 1.4-1.4-4.6-4.6z"/> +</svg> -- To view, visit https://gerrit.wikimedia.org/r/341185 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f610f700e4027e2899ebafc08c2fb2b5ab55c50 Gerrit-PatchSet: 3 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: VolkerE <[email protected]> Gerrit-Reviewer: Esanders <[email protected]> Gerrit-Reviewer: JGirault <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: Nirzar <[email protected]> Gerrit-Reviewer: Pginer <[email protected]> Gerrit-Reviewer: Rho <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
