feat: new OFF logo #6866 (#6885)

openfoodfacts · Jun 10, 2022 · 7354ebf · 7354ebf
1 parent f0746c9
commit 7354ebf
Show file tree

Hide file tree

Showing 35 changed files with 74 additions and 92 deletions.
diff --git a/html/favicon.ico b/html/favicon.ico
@@ -1 +1 @@
-images/misc/favicon.ico
+images/favicon/favicon.ico
diff --git a/html/images/favicon/OFF.svg b/html/images/favicon/OFF.svg
diff --git a/html/images/favicon/android-chrome-144x144.png b/html/images/favicon/android-chrome-144x144.png
diff --git a/html/images/favicon/android-chrome-192x192.png b/html/images/favicon/android-chrome-192x192.png
diff --git a/html/images/favicon/android-chrome-36x36.png b/html/images/favicon/android-chrome-36x36.png
diff --git a/html/images/favicon/android-chrome-48x48.png b/html/images/favicon/android-chrome-48x48.png
diff --git a/html/images/favicon/android-chrome-512x512.png b/html/images/favicon/android-chrome-512x512.png
diff --git a/html/images/favicon/android-chrome-72x72.png b/html/images/favicon/android-chrome-72x72.png
diff --git a/html/images/favicon/android-chrome-96x96.png b/html/images/favicon/android-chrome-96x96.png
diff --git a/html/images/favicon/apple-touch-icon-114x114.png b/html/images/favicon/apple-touch-icon-114x114.png
diff --git a/html/images/favicon/apple-touch-icon-120x120.png b/html/images/favicon/apple-touch-icon-120x120.png
diff --git a/html/images/favicon/apple-touch-icon-144x144.png b/html/images/favicon/apple-touch-icon-144x144.png
diff --git a/html/images/favicon/apple-touch-icon-152x152.png b/html/images/favicon/apple-touch-icon-152x152.png
diff --git a/html/images/favicon/apple-touch-icon-180x180.png b/html/images/favicon/apple-touch-icon-180x180.png
diff --git a/html/images/favicon/apple-touch-icon-57x57.png b/html/images/favicon/apple-touch-icon-57x57.png
diff --git a/html/images/favicon/apple-touch-icon-60x60.png b/html/images/favicon/apple-touch-icon-60x60.png
diff --git a/html/images/favicon/apple-touch-icon-72x72.png b/html/images/favicon/apple-touch-icon-72x72.png
diff --git a/html/images/favicon/apple-touch-icon-76x76.png b/html/images/favicon/apple-touch-icon-76x76.png
diff --git a/html/images/favicon/apple-touch-icon-precomposed.png b/html/images/favicon/apple-touch-icon-precomposed.png
diff --git a/html/images/favicon/apple-touch-icon.png b/html/images/favicon/apple-touch-icon.png
diff --git a/html/images/favicon/browserconfig.xml b/html/images/favicon/browserconfig.xml
@@ -1,12 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-  <msapplication>
-    <tile>
-      <square70x70logo src="/images/favicon/mstile-70x70.png"/>
-      <square150x150logo src="/images/favicon/mstile-150x150.png"/>
-      <square310x310logo src="/images/favicon/mstile-310x310.png"/>
-      <wide310x150logo src="/images/favicon/mstile-310x150.png"/>
-      <TileColor>#da532c</TileColor>
-    </tile>
-  </msapplication>
-</browserconfig>
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/images/favicon/mstile-150x150.png"/>
+            <TileColor>#ffffff</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/html/images/favicon/favicon-16x16.png b/html/images/favicon/favicon-16x16.png
diff --git a/html/images/favicon/favicon-32x32.png b/html/images/favicon/favicon-32x32.png
diff --git a/html/images/favicon/favicon-96x96.png b/html/images/favicon/favicon-96x96.png
diff --git a/html/images/favicon/favicon.ico b/html/images/favicon/favicon.ico
diff --git a/html/images/favicon/manifest.json b/html/images/favicon/manifest.json
diff --git a/html/images/favicon/mstile-144x144.png b/html/images/favicon/mstile-144x144.png
diff --git a/html/images/favicon/mstile-150x150.png b/html/images/favicon/mstile-150x150.png
diff --git a/html/images/favicon/mstile-310x150.png b/html/images/favicon/mstile-310x150.png
diff --git a/html/images/favicon/mstile-310x310.png b/html/images/favicon/mstile-310x310.png
diff --git a/html/images/favicon/mstile-70x70.png b/html/images/favicon/mstile-70x70.png
diff --git a/html/images/favicon/safari-pinned-tab.svg b/html/images/favicon/safari-pinned-tab.svg
diff --git a/html/images/favicon/site.webmanifest b/html/images/favicon/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "/images/favicon/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/images/favicon/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
diff --git a/lib/ProductOpener/Config_off.pm b/lib/ProductOpener/Config_off.pm
@@ -401,18 +401,9 @@ HTML
 ;
 
 my @icons = (
-	{ "platform" => "ios", "sizes" => "57x57", "src" => "https://static.$server_domain/images/favicon/apple-touch-icon-57x57.png" },
-	{ "platform" => "ios", "sizes" => "60x60", "src" => "https://static.$server_domain/images/favicon/apple-touch-icon-60x60.png" },
-	{ "platform" => "ios", "sizes" => "72x72", "src" => "https://static.$server_domain/images/favicon/apple-touch-icon-72x72.png" },
-	{ "platform" => "ios", "sizes" => "76x76", "src" => "https://static.$server_domain/images/favicon/apple-touch-icon-76x76.png" },
-	{ "platform" => "ios", "sizes" => "114x114", "src" => "https://static.$server_domain/images/favicon/apple-touch-icon-114x114.png" },
-	{ "platform" => "ios", "sizes" => "120x120", "src" => "https://static.$server_domain/images/favicon/apple-touch-icon-120x120.png" },
-	{ "platform" => "ios", "sizes" => "144x144", "src" => "https://static.$server_domain/images/favicon/apple-touch-icon-144x144.png" },
-	{ "platform" => "ios", "sizes" => "152x152", "src" => "https://static.$server_domain/images/favicon/apple-touch-icon-152x152.png" },
-	{ "platform" => "ios", "sizes" => "180x180", "src" => "https://static.$server_domain/images/favicon/apple-touch-icon-180x180.png" },
-	{ "type" => "image/png", "src" => "https://static.$server_domain/images/favicon/favicon-32x32.png", "sizes" => "32x32" },
+	{ "type" => "image/png", "src" => "https://static.$server_domain/images/favicon/android-chrome-512x512.png", "sizes" => "512x512" },
 	{ "type" => "image/png", "src" => "https://static.$server_domain/images/favicon/android-chrome-192x192.png", "sizes" => "192x192" },
-	{ "type" => "image/png", "src" => "https://static.$server_domain/images/favicon/favicon-96x96.png", "sizes" => "96x96" },
+	{ "type" => "image/png", "src" => "https://static.$server_domain/images/favicon/favicon-32x32.png", "sizes" => "32x32" },
 	{ "type" => "image/png", "src" => "https://static.$server_domain/images/favicon/favicon-16x16.png", "sizes" => "16x16" },
 );
 
@@ -434,13 +425,16 @@ $options{mongodb_supports_sample} = 0;  # from MongoDB 3.2 onward
 $options{display_random_sample_of_products_after_edits} = 0;  # from MongoDB 3.2 onward
 
 $options{favicons} = <<HTML
-<link rel="manifest" href="/cgi/manifest.pl">
+<link rel="apple-touch-icon" sizes="180x180" href="/images/favicon/apple-touch-icon.png">
+<link rel="icon" type="image/png" sizes="32x32" href="/images/favicon/favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="/images/favicon/favicon-16x16.png">
+<link rel="manifest" href="/images/favicon/site.webmanifest">
 <link rel="mask-icon" href="/images/favicon/safari-pinned-tab.svg" color="#5bbad5">
 <link rel="shortcut icon" href="/images/favicon/favicon.ico">
-<meta name="msapplication-TileColor" content="#da532c">
-<meta name="msapplication-TileImage" content="/images/favicon/mstile-144x144.png">
+<meta name="msapplication-TileColor" content="#ffffff">
 <meta name="msapplication-config" content="/images/favicon/browserconfig.xml">
-<meta name="_globalsign-domain-verification" content="2ku73dDL0bAPTj_s1aylm6vxvrBZFK59SfbH_RdUya" />
+<meta name="theme-color" content="#ffffff">
+
 <meta name="apple-itunes-app" content="app-id=588797948">
 <meta name="flattr:id" content="dw637l">
 HTML

diff --git a/templates/web/common/site_layout.tt.html b/templates/web/common/site_layout.tt.html
@@ -31,7 +31,9 @@
 <nav class="top-bar" data-topbar id="top-bar">
 	<ul class="title-area">
 		<li class="name">
-			<h2><a href="/" style="font-size:1rem;">[% site_name %]</a></h2>
+			<h2><a href="/">
+				<img id="logo" src="[% static_subdomain %]/images/logos/off-logo-horizontal-light.svg" alt="[% lang('site_name') %]" style="height:2rem;">
+			</a></h2>
 		</li>
 		<li class="toggle-topbar menu-icon">
 			<a href="#"><span>Menu</span></a>
@@ -148,9 +150,6 @@ <h2><a href="/" style="font-size:1rem;">[% site_name %]</a></h2>
 		<div class="row full-width" style="max-width: 100% !important;" data-equalizer>
 			<div class="xxlarge-2 xlarge-2 large-3 medium-4 columns hide-for-small" style="background-color:#fafafa;padding-top:1rem;" data-equalizer-watch>
 				<div class="sidebar">
-					<div style="text-align:center">
-						<a href="/"><img id="logo" src="/images/misc/[% lang('logo') %]" srcset="/images/misc/[% lang('logo2x') %] 2x" width="178" height="150" alt="[% lang('logo_site_name') %]" style="margin-bottom:0.5rem"></a>
-					</div>
 					[% tagline %]
 					<form action="/cgi/search.pl" class="hide-for-large-up">
 						<div class="row collapse">
@@ -297,7 +296,7 @@ <h3 class="title">[% lang('footer_join_the_community') %]</h3>
 	"@context": "https://schema.org/",
 	"@type": "Organization",
 	"url": "[% formatted_subdomain %]",
-	"logo": "/images/misc/[% lang('logo') %]",
+	"logo": "[% static_subdomain %]/images/logos/off-logo-vertical-light.svg",
 	"name": "[% lang('site_name') %]",
 	"sameAs" : [ "[% lang("facebook_page") %]", "https://twitter.com/[% twitter_account %]"]
 }