[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: static/images: Restore dimensions of wmf.png

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/360652 )

Change subject: static/images: Restore dimensions of wmf.png
......................................................................


static/images: Restore dimensions of wmf.png

Follows-up 94703bf5ab3902b267d5942e9c871d05b7a64305.

Before that commit, wmf.png was square (135x135) and used in two ways:
* As symlink from project-logos for a wiki's logo.
* Directly for use in static HTML content (e.g. 404 error page for mediawiki,
  for Varnish, for Continuous Integration, and many other places).

In that commit, the dimensions changed to 135x101. That is fine for site logos
(which are auto-centered and have size computed in CSS).

However for static usage, the dimenions must be known in advance and are
currently stretched to 135x135.

This commit:
* Copy wmf.png to wmf-logo.png and update symlinks.
* Create wmf-square.png which restores the previous dimenions.
* Replace wmf.png with symlink to wmf-square.png.

Going forward, we can statically audit usage of wmf.png and replace
either with wmf-square (if a square is required) or replace with wmf-logo
and update the dimensions at the same time.

> convert wmf.png -gravity Center -background Transparent -extent 135x135 
> wmf-square.png
> optipng -o9 wmf-square.png
> ls -sf wmf-square.png wmf.png

Bug: T144254
Change-Id: I737e6f9fced18a44bbd4881c5294392001fda48f
---
M static/images/project-logos/donatewiki-1.5x.png
M static/images/project-logos/donatewiki-2x.png
M static/images/project-logos/donatewiki.png
M static/images/project-logos/foundationwiki-1.5x.png
M static/images/project-logos/foundationwiki-2x.png
M static/images/project-logos/foundationwiki.png
M static/images/project-logos/votewiki-1.5x.png
M static/images/project-logos/votewiki-2x.png
M static/images/project-logos/votewiki.png
A static/images/wmf-1.5x.png
A static/images/wmf-2x.png
R static/images/wmf-logo-1.5x.png
R static/images/wmf-logo-2x.png
R static/images/wmf-logo.png
A static/images/wmf-square-1.5x.png
A static/images/wmf-square-2x.png
A static/images/wmf-square.png
A static/images/wmf.png
18 files changed, 12 insertions(+), 9 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified
  Jforrester: Looks good to me, but someone else must approve



diff --git a/static/images/project-logos/donatewiki-1.5x.png 
b/static/images/project-logos/donatewiki-1.5x.png
index 5db0eff..b60e556 120000
--- a/static/images/project-logos/donatewiki-1.5x.png
+++ b/static/images/project-logos/donatewiki-1.5x.png
@@ -1 +1 @@
-../wmf-1.5x.png
\ No newline at end of file
+../wmf-logo-1.5x.png
\ No newline at end of file
diff --git a/static/images/project-logos/donatewiki-2x.png 
b/static/images/project-logos/donatewiki-2x.png
index 0e906cd..1c68b0b 120000
--- a/static/images/project-logos/donatewiki-2x.png
+++ b/static/images/project-logos/donatewiki-2x.png
@@ -1 +1 @@
-../wmf-2x.png
\ No newline at end of file
+../wmf-logo-2x.png
\ No newline at end of file
diff --git a/static/images/project-logos/donatewiki.png 
b/static/images/project-logos/donatewiki.png
index c91b20d..d4b9bc4 120000
--- a/static/images/project-logos/donatewiki.png
+++ b/static/images/project-logos/donatewiki.png
@@ -1 +1 @@
-../wmf.png
\ No newline at end of file
+../wmf-logo.png
\ No newline at end of file
diff --git a/static/images/project-logos/foundationwiki-1.5x.png 
b/static/images/project-logos/foundationwiki-1.5x.png
index 5db0eff..b60e556 120000
--- a/static/images/project-logos/foundationwiki-1.5x.png
+++ b/static/images/project-logos/foundationwiki-1.5x.png
@@ -1 +1 @@
-../wmf-1.5x.png
\ No newline at end of file
+../wmf-logo-1.5x.png
\ No newline at end of file
diff --git a/static/images/project-logos/foundationwiki-2x.png 
b/static/images/project-logos/foundationwiki-2x.png
index 0e906cd..1c68b0b 120000
--- a/static/images/project-logos/foundationwiki-2x.png
+++ b/static/images/project-logos/foundationwiki-2x.png
@@ -1 +1 @@
-../wmf-2x.png
\ No newline at end of file
+../wmf-logo-2x.png
\ No newline at end of file
diff --git a/static/images/project-logos/foundationwiki.png 
b/static/images/project-logos/foundationwiki.png
index c91b20d..d4b9bc4 120000
--- a/static/images/project-logos/foundationwiki.png
+++ b/static/images/project-logos/foundationwiki.png
@@ -1 +1 @@
-../wmf.png
\ No newline at end of file
+../wmf-logo.png
\ No newline at end of file
diff --git a/static/images/project-logos/votewiki-1.5x.png 
b/static/images/project-logos/votewiki-1.5x.png
index 5db0eff..b60e556 120000
--- a/static/images/project-logos/votewiki-1.5x.png
+++ b/static/images/project-logos/votewiki-1.5x.png
@@ -1 +1 @@
-../wmf-1.5x.png
\ No newline at end of file
+../wmf-logo-1.5x.png
\ No newline at end of file
diff --git a/static/images/project-logos/votewiki-2x.png 
b/static/images/project-logos/votewiki-2x.png
index 0e906cd..1c68b0b 120000
--- a/static/images/project-logos/votewiki-2x.png
+++ b/static/images/project-logos/votewiki-2x.png
@@ -1 +1 @@
-../wmf-2x.png
\ No newline at end of file
+../wmf-logo-2x.png
\ No newline at end of file
diff --git a/static/images/project-logos/votewiki.png 
b/static/images/project-logos/votewiki.png
index c91b20d..d4b9bc4 120000
--- a/static/images/project-logos/votewiki.png
+++ b/static/images/project-logos/votewiki.png
@@ -1 +1 @@
-../wmf.png
\ No newline at end of file
+../wmf-logo.png
\ No newline at end of file
diff --git a/static/images/wmf-1.5x.png b/static/images/wmf-1.5x.png
new file mode 120000
index 0000000..738b7ed
--- /dev/null
+++ b/static/images/wmf-1.5x.png
@@ -0,0 +1 @@
+wmf-square-1.5x.png
\ No newline at end of file
diff --git a/static/images/wmf-2x.png b/static/images/wmf-2x.png
new file mode 120000
index 0000000..f611d7e
--- /dev/null
+++ b/static/images/wmf-2x.png
@@ -0,0 +1 @@
+wmf-square-2x.png
\ No newline at end of file
diff --git a/static/images/wmf-1.5x.png b/static/images/wmf-logo-1.5x.png
similarity index 100%
rename from static/images/wmf-1.5x.png
rename to static/images/wmf-logo-1.5x.png
Binary files differ
diff --git a/static/images/wmf-2x.png b/static/images/wmf-logo-2x.png
similarity index 100%
rename from static/images/wmf-2x.png
rename to static/images/wmf-logo-2x.png
Binary files differ
diff --git a/static/images/wmf.png b/static/images/wmf-logo.png
similarity index 100%
rename from static/images/wmf.png
rename to static/images/wmf-logo.png
Binary files differ
diff --git a/static/images/wmf-square-1.5x.png 
b/static/images/wmf-square-1.5x.png
new file mode 100644
index 0000000..3e124d0
--- /dev/null
+++ b/static/images/wmf-square-1.5x.png
Binary files differ
diff --git a/static/images/wmf-square-2x.png b/static/images/wmf-square-2x.png
new file mode 100644
index 0000000..b49775c
--- /dev/null
+++ b/static/images/wmf-square-2x.png
Binary files differ
diff --git a/static/images/wmf-square.png b/static/images/wmf-square.png
new file mode 100644
index 0000000..cf7ba6a
--- /dev/null
+++ b/static/images/wmf-square.png
Binary files differ
diff --git a/static/images/wmf.png b/static/images/wmf.png
new file mode 120000
index 0000000..90dc01f
--- /dev/null
+++ b/static/images/wmf.png
@@ -0,0 +1 @@
+wmf-square.png
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/360652
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I737e6f9fced18a44bbd4881c5294392001fda48f
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits