Merge pull request #6738 from stokito/svg_favicon

SVG favicon

diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.png b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.png
deleted file mode 100644 (file)
index 90adf2f..0000000
Binary files a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.png and /dev/null differ

diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/logo.svg b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/logo.svg
new file mode 100644 (file)
index 0000000..c7a445e
--- /dev/null
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-9 -1 100 100"><path d="m -9 -1h100v100h-100z" fill="#00B5E2"/><path d="m40.5 50.8a6.6 6.6 0 1 0 0 13.2 6.6 6.6 0 0 0 0-13.2m-40.5-33.9 7 6.8a47.5 47.5 0 0 1 67.2 0l7-6.8a57.2 57.2 0 0 0-81.2 0" fill="#fff"/><path d="m12.5 29.2 6.8 7a30 30 0 0 1 42.6 0l6.8-7a39.7 39.7 0 0 0-56.3 0" fill="#fff"/><path d="m24.8 41.6 6.8 6.9a12.6 12.6 0 0 1 18 0l6.8-6.9a22.3 22.3 0 0 0-31.6 0" fill="#fff"/><path d="m64.9 39.7a30.2 30.2 0 1 1-48.7 0l-6.9-7a39.9 39.9 0 1 0 62.5 0z" fill="#002B49"/></svg>
\ No newline at end of file

diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/logo_48.png b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/logo_48.png
new file mode 100644 (file)
index 0000000..6fb1f75
Binary files /dev/null and b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/logo_48.png differ

diff --git a/themes/luci-theme-bootstrap/ucode/template/themes/bootstrap/header.ut b/themes/luci-theme-bootstrap/ucode/template/themes/bootstrap/header.ut
index b7bc770b4b1976776aeab3e729cd7825b682b263..a6d2936a5f417dd38aaac1bb8846587652b94f00 100644 (file)
--- a/themes/luci-theme-bootstrap/ucode/template/themes/bootstrap/header.ut
+++ b/themes/luci-theme-bootstrap/ucode/template/themes/bootstrap/header.ut
@@ -32,7 +32,8 @@
                <meta name="viewport" content="initial-scale=1.0">
                <link rel="stylesheet" href="{{ media }}/cascade.css">
                <link rel="stylesheet" media="only screen and (max-device-width: 854px)" href="{{ media }}/mobile.css" type="text/css" />
-               <link rel="shortcut icon" href="{{ media }}/favicon.png">
+               <link rel="icon" href="{{ media }}/logo_48.png" sizes="48x48">
+               <link rel="icon" href="{{ media }}/logo.svg" sizes="any">
                {% if (node?.css): %}
                <link rel="stylesheet" href="{{ resource }}/{{ node.css }}">
                {% endif %}

diff --git a/themes/luci-theme-material/htdocs/luci-static/material/favicon.ico b/themes/luci-theme-material/htdocs/luci-static/material/favicon.ico
deleted file mode 100644 (file)
index 72c3115..0000000
Binary files a/themes/luci-theme-material/htdocs/luci-static/material/favicon.ico and /dev/null differ

diff --git a/themes/luci-theme-material/htdocs/luci-static/material/logo.svg b/themes/luci-theme-material/htdocs/luci-static/material/logo.svg
new file mode 100644 (file)
index 0000000..c7a445e
--- /dev/null
+++ b/themes/luci-theme-material/htdocs/luci-static/material/logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-9 -1 100 100"><path d="m -9 -1h100v100h-100z" fill="#00B5E2"/><path d="m40.5 50.8a6.6 6.6 0 1 0 0 13.2 6.6 6.6 0 0 0 0-13.2m-40.5-33.9 7 6.8a47.5 47.5 0 0 1 67.2 0l7-6.8a57.2 57.2 0 0 0-81.2 0" fill="#fff"/><path d="m12.5 29.2 6.8 7a30 30 0 0 1 42.6 0l6.8-7a39.7 39.7 0 0 0-56.3 0" fill="#fff"/><path d="m24.8 41.6 6.8 6.9a12.6 12.6 0 0 1 18 0l6.8-6.9a22.3 22.3 0 0 0-31.6 0" fill="#fff"/><path d="m64.9 39.7a30.2 30.2 0 1 1-48.7 0l-6.9-7a39.9 39.9 0 1 0 62.5 0z" fill="#002B49"/></svg>
\ No newline at end of file

diff --git a/themes/luci-theme-material/htdocs/luci-static/material/logo_48.png b/themes/luci-theme-material/htdocs/luci-static/material/logo_48.png
new file mode 100644 (file)
index 0000000..6fb1f75
Binary files /dev/null and b/themes/luci-theme-material/htdocs/luci-static/material/logo_48.png differ

diff --git a/themes/luci-theme-material/ucode/template/themes/material/header.ut b/themes/luci-theme-material/ucode/template/themes/material/header.ut
index ed6a6379780e91a355631badd55c37c7f98d82b7..4a7e4cb8f1c9af70da0ca156e3b0e27eb5aafc82 100644 (file)
--- a/themes/luci-theme-material/ucode/template/themes/material/header.ut
+++ b/themes/luci-theme-material/ucode/template/themes/material/header.ut
@@ -40,7 +40,8 @@
 <meta name="application-name" content="{{ hostname }} - LuCI">
 <meta name="apple-mobile-web-app-title" content="{{ hostname }} - LuCI">
 <link rel="stylesheet" href="{{ media }}/cascade.css">
-<link rel="shortcut icon" href="{{ media }}/favicon.ico">
+<link rel="icon" href="{{ media }}/logo_48.png" sizes="48x48">
+<link rel="icon" href="{{ media }}/logo.svg" sizes="any">
 {% if (node?.css): %}
 <link rel="stylesheet" href="{{ resource }}/{{ node.css }}">
 {% endif %}

diff --git a/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/cascade.css b/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/cascade.css
index bf7a7a391dc90f4653093fd5460e3480787b4716..4853ea7497eb489cf7e22a9e577bac03bfa1d601 100644 (file)
--- a/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/cascade.css
+++ b/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/cascade.css
@@ -1,5 +1,5 @@
 :root {
-       --main-bright-color: #00A3E1;
+       --main-bright-color: #00B5E2;
        --main-dark-color: #002B49;
        --secondary-bright-color: #FFFFFF;
        --secondary-dark-color: #212322;

diff --git a/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/logo.svg b/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/logo.svg
index 60602218442c04c6ed7ecd9532d5e6bb0e5df31e..c7a445e93d3b70fb97f85af9d50197ff71ea5258 100644 (file)
--- a/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/logo.svg
+++ b/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/logo.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 81 98">
-  <path d="m 40.5,50.8 a 6.6,6.6 0 1 0 0,13.2 6.6,6.6 0 0 0 0,-13.2 m -40.5,-33.9 7,6.8 a 47.5,47.5 0 0 1 67.2,0 l 7,-6.8 a 57.2,57.2 0 0 0 -81.2,0" style="fill:#fff" />
-  <path d="m 12.5,29.2 6.8,7 a 30,30 0 0 1 42.6,0 l 6.8,-7 a 39.7,39.7 0 0 0 -56.3,0" style="fill:#fff" />
-  <path d="m 24.8,41.6 6.8,6.9 a 12.6,12.6 0 0 1 18,0 l 6.8,-6.9 a 22.3,22.3 0 0 0 -31.6,0" style="fill:#fff" />
-  <path d="m 64.9,39.7 a 30.2,30.2 0 1 1 -48.7,0 l -6.9,-7 a 39.9,39.9 0 1 0 62.5,0 z" style="fill:#072342" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-9 -1 100 100"><path d="m -9 -1h100v100h-100z" fill="#00B5E2"/><path d="m40.5 50.8a6.6 6.6 0 1 0 0 13.2 6.6 6.6 0 0 0 0-13.2m-40.5-33.9 7 6.8a47.5 47.5 0 0 1 67.2 0l7-6.8a57.2 57.2 0 0 0-81.2 0" fill="#fff"/><path d="m12.5 29.2 6.8 7a30 30 0 0 1 42.6 0l6.8-7a39.7 39.7 0 0 0-56.3 0" fill="#fff"/><path d="m24.8 41.6 6.8 6.9a12.6 12.6 0 0 1 18 0l6.8-6.9a22.3 22.3 0 0 0-31.6 0" fill="#fff"/><path d="m64.9 39.7a30.2 30.2 0 1 1-48.7 0l-6.9-7a39.9 39.9 0 1 0 62.5 0z" fill="#002B49"/></svg>
\ No newline at end of file

diff --git a/themes/luci-theme-openwrt-2020/ucode/template/themes/openwrt2020/header.ut b/themes/luci-theme-openwrt-2020/ucode/template/themes/openwrt2020/header.ut
index 2b7c581387f8c0f5ec1dcbac0109fdc077d71f9b..3857bce723a8a5e6d5977a87054b1f469fa0cd30 100644 (file)
--- a/themes/luci-theme-openwrt-2020/ucode/template/themes/openwrt2020/header.ut
+++ b/themes/luci-theme-openwrt-2020/ucode/template/themes/openwrt2020/header.ut
@@ -19,8 +19,8 @@
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <link rel="stylesheet" type="text/css" media="screen" href="{{ media }}/cascade.css" />
-<link rel="icon" href="{{ media }}/logo.svg" type="image/svg+xml" />
-<link rel="apple-touch-icon" href="{{ media }}/logo.png" />
+<link rel="icon" href="{{ media }}/logo.png" sizes="180x180">
+<link rel="icon" href="{{ media }}/logo.svg" sizes="any">
 <script type="text/javascript" src="{{ dispatcher.build_url('admin/translations', dispatcher.lang) }}"></script>
 <script type="text/javascript" src="{{ resource }}/cbi.js"></script>
 <title>{{ striptags(`${boardinfo.hostname ?? '?'}${node ? ` - ${node.title}` : ''}`) }} - LuCI</title>