summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFlorian Eckert <fe@dev.tdt.de>2019-10-14 10:02:57 +0200
committerGitHub <noreply@github.com>2019-10-14 10:02:57 +0200
commit3607c819cb2753b3037e91520205c787758274a2 (patch)
treee5ddc55139f31b5c7153cba173bffd8570693bc2
parent36887747d5a20388bc3abf929f419cf5ca925387 (diff)
parent39ae339051ac8ed9477ffd62f4068992120b7a1a (diff)
Merge pull request #3167 from Ashus/master
luci-theme-bootstrap: replace the old favicon
-rwxr-xr-xapplications/luci-app-noddos/htdocs/cgi-bin/clientdetails2
-rw-r--r--themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.icobin1150 -> 0 bytes
-rw-r--r--themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.pngbin0 -> 733 bytes
-rw-r--r--themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm2
4 files changed, 2 insertions, 2 deletions
diff --git a/applications/luci-app-noddos/htdocs/cgi-bin/clientdetails b/applications/luci-app-noddos/htdocs/cgi-bin/clientdetails
index 6ff4ce59f..411113c6a 100755
--- a/applications/luci-app-noddos/htdocs/cgi-bin/clientdetails
+++ b/applications/luci-app-noddos/htdocs/cgi-bin/clientdetails
@@ -64,7 +64,7 @@ pagetop = [[
<meta name="viewport" content="initial-scale=1.0">
<link rel="stylesheet" href="/luci-static/bootstrap/cascade.css?v=git-17.100.70571-29fabe2">
<link rel="stylesheet" media="only screen and (max-device-width: 854px)" href="/luci-static/bootstrap/mobile.css?v=git-17.100.70571-29fabe2" type="text/css" />
- <link rel="shortcut icon" href="/luci-static/bootstrap/favicon.ico">
+ <link rel="shortcut icon" href="/luci-static/bootstrap/favicon.png">
<script src="/luci-static/resources/xhr.js?v=git-17.100.70571-29fabe2"></script>
</head>
<body text=blue>
diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.ico b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.ico
deleted file mode 100644
index 77a138ba0..000000000
--- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.ico
+++ /dev/null
Binary files differ
diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.png b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.png
new file mode 100644
index 000000000..d6eaa4bc4
--- /dev/null
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/favicon.png
Binary files differ
diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
index 697c5c7bf..de1fd73f0 100644
--- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
+++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
@@ -139,7 +139,7 @@
<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.ico">
+ <link rel="shortcut icon" href="<%=media%>/favicon.png">
<% if node and node.css then %>
<link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
<% end -%>