diff --git a/package/ctcgfw/luci-theme-argonv3/Makefile b/package/ctcgfw/luci-theme-argonv3/Makefile index f74c92dd5b..d483ef3192 100644 --- a/package/ctcgfw/luci-theme-argonv3/Makefile +++ b/package/ctcgfw/luci-theme-argonv3/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Argon Theme LUCI_DEPENDS:= -PKG_VERSION:=1.6.1 -PKG_RELEASE:=20200724 +PKG_VERSION:=1.6.2 +PKG_RELEASE:=20200725 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css index 9c113433d9..5965ff2f60 100644 --- a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css +++ b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css @@ -550,7 +550,7 @@ footer a { } .main .main-left .nav li.slide .menu[data-title=VPN]:before { content: "\e90b"; - color: #172b4d; + color: #5603ad; } .main .main-left .nav li.slide .menu[data-title=Network]:before { content: "\e908"; @@ -566,7 +566,7 @@ footer a { } .main .main-left .nav li.slide .menu[data-title=Statistics]:before { content: "\e913"; - color: #172b4d; + color: #5603ad; } .main .main-left .nav li.slide .menu[data-title=Control]:before { content: "\e912"; @@ -578,7 +578,7 @@ footer a { } .main .main-left .nav li.slide .menu[data-title=Logout]:before { content: "\e907"; - color: #32325d; + color: #adb5bd; } .main .main-left .nav li.slide .slide-menu li a { position: relative; @@ -2840,9 +2840,15 @@ input[name="nslookup"] { color: #adb5bd; border-bottom: #adb5bd 1px solid !important; border-radius: 0; - border-top: none; - border-left: none; - border-right: none; + border-top: none !important; + border-left: none !important; + border-right: none !important; + box-shadow: none; + } + .login-page .login-container .login-form .form-login .input-group input:focus { + border-top: none !important; + border-left: none !important; + border-right: none !important; } .login-page .login-container .login-form .form-login .cbi-button-apply { background-image: linear-gradient(-135deg, #6c61ab 0%, #594ca9 100%); @@ -3050,6 +3056,9 @@ input[name="nslookup"] { .cbi-tabmenu > li { background: #2d2d2d; } + .cbi-tabmenu { + border-bottom: 0px solid #ddd !important; + } .cbi-tabmenu li[class~="cbi-tab"] a { color: #ccc; } @@ -3069,14 +3078,16 @@ input[name="nslookup"] { select, input { color: #ccc; - background-color: #3c3c3c !important; - border: 1px solid #252526; + background-color: transparent; + border: 1px solid #3c3c3c !important; box-shadow: 0 3px 2px rgba(0, 0, 0, 0.05); } select:not([multiple="multiple"]):focus, input:focus { - border-color: darkslateblue; + border-color: darkslateblue !important; + background-color: transparent; outline: 0; + box-shadow: none; } #cbi-dropbear h2, #cbi-dropbear .cbi-map-descr, diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less index f8cbeba6ac..b894199d23 100644 --- a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less +++ b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less @@ -255,7 +255,7 @@ li { transition: all .3s cubic-bezier(.68, -.55, .265, 1.55); color: #8898aa; border: 0; - border-radius: 0; + border-radius: 0; border-bottom: 1px solid #dee2e6; background-color: transparent; background-clip: padding-box; @@ -654,7 +654,7 @@ footer { .menu[data-title=VPN]:before { content: "\e90b"; - color: #172b4d; + color: #5603ad; } .menu[data-title=Network]:before { @@ -674,7 +674,7 @@ footer { .menu[data-title=Statistics]:before { content: "\e913"; - color: #172b4d; + color: #5603ad; } .menu[data-title=Control]:before { @@ -689,7 +689,7 @@ footer { .menu[data-title=Logout]:before { content: "\e907"; - color: #32325d; + color: #adb5bd; } .slide-menu { @@ -2977,7 +2977,8 @@ input[name="nslookup"] { white-space: normal; } -.node-status-overview>.main #wan4_i , .node-status-overview>.main #wan6_i { +.node-status-overview>.main #wan4_i, +.node-status-overview>.main #wan6_i { width: 80px !important; } @@ -3179,7 +3180,7 @@ input[name="nslookup"] { margin-left: 1.5rem; } -.node-nas-usb_printer em{ +.node-nas-usb_printer em { display: block; } @@ -3603,11 +3604,19 @@ input[name="nslookup"] { color: #adb5bd; border-bottom: #adb5bd 1px solid !important; border-radius: 0; - border-top: none; - border-left: none; - border-right: none; + border-top: none !important; + border-left: none !important; + border-right: none !important; + box-shadow: none; + + &:focus { + border-top: none !important; + border-left: none !important; + border-right: none !important; + } } + } .cbi-button-apply { @@ -3901,6 +3910,10 @@ input[name="nslookup"] { background: #2d2d2d; } + .cbi-tabmenu { + border-bottom: 0px solid #ddd !important; + } + .cbi-tabmenu li[class~="cbi-tab"] a { color: #ccc; } @@ -3925,16 +3938,17 @@ input[name="nslookup"] { select, input { color: #ccc; - background-color: #3c3c3c !important; - border: 1px solid #252526; + background-color: transparent; + border: 1px solid #3c3c3c !important; box-shadow: 0 3px 2px rgba(0, 0, 0, .05); } select:not([multiple="multiple"]):focus, input:focus { - border-color: darkslateblue; + border-color: darkslateblue !important; + background-color: transparent; outline: 0; - + box-shadow: none; } #cbi-dropbear h2,