DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9475 from colinux/favicons-updates

Browse source 
Favicons: ajout de l'apple touch icon + mise à jour avec vraies couleurs de la charte graphique
This commit is contained in:
LeSim 2023-09-12 07:45:54 +00:00 committed by GitHub
commit 31db8429b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/favicons/16x16.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 466 B

After

Width:  |  Height:  |  Size: 480 B

BIN
app/assets/images/favicons/32x32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 889 B

After

Width:  |  Height:  |  Size: 878 B

BIN
app/assets/images/favicons/96x96.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
app/assets/images/favicons/apple-touch-icon.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

6
app/views/graphql/playground.html.haml
View file

@ -4,14 +4,14 @@
%meta{ "http-equiv": "Content-Type", content: "text/html; charset=UTF-8" }
%meta{ "http-equiv": "X-UA-Compatible", content: "IE=edge" }
%meta{ name: "viewport", content: "width=device-width, initial-scale=1" }
%meta{ name: "application-name", content: APPLICATION_NAME }
%meta{ name: "apple-mobile-web-app-title", content: APPLICATION_NAME }
= csrf_meta_tags
%title
= content_for?(:title) ? "#{yield(:title)} · #{APPLICATION_NAME}" : APPLICATION_NAME
= favicon_link_tag(image_url("#{FAVICON_16PX_SRC}"), type: "image/png", sizes: "16x16")
= favicon_link_tag(image_url("#{FAVICON_32PX_SRC}"), type: "image/png", sizes: "32x32")
= favicon_link_tag(image_url("#{FAVICON_96PX_SRC}"), type: "image/png", sizes: "96x96")
= render partial: "layouts/favicons"
= vite_client_tag
= vite_typescript_tag 'playground'

5
app/views/layouts/_favicons.html.haml Normal file
View file

@ -0,0 +1,5 @@
= favicon_link_tag(image_url(FAVICONS_SRC["16px"]), type: "image/png", sizes: "16x16") if FAVICONS_SRC.key?("16px")
= favicon_link_tag(image_url(FAVICONS_SRC["32px"]), type: "image/png", sizes: "32x32") if FAVICONS_SRC.key?("32px")
= favicon_link_tag(image_url(FAVICONS_SRC["96px"]), type: "image/png", sizes: "96x96") if FAVICONS_SRC.key?("96px")
= favicon_link_tag(image_url(FAVICONS_SRC["apple_touch"]), type: nil, sizes: "152x152", rel: "apple-touch-icon") if FAVICONS_SRC.key?("apple_touch")
%meta{ name: "theme-color", content: "#ffffff" }

6
app/views/layouts/application.html.haml
View file

@ -4,14 +4,14 @@
%meta{ "http-equiv": "Content-Type", content: "text/html; charset=UTF-8" }
%meta{ "http-equiv": "X-UA-Compatible", content: "IE=edge" }
%meta{ name: "viewport", content: "width=device-width, initial-scale=1" }
%meta{ name: "application-name", content: APPLICATION_NAME }
%meta{ name: "apple-mobile-web-app-title", content: APPLICATION_NAME }
= csrf_meta_tags
%title
= content_for?(:title) ? "#{sanitize(yield(:title))} · #{APPLICATION_NAME}" : APPLICATION_NAME
= favicon_link_tag(image_url("#{FAVICON_16PX_SRC}"), type: "image/png", sizes: "16x16")
= favicon_link_tag(image_url("#{FAVICON_32PX_SRC}"), type: "image/png", sizes: "32x32")
= favicon_link_tag(image_url("#{FAVICON_96PX_SRC}"), type: "image/png", sizes: "96x96")
= render partial: "layouts/favicons"
= Gon::Base.render_data(camel_case: true, init: true, nonce: request.content_security_policy_nonce)

6
app/views/layouts/component_preview.html.haml
View file

@ -4,14 +4,14 @@
%meta{ "http-equiv": "Content-Type", content: "text/html; charset=UTF-8" }
%meta{ "http-equiv": "X-UA-Compatible", content: "IE=edge" }
%meta{ name: "viewport", content: "width=device-width, initial-scale=1" }
%meta{ name: "application-name", content: APPLICATION_NAME }
%meta{ name: "apple-mobile-web-app-title", content: APPLICATION_NAME }
= csrf_meta_tags
%title
= content_for?(:title) ? "#{yield(:title)} · #{APPLICATION_NAME}" : APPLICATION_NAME
= favicon_link_tag(image_url("#{FAVICON_16PX_SRC}"), type: "image/png", sizes: "16x16")
= favicon_link_tag(image_url("#{FAVICON_32PX_SRC}"), type: "image/png", sizes: "32x32")
= favicon_link_tag(image_url("#{FAVICON_96PX_SRC}"), type: "image/png", sizes: "96x96")
= render partial: "layouts/favicons"
= vite_client_tag
= vite_javascript_tag 'application'

6
app/views/layouts/print.html.haml
View file

@ -3,14 +3,14 @@
%meta{ "http-equiv": "Content-Type", content: "text/html; charset=UTF-8" }
%meta{ "http-equiv": "X-UA-Compatible", content: "IE=edge" }
%meta{ name: "viewport", content: "width=device-width, initial-scale=1" }
%meta{ name: "application-name", content: APPLICATION_NAME }
%meta{ name: "apple-mobile-web-app-title", content: APPLICATION_NAME }
= csrf_meta_tags
%title
= t("dynamics.page_title")
= favicon_link_tag(image_url("#{FAVICON_16PX_SRC}"), type: "image/png", sizes: "16x16")
= favicon_link_tag(image_url("#{FAVICON_32PX_SRC}"), type: "image/png", sizes: "32x32")
= favicon_link_tag(image_url("#{FAVICON_96PX_SRC}"), type: "image/png", sizes: "96x96")
= render partial: "layouts/favicons"
%body
= yield

3
config/env.example.optional
View file

@ -46,9 +46,12 @@ DS_ENV="staging"
# STATUS_PAGE_URL=""
# Instance customization: Favicons ---> to be put in "app/assets/images"
# Search "real favicon generator" to find websites generating all these formats from a single image source.
# An empty string disable the icon if you don't care.
# FAVICON_16PX_SRC="favicons/16x16.png"
# FAVICON_32PX_SRC="favicons/32x32.png"
# FAVICON_96PX_SRC="favicons/96x96.png"
# FAVICON_APPLE_TOUCH_152PX_SRC="favicons/apple-touch-icon.png"
# Instance customization: Application logo ---> to be put in "app/assets/images"
# HEADER_LOGO_SRC="marianne.png"

9
config/initializers/images.rb
View file

@ -1,7 +1,10 @@
# Favicons
FAVICON_16PX_SRC = ENV.fetch("FAVICON_16PX_SRC", "favicons/16x16.png")
FAVICON_32PX_SRC = ENV.fetch("FAVICON_32PX_SRC", "favicons/32x32.png")
FAVICON_96PX_SRC = ENV.fetch("FAVICON_96PX_SRC", "favicons/96x96.png")
FAVICONS_SRC = {
"16px" => ENV.fetch("FAVICON_16PX_SRC", "favicons/16x16.png"),
"32px" => ENV.fetch("FAVICON_32PX_SRC", "favicons/32x32.png"),
"96px" => ENV.fetch("FAVICON_96PX_SRC", "favicons/96x96.png"),
"apple_touch" => ENV.fetch("FAVICON_APPLE_TOUCH_152PX_SRC", "favicons/apple-touch-icon.png")
}.compact_blank.freeze
# Header logo
HEADER_LOGO_SRC = ENV.fetch("HEADER_LOGO_SRC", "marianne.png")