Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: new OFF logo #6885

Merged
merged 1 commit into from
Jun 10, 2022
Merged

feat: new OFF logo #6885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion html/favicon.ico
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
images/misc/favicon.ico
images/favicon/favicon.ico
17 changes: 0 additions & 17 deletions html/images/favicon/OFF.svg
View file
Open in desktop

This file was deleted.

Binary file removed html/images/favicon/android-chrome-144x144.png
View file
Open in desktop
Binary file not shown.
Binary file modified html/images/favicon/android-chrome-192x192.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed html/images/favicon/android-chrome-36x36.png
View file
Open in desktop
Binary file not shown.
Binary file removed html/images/favicon/android-chrome-48x48.png
View file
Open in desktop
Binary file not shown.
Binary file added html/images/favicon/android-chrome-512x512.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed html/images/favicon/android-chrome-72x72.png
View file
Open in desktop
Binary file not shown.
Binary file removed html/images/favicon/android-chrome-96x96.png
View file
Open in desktop
Binary file not shown.
Binary file removed html/images/favicon/apple-touch-icon-114x114.png
View file
Open in desktop
Binary file not shown.
Binary file removed html/images/favicon/apple-touch-icon-120x120.png
View file
Open in desktop
Binary file not shown.
Binary file removed html/images/favicon/apple-touch-icon-144x144.png
View file
Open in desktop
Binary file not shown.
Binary file removed html/images/favicon/apple-touch-icon-152x152.png
View file
Open in desktop
Binary file not shown.
Binary file removed html/images/favicon/apple-touch-icon-180x180.png
View file
Open in desktop
Binary file not shown.
Binary file removed html/images/favicon/apple-touch-icon-57x57.png
View file
Open in desktop
Binary file not shown.
Binary file removed html/images/favicon/apple-touch-icon-60x60.png
View file
Open in desktop
Binary file not shown.
Binary file removed html/images/favicon/apple-touch-icon-72x72.png
View file
Open in desktop
Binary file not shown.
Binary file removed html/images/favicon/apple-touch-icon-76x76.png
View file
Open in desktop
Binary file not shown.
Binary file removed html/images/favicon/apple-touch-icon-precomposed.png
View file
Open in desktop
Binary file not shown.
Binary file modified html/images/favicon/apple-touch-icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 9 additions & 12 deletions html/images/favicon/browserconfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Binary file modified html/images/favicon/favicon-16x16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified html/images/favicon/favicon-32x32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed html/images/favicon/favicon-96x96.png
View file
Open in desktop
Binary file not shown.
Binary file modified html/images/favicon/favicon.ico
View file
Open in desktop
Binary file not shown.
41 changes: 0 additions & 41 deletions html/images/favicon/manifest.json
View file
Open in desktop

This file was deleted.

Binary file modified html/images/favicon/mstile-144x144.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified html/images/favicon/mstile-150x150.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified html/images/favicon/mstile-310x150.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified html/images/favicon/mstile-310x310.png
View file
Open in desktop
Binary file modified html/images/favicon/mstile-70x70.png
View file
Open in desktop
33 changes: 32 additions & 1 deletion html/images/favicon/safari-pinned-tab.svg
View file
Open in desktop
19 changes: 19 additions & 0 deletions html/images/favicon/site.webmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
24 changes: 9 additions & 15 deletions lib/ProductOpener/Config_off.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
);

Expand All @@ -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
Expand Down
9 changes: 4 additions & 5 deletions templates/web/common/site_layout.tt.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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 %]"]
}
Expand Down