luci-theme-bootstrap-mod: sync with upstream source

This commit is contained in:
CN_SZTL 2020-04-07 03:35:58 +08:00
parent fe56a42e8c
commit 4270916fab
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
7 changed files with 38 additions and 22 deletions

View File

@ -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

View File

@ -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 {

View File

@ -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;

View File

@ -2,7 +2,7 @@
Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2012 David Menting <david@nut-bolt.nl>
Copyright 2018-2019 Lienol <lawlienol@gmail.com>
Copyright 2018-2020 Lienol <lawlienol@gmail.com>
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";
}
}
}
}

View File

@ -165,10 +165,10 @@
<head>
<meta charset="utf-8">
<title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
<!--[if lt IE 9]><script src="<%=media%>/html5.js?v=git-18.138.53009-80cb4fe"></script><![endif]-->
<!--[if lt IE 9]><script src="<%=media%>/html5.js"></script><![endif]-->
<meta name="viewport" content="initial-scale=1.0">
<link rel="stylesheet" href="<%=media%>/cascade.css?v=git-18.138.53009-80cb4fe">
<link rel="stylesheet" media="only screen and (max-width: 1600px)" href="<%=media%>/mobile.css?v=git-18.138.53009-80cb4fe" type="text/css" />
<link rel="stylesheet" href="<%=media%>/cascade.css">
<link rel="stylesheet" media="only screen and (max-width: 1600px)" href="<%=media%>/mobile.css" type="text/css" />
<link rel="shortcut icon" href="<%=media%>/favicon.ico">
<% if node and node.css then %>
<link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
@ -177,9 +177,9 @@
<style title="text/css"><%= css %></style>
<% end -%>
<script src="<%=url('admin/translations', luci.i18n.context.lang)%>?v=git-19.338.61646-9ca48ec"></script>
<script src="<%=resource%>/cbi.js?v=git-19.338.61646-9ca48ec"></script>
<script src="<%=resource%>/xhr.js?v=git-19.338.61646-9ca48ec"></script>
<!-- <script src="<%=url('admin/translations', luci.i18n.context.lang)%>"></script> -->
<script src="<%=resource%>/cbi.js"></script>
<script src="<%=resource%>/xhr.js"></script>
</head>
<body class="lang_<%=luci.i18n.context.lang%> <% if node then %><%= striptags( node.title ) %><%- end %>" data-page="<%= table.concat(disp.context.requestpath, "-") %>">

View File

@ -2,7 +2,7 @@
Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008 Jo-Philipp Wich <jow@openwrt.org>
Copyright 2012 David Menting <david@nut-bolt.nl>
Copyright 2018-2019 Lienol <lawlienol@gmail.com>
Copyright 2018-2020 Lienol <lawlienol@gmail.com>
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";
}
}
}
}

View File

@ -165,10 +165,10 @@
<head>
<meta charset="utf-8">
<title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
<!--[if lt IE 9]><script src="<%=media%>/html5.js?v=git-18.138.53009-80cb4fe"></script><![endif]-->
<!--[if lt IE 9]><script src="<%=media%>/html5.js"></script><![endif]-->
<meta name="viewport" content="initial-scale=1.0">
<link rel="stylesheet" href="<%=media%>/cascade.css?v=git-18.138.53009-80cb4fe">
<link rel="stylesheet" media="only screen and (max-width: 1600px)" href="<%=media%>/mobile.css?v=git-18.138.53009-80cb4fe" type="text/css" />
<link rel="stylesheet" href="<%=media%>/cascade.css">
<link rel="stylesheet" media="only screen and (max-width: 1600px)" href="<%=media%>/mobile.css" type="text/css" />
<link rel="shortcut icon" href="<%=media%>/favicon.ico">
<% if node and node.css then %>
<link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
@ -177,9 +177,9 @@
<style title="text/css"><%= css %></style>
<% end -%>
<script src="<%=url('admin/translations', luci.i18n.context.lang)%>?v=git-19.338.61646-9ca48ec"></script>
<script src="<%=resource%>/cbi.js?v=git-19.338.61646-9ca48ec"></script>
<script src="<%=resource%>/xhr.js?v=git-19.338.61646-9ca48ec"></script>
<!-- <script src="<%=url('admin/translations', luci.i18n.context.lang)%>"></script> -->
<script src="<%=resource%>/cbi.js"></script>
<script src="<%=resource%>/xhr.js"></script>
</head>
<body class="lang_<%=luci.i18n.context.lang%> <% if node then %><%= striptags( node.title ) %><%- end %>" data-page="<%= table.concat(disp.context.requestpath, "-") %>">