From 883bb681cd675b9f3e326b33deae1e6ebd6b2dad Mon Sep 17 00:00:00 2001
From: Anoop Singh <k.anoopsingh92@gmail.com>
Date: Mon, 17 Feb 2025 12:07:00 +0530
Subject: [PATCH] Issue #3501275: Double favicon link lines
---
manifest.json | 6 +++---
subtheme/manifest.json | 6 +++---
templates/components/head.html.twig | 2 --
templates/layout/html.html.twig | 1 +
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/manifest.json b/manifest.json
index 6edd8e8..bfb1947 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,9 +1,9 @@
{
"name" : "FlexiStyle Bootstrap",
- "short_name": "FlexiStyle Bootstrap",
+ "short_name": "FlexiStyle",
"description" : "FlexiStyle Bootstrap theme is a base theme for Drupal. This theme is fully compatible with Drupal 10.",
- "scope" : "/",
- "start_url": "/",
+ "start_url": "./",
+ "scope": ".",
"display": "standalone",
"theme_color": "#066db2",
"background_color": "#ffffff",
diff --git a/subtheme/manifest.json b/subtheme/manifest.json
index 6edd8e8..bfb1947 100644
--- a/subtheme/manifest.json
+++ b/subtheme/manifest.json
@@ -1,9 +1,9 @@
{
"name" : "FlexiStyle Bootstrap",
- "short_name": "FlexiStyle Bootstrap",
+ "short_name": "FlexiStyle",
"description" : "FlexiStyle Bootstrap theme is a base theme for Drupal. This theme is fully compatible with Drupal 10.",
- "scope" : "/",
- "start_url": "/",
+ "start_url": "./",
+ "scope": ".",
"display": "standalone",
"theme_color": "#066db2",
"background_color": "#ffffff",
diff --git a/templates/components/head.html.twig b/templates/components/head.html.twig
index e6ce71e..2fd3ac7 100644
--- a/templates/components/head.html.twig
+++ b/templates/components/head.html.twig
@@ -8,11 +8,9 @@
<link rel="apple-touch-icon" sizes="152x152" href="/{{ active_theme_path() }}/images/icons/apple-icon-152x152.png" />
<link rel="apple-touch-icon" sizes="180x180" href="/{{ active_theme_path() }}/images/icons/apple-icon-180x180.png" />
<link rel="icon" type="image/png" sizes="192x192" href="/{{ active_theme_path() }}/images/icons/android-icon-192x192.png" />
-<link rel="icon" href="/{{ active_theme_path() }}/favicon.ico" />
<link rel="icon" type="image/png" sizes="16x16" href="/{{ active_theme_path() }}/images/icons/favicon-16x16.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/{{ active_theme_path() }}/images/icons/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="96x96" href="/{{ active_theme_path() }}/images/icons/favicon-96x96.png" />
-<link rel="manifest" href="/{{ active_theme_path() }}/manifest.json" />
<meta name="msapplication-TileColor" content="#ffffff" />
<meta name="theme-color" content="#066db2" />
<meta name="msapplication-TileImage" content="/{{ active_theme_path() }}/images/icons/ms-icon-144x144.png" />
diff --git a/templates/layout/html.html.twig b/templates/layout/html.html.twig
index f8cd011..4dba631 100644
--- a/templates/layout/html.html.twig
+++ b/templates/layout/html.html.twig
@@ -52,6 +52,7 @@
<css-placeholder token="{{ placeholder_token }}">
<style> {{ global_style }} </style>
<js-placeholder token="{{ placeholder_token }}">
+ <link rel="manifest" href="/{{ active_theme_path() }}/manifest.json" />
<script src="/{{ active_theme_path() }}/sw.js"></script>
</head>
<body{{ attributes.addClass(body_classes) }}>
--
GitLab