From 699b595fb0ff62dfc3287ab58b649d030a528020 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Sat, 3 Sep 2016 12:37:43 +0530
Subject: [PATCH] Fix streched favicon

The current favicon is vertically streched and violates branding
guidelines.  Reuse an existing, correct 32x32 PNG with transparency
instead of .ICO file.  This means that only IE version >= 11 are
supported.  Also use the modern format for specifying the favicon in
HTML.
---
 CHANGELOG.md                               |   1 +
 LICENSES                                   |   2 --
 plinth/templates/base.html                 |   5 +++--
 static/themes/default/img/favicon-32px.ico | Bin 3362 -> 0 bytes
 static/themes/default/img/favicon.ico      | Bin 1070 -> 0 bytes
 5 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 static/themes/default/img/favicon-32px.ico
 delete mode 100644 static/themes/default/img/favicon.ico

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88e3a4984..58f090203 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
 - monkeysphere: Handle new uid format of gpg2.
 - monkeysphere: Fixed handling of unavailable imported domains.
 - minetest: Fixed showing status block and diagnostics.
+- Fix stretched favicon.
 
 ### Changed
 - dynamicdns, monkeysphere, transmission, upgrades: Use actions where
diff --git a/LICENSES b/LICENSES
index 2fc723b6a..357250a54 100644
--- a/LICENSES
+++ b/LICENSES
@@ -21,8 +21,6 @@ otherwise.
 - static/themes/default/img/apple-touch-icon-57px-precomposed.png :: -
 - static/themes/default/img/apple-touch-icon-72px-precomposed.png :: -
 - static/themes/default/img/apple-touch-icon.xcf :: -
-- static/themes/default/img/favicon-32px.ico :: -
-- static/themes/default/img/favicon.ico :: -
 - static/themes/default/img/freedombox-logo-200px.png :: -
 - static/themes/default/img/freedombox-logo-250px.png :: -
 - static/themes/default/img/freedombox-logo-32px.png :: -
diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index 8f12ee8e9..3363a9063 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -55,8 +55,9 @@
     </title>
   {% endblock %}
 
-  <!-- This is the traditional favicon. Size: 16x16 or 32x32, transparency is OK -->
-  <link rel="shortcut icon" href="{% static 'theme/img/favicon.ico' %}"/>
+  <!-- Favicon. Works with IE >= 11 and other GUI browsers -->
+  <link rel="icon" type="image/png"
+        href="{% static 'theme/img/freedombox-logo-32px.png' %}"/>
 
   <!-- The is the icon for iOS's Web Clip. Size: 57x57 for older iPhones, 72x72 for iPads, 114x114 for iPhone4
   - To prevent iOS from applying its styles to the icon name it thusly: apple-touch-icon-precomposed.png
diff --git a/static/themes/default/img/favicon-32px.ico b/static/themes/default/img/favicon-32px.ico
deleted file mode 100644
index 9d3453d3d13143bc4d4e1b820ecf9cfa337bee2d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3362
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
GW$Zs^E9DCS

diff --git a/static/themes/default/img/favicon.ico b/static/themes/default/img/favicon.ico
deleted file mode 100644
index 00052cc4a59d73a8927b95009e603e1910f63e71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1070
zcmcgrOHWf#5FXG37sPbo!nl!zC=?MSw9<mSA5{>M_+agd#H}%E0$M=Y(iSKbq=@KG
zFfL6@kVK6O*T&G>-rL?j@DT-#g2X$1b4?>L#HA<s?wK?5eP?FQxrZo^^2t(2n2V@y
z7tvuNvRLx5&Z9@L2jMFbAFv+~-oHlFZKdeIq5PFwM+Ty|OSTlZm6ajudu8}&i!xm9
zP=?CVio28%`w5OWI#|40G}{N({n4Q^Rz{8i6-I3II0HX`&Ddxq$KaEgaKOE~T`M;7
zEXD3ra@<p8#C_GQdTrm-G5e<Kvu^+_KEzl!%1HU^zxA=vs>iC&#_HG!*8GmoYQXt6
z5v<DsYl(o9wSdEn2?sSj%jx4jyJ^DTsrqXSEdc)b$(M<VhF8hS#^=dU<2%fZH7A0#
ztoj`WxP2mudu^sR?zLY*PKJ)bUC~1=5B2G`C#i6I1bCx|+gP7!k(kL5E_%8tV$A!H
z7dh*U<YW_gtuInx*NxQdscY%!jy>sFmj$*rHREFJi9MPO;i8VOai8sgI#yGx1)bkz
zZ+*IzQ!^d&$r+biJwZq5yQjq@=u3fR;Rsg?)^6ggtXjZXfx5T!P&4b{c23WAZe=4q
zmqnAke}PsPFNsOn$XQ!@uIr;7?qK0UW2gZ~HT3<7iF&iYG-}L5&KTK+US3^1UuO#O
zfo&CECeqF5$K;9z+UuIXMv=2MYex*6FPVkjhMYDx!&jA=@BW0IOs;5fjvs(2)Uuuo
zH7}#Ti<!Buy`st7JC~CZa+@|{h2ZqyE}kaF>(`-uu;#%X6c8=p%?NU~$4%tXeq$Ja
bOMyysaO2OrDk6DTdHC);n0e>GfA;<Y`w@}s