zhao/luci-theme-argon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix nopassord warning display

Browse Source 
fix  some color display bugs.
bump version to 2.01
This commit is contained in:
jerrykuku 2020-02-06 16:34:42 +08:00
parent 3fa9162720
commit 854e429aaf
5 changed files with 66 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=Argon Theme
LUCI_DEPENDS:=
PKG_VERSION:=2.0
PKG_VERSION:=2.01
PKG_RELEASE:=20200203
include $(TOPDIR)/feeds/luci/luci.mk

40
htdocs/luci-static/argon/cascade.css
View File

@ -25,7 +25,7 @@
*/
@import url("custom.css?v=1");
/*
* Icon Css and Fonts
* Icon Css and Fonts
*/
@font-face {
font-family: 'argon';
@ -356,9 +356,10 @@ button,
select,
input,
.cbi-dropdown {
line-height: 1.5rem;
height: 2.5rem;
padding: 0.625rem 0.75rem;
margin: 0.25rem 0;
margin: 0.25rem 0.1rem;
color: #8898aa;
border: 1px solid #dee2e6;
border-radius: 0.25rem;
@ -607,11 +608,23 @@ header .fill .status * {
margin-bottom: 1em;
padding: 1rem;
border: 0;
border-radius: 0 !important;
border-radius: 0.375rem !important;
background-color: #fff;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.16), 0 0 2px 0 rgba(0, 0, 0, 0.12);
text-shadow: 1px 1px rgba(0, 0, 0, 0.1);
}
.alert.error,
.alert-message.error {
background-color: #ffd600;
}
.alert h4,
.alert-message h4 {
padding: 0rem 1.5rem 0.75rem 0rem;
}
.alert .btn,
.alert-message .btn {
height: auto;
}
.alert-message > h4 {
font-size: 110%;
font-weight: bold;
@ -1532,10 +1545,13 @@ body:not(.Interfaces) .cbi-rowstyle-2:first-child {
.cbi-dropdown > ul.preview {
display: none;
}
.cbi-dropdown > ul.preview li {
.cbi-button-apply > ul.preview {
display: none;
}
.cbi-button-apply > ul.preview li {
color: #fff;
}
.cbi-dropdown > ul:first-child li {
.cbi-button-apply > ul:first-child li {
color: #fff;
}
.cbi-dropdown > .open {
@ -2264,18 +2280,24 @@ input[name="nslookup"] {
.node-main-login .main .main-right #maincontent .container .alert-message.error {
position: absolute;
color: #fff;
width: calc(100% - 4rem);
width: calc(100% - 2rem);
background-color: #f0ad4e;
border-color: #eea236;
box-sizing: border-box;
margin-top: 8rem;
border-radius: 5px;
padding: 1rem 2rem;
margin-top: -7rem;
border-radius: 5px !important;
padding: 1rem 2rem 0.5rem 2rem;
text-align: center;
}
.node-main-login .main .main-right #maincontent .container .alert-message.error p {
color: #fff;
}
.node-main-login .main .main-right #maincontent .container .alert-message.error h4 {
font-size: 1rem;
}
.node-main-login .main .main-right #maincontent .container .alert-message.error .btn {
height: auto;
}
.node-main-login .main .main-right #maincontent .container .cbi-map h2 {
width: 120px;
height: 120px;

2
htdocs/luci-static/argon/cascade.css.map
View File

File diff suppressed because one or more lines are too long

39
htdocs/luci-static/argon/cascade.less
View File

@ -29,7 +29,7 @@
@import url("custom.css?v=1");
/*
* Icon Css and Fonts
* Icon Css and Fonts
*/
@font-face {
font-family: 'argon';
@ -417,9 +417,10 @@ button,
select,
input,
.cbi-dropdown {
line-height: 1.5rem;
height: 2.5rem;
padding: .625rem .75rem;
margin: 0.25rem 0;
margin: 0.25rem 0.1rem;
color: #8898aa;
border: 1px solid #dee2e6;
@ -714,10 +715,22 @@ header {
margin-bottom: 1em;
padding: 1rem;
border: 0;
border-radius: 0 !important;
border-radius: 0.375rem !important;
background-color: #fff;
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .16), 0 0 2px 0 rgba(0, 0, 0, .12);
text-shadow: 1px 1px rgba(0, 0, 0, .1);
&.error{
background-color: #ffd600;
}
h4{
padding: 0rem 1.5rem 0.75rem 0rem;
}
.btn{
height: auto;
}
}
.alert-message>h4 {
@ -1809,13 +1822,17 @@ body:not(.Interfaces) .cbi-rowstyle-2:first-child {
.cbi-dropdown>ul.preview {
display: none;
}
.cbi-button-apply>ul.preview {
display: none;
li {
color: #fff;
}
}
.cbi-dropdown>ul:first-child {
.cbi-button-apply>ul:first-child {
li {
color: #fff;
}
@ -2679,17 +2696,23 @@ input[name="nslookup"] {
&.error {
position: absolute;
color: #fff;
width: calc(100% - 4rem);
width: calc(100% - 2rem);
background-color: #f0ad4e;
border-color: #eea236;
box-sizing: border-box;
margin-top: 8rem;
border-radius: 5px;
padding: 1rem 2rem;
margin-top: -7rem;
border-radius: 5px !important;
padding: 1rem 2rem 0.5rem 2rem;
text-align: center;
p{
color: #fff;
}
h4{
font-size: 1rem;
}
.btn{
height: auto;
}
}
}

4
luasrc/view/themes/argon/header.htm
View File

@ -246,7 +246,7 @@
<div id="maincontent">
<div class="container">
<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
<div class="alert-message warning">
<div class="alert-message error">
<h4><%:No password set!%></h4>
<p><%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%></p>
<% if disp.lookup("admin/system/admin") then %>
@ -256,7 +256,7 @@
<%- end -%>
<noscript>
<div class="alert-message warning">
<div class="alert-message error">
<h4><%:JavaScript required!%></h4>
<p><%:You must enable JavaScript in your browser or LuCI will not work properly.%></p>
</div>