diff options
author | Florian Eckert <fe@dev.tdt.de> | 2019-09-13 14:20:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-13 14:20:44 +0200 |
commit | 4eeded7051435eaabd22f0e9c2b9a13d700db2bd (patch) | |
tree | 4bf5563a3a6d379183745e438b525a0375977cb8 /themes | |
parent | 88c16e17d92d68524e9583924f832c79113175f5 (diff) | |
parent | 92069c1f74587a8d3740b0a9eeda167dcb2f1375 (diff) |
Merge pull request #3024 from TDT-AG/pr/20190829-material-logo
luci-theme-material: show logo also on login page
Diffstat (limited to 'themes')
-rw-r--r-- | themes/luci-theme-material/htdocs/luci-static/material/cascade.css | 4 | ||||
-rw-r--r-- | themes/luci-theme-material/luasrc/view/themes/material/header.htm | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css index d74077853..91f87c69c 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -401,10 +401,6 @@ header > .fill > .container > #logo > img { margin-top: -.1rem; } -body:not(.logged-in) > header > .fill > .container > #logo { - display: none; -} - header > .fill > .container > .brand { font-size: 1.4rem; position: absolute; diff --git a/themes/luci-theme-material/luasrc/view/themes/material/header.htm b/themes/luci-theme-material/luasrc/view/themes/material/header.htm index 7ce195cc9..76eeec05e 100644 --- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm +++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm @@ -186,7 +186,7 @@ <div class="fill"> <div class="container"> <span class="showSide"></span> - <a id="logo" href="<%=url("admin/status/overview")%>"><img src="<%=media%>/brand.png" alt="OpenWrt"></a> + <a id="logo" href="<% if luci.dispatcher.context.authsession then %><%=url('admin/status/overview')%><% else %>#<% end %>"><img src="<%=media%>/brand.png" alt="OpenWrt"></a> <a class="brand" href="#"><%=boardinfo.hostname or "?"%></a> <div class="status"> <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()"> |