Remove favicon generator and use static icons

Drop middleman-favicon-maker, FaviconsHelper, and related config; add
static favicon files and update layout
Remove imagemagick APT caching step and cleanup Gemfile/Gemfile.lock

Author: thibaudgg

.github/workflows/deploy.yml

@@ -19,11 +19,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Install APT Packages
-        uses: awalsh128/cache-apt-pkgs-action@v1
-        with:
-          packages: imagemagick
-
       - name: Checkout
         uses: actions/checkout@v4
 

Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gem 'ostruct' # Required for Ruby 4.0+
 
 gem 'middleman'
-gem 'middleman-favicon-maker'
 
 gem 'middleman-inline_svg'
 gem 'middleman-livereload'

Gemfile.lock

@@ -25,7 +25,6 @@ GEM
     concurrent-ruby (1.3.6)
     connection_pool (3.0.2)
     contracts (0.17.3)
-    docile (1.4.1)
     dotenv (3.2.0)
     drb (2.2.3)
     em-websocket (0.5.3)
@@ -36,9 +35,8 @@ GEM
     execjs (2.10.0)
     fast_blank (1.0.1)
     fastimage (2.4.0)
-    favicon_maker (1.3.1)
-      docile (~> 1.1)
     ffi (1.17.3)
+    ffi (1.17.3-arm64-darwin)
     haml (7.2.0)
       temple (>= 0.8.2)
       thor
@@ -92,9 +90,6 @@ GEM
       toml
       uglifier (>= 3, < 5)
       webrick
-    middleman-favicon-maker (4.1.0)
-      favicon_maker (~> 1.3, >= 1.3.1)
-      middleman-core (~> 4.0)
     middleman-inline_svg (0.1.2)
       middleman-core (>= 3.4.1)
       nokogiri (>= 1.8)
@@ -111,6 +106,8 @@ GEM
     nokogiri (1.19.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    nokogiri (1.19.0-arm64-darwin)
+      racc (~> 1.4)
     ostruct (0.6.3)
     padrino-helpers (0.15.3)
       i18n (>= 0.6.7, < 2)
@@ -155,7 +152,6 @@ PLATFORMS
 
 DEPENDENCIES
   middleman
-  middleman-favicon-maker
   middleman-inline_svg
   middleman-livereload
   middleman-robots

config.rb

@@ -1,5 +1,4 @@
 Dir['./*/*.rb'].each { |file| load file }
-include FaviconsHelper
 
 # Build-specific configuration
 # https://middlemanapp.com/advanced/configuration/#environment-specific-settings
@@ -24,7 +23,6 @@
   set      :relative_links, true
   activate :asset_hash
   activate :directory_indexes
-  activate :favicon_maker, icons: generate_favicons_hash
   activate :gzip
   activate :relative_assets
   activate :robots,
@@ -33,36 +31,6 @@
 end
 activate :inline_svg
 
-set :favicons, [
-  {
-    rel: 'apple-touch-icon',
-    size: '180x180',
-    icon: 'apple-touch-icon.png'
-  },
-  {
-    rel: 'icon',
-    type: 'image/png',
-    size: '32x32',
-    icon: 'favicon32x32.png'
-  },
-  {
-    rel: 'icon',
-    type: 'image/png',
-    size: '16x16',
-    icon: 'favicon16x16.png'
-  },
-  {
-    rel: 'shortcut icon',
-    size: '64x64,32x32,24x24,16x16',
-    icon: 'favicon.ico'
-  },
-  {
-    rel: 'og-image',
-    size: '1200x630',
-    icon: 'og-image.png'
-  }
-]
-
 helpers do
   def current_page?(path)
     current_page.url.chomp('/') == path.chomp('/')

data/site.yml

@@ -2,7 +2,6 @@ name: "CSA Admin"
 baskets_count: 140000
 host: "https://csa-admin.org"
 thumbnail: "logo.svg"
-favicon: "_favicon_template.svg"
 base_color: "#21952F"
 repository: "https://github.com/csa-admin-org/csa-admin"
 contact:

helpers/favicons_helper.rb

@@ -107,7 +107,9 @@
       }
     </script>
 
-    <%= auto_display_favicon_tags %>
+    <meta name="theme-color" content="<%= data.site.base_color %>">
+    <link rel="icon" href="<%= image_path('favicon.svg') %>" type="image/svg+xml">
+    <link rel="apple-touch-icon" href="<%= image_path('apple-touch-icon.png') %>">
     <%= stylesheet_link_tag 'site' %>
 
   </head>