From 4270916fabfad79deba76fc8bd116337a10bd747 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 7 Apr 2020 03:35:58 +0800 Subject: [PATCH] luci-theme-bootstrap-mod: sync with upstream source --- package/lienol/luci-theme-bootstrap-mod/Makefile | 4 ++-- .../htdocs/luci-static/bootstrap_blue/cascade.css | 2 +- .../htdocs/luci-static/bootstrap_mod/cascade.css | 10 +++++----- .../luasrc/view/themes/bootstrap_blue/footer.htm | 10 +++++++++- .../luasrc/view/themes/bootstrap_blue/header.htm | 12 ++++++------ .../luasrc/view/themes/bootstrap_mod/footer.htm | 10 +++++++++- .../luasrc/view/themes/bootstrap_mod/header.htm | 12 ++++++------ 7 files changed, 38 insertions(+), 22 deletions(-) diff --git a/package/lienol/luci-theme-bootstrap-mod/Makefile b/package/lienol/luci-theme-bootstrap-mod/Makefile index e613bf4f33..5e2aa37ab5 100644 --- a/package/lienol/luci-theme-bootstrap-mod/Makefile +++ b/package/lienol/luci-theme-bootstrap-mod/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Bootstrap Mod Theme By Lienol LUCI_DEPENDS:= -PKG_VERSION:=1.3 -PKG_RELEASE:=20200310 +PKG_VERSION:=1.4 +PKG_RELEASE:=20200314 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/cascade.css b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/cascade.css index 1c9cad9af6..64b900b537 100644 --- a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/cascade.css +++ b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/cascade.css @@ -1478,7 +1478,7 @@ body.modal-overlay-active #modal_overlay>.modal { border: 1px solid #118af3; border-radius: 5px; box-sizing: border-box; - padding: 0.3em !important; + padding: 0 0.4em !important; } .cbi-dynlist>.item { diff --git a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/cascade.css b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/cascade.css index b611633823..b643b9870b 100644 --- a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/cascade.css +++ b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/cascade.css @@ -826,7 +826,7 @@ table.cbi-section-table select, input:active, input:focus { outline: 0; - border-color: #0069d6; + border-color: #ccc; } input[type=file]:focus, @@ -1302,7 +1302,7 @@ body.node-main-login .alert-message { text-indent: -500px; overflow: hidden; border-radius: 60px; - /* border: #0069d6 3px solid; */ + /* border: #ccc 3px solid; */ background-image: url(wifi.png); background-size: cover; /* box-shadow: 0 4px 20px 0px rgba(0, 0, 0, 0.14), 0 7px 10px -5px rgba(156, 39, 176, 0.4); */ @@ -1468,17 +1468,17 @@ body.modal-overlay-active #modal_overlay>.modal { max-width: 400px; width: auto; background: white; - border: 1px solid #0069d6; + border: 1px solid #ccc; border-radius: 5px; box-sizing: border-box; - padding: 0.3em !important; + padding: 0 0.4em !important; } .cbi-dynlist>.item { margin-bottom: 4px; box-shadow: 0 0 2px #ccc; background: #fff; - border: 1px solid #0069d6; + border: 1px solid #ccc; border-radius: 3px; position: relative; pointer-events: none; diff --git a/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_blue/footer.htm b/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_blue/footer.htm index 93012da5e2..f3a0ee54a4 100644 --- a/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_blue/footer.htm +++ b/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_blue/footer.htm @@ -2,7 +2,7 @@ Copyright 2008 Steven Barth Copyright 2008 Jo-Philipp Wich Copyright 2012 David Menting - Copyright 2018-2019 Lienol + Copyright 2018-2020 Lienol Licensed to the public under the Apache License 2.0. -%> @@ -41,6 +41,7 @@ luci_password[0].parentElement.parentElement.children[0].style.display = "none"; var errorbox = document.getElementsByClassName("errorbox"); + var alert_message = document.getElementsByClassName("alert-message"); if (errorbox.length == 1) { var tips = document.getElementsByClassName("cbi-map-descr"); if (tips.length == 1) { @@ -48,6 +49,13 @@ tips[0].classList.add('errorbox'); errorbox[0].style.display = "none"; } + } else if (alert_message.length == 1) { + var tips = document.getElementsByClassName("cbi-map-descr"); + if (tips.length == 1) { + tips[0].innerHTML = alert_message[0].innerHTML; + tips[0].classList.add('errorbox'); + alert_message[0].style.display = "none"; + } } } } diff --git a/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_blue/header.htm b/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_blue/header.htm index b1d095f217..f1ee1953f1 100644 --- a/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_blue/header.htm +++ b/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_blue/header.htm @@ -165,10 +165,10 @@ <%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI - + - - + + <% if node and node.css then %> @@ -177,9 +177,9 @@ <% end -%> - - - + + + "> diff --git a/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/footer.htm b/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/footer.htm index 93012da5e2..f3a0ee54a4 100644 --- a/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/footer.htm +++ b/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/footer.htm @@ -2,7 +2,7 @@ Copyright 2008 Steven Barth Copyright 2008 Jo-Philipp Wich Copyright 2012 David Menting - Copyright 2018-2019 Lienol + Copyright 2018-2020 Lienol Licensed to the public under the Apache License 2.0. -%> @@ -41,6 +41,7 @@ luci_password[0].parentElement.parentElement.children[0].style.display = "none"; var errorbox = document.getElementsByClassName("errorbox"); + var alert_message = document.getElementsByClassName("alert-message"); if (errorbox.length == 1) { var tips = document.getElementsByClassName("cbi-map-descr"); if (tips.length == 1) { @@ -48,6 +49,13 @@ tips[0].classList.add('errorbox'); errorbox[0].style.display = "none"; } + } else if (alert_message.length == 1) { + var tips = document.getElementsByClassName("cbi-map-descr"); + if (tips.length == 1) { + tips[0].innerHTML = alert_message[0].innerHTML; + tips[0].classList.add('errorbox'); + alert_message[0].style.display = "none"; + } } } } diff --git a/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/header.htm b/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/header.htm index b1d095f217..f1ee1953f1 100644 --- a/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/header.htm +++ b/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/header.htm @@ -165,10 +165,10 @@ <%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI - + - - + + <% if node and node.css then %> @@ -177,9 +177,9 @@ <% end -%> - - - + + + ">