From b90b1a0f43b5f916e89cc708356343cb366f8b4f Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 27 Jul 2020 22:23:25 +0800 Subject: [PATCH] luci-theme-argonv3: sync with upstream source --- package/ctcgfw/luci-theme-argonv3/Makefile | 6 +- .../htdocs/luci-static/argon/css/cascade.css | 4 + .../htdocs/luci-static/argon/css/dark.css | 438 +++++++++++++ .../luci-static/argon/less/cascade.less | 10 +- .../htdocs/luci-static/argon/less/dark.less | 585 ++++++++++++++++++ .../luasrc/view/themes/argon/footer.htm | 16 +- .../luasrc/view/themes/argon/header.htm | 12 +- .../luasrc/view/themes/argon/header_login.htm | 15 +- .../out_header_login.htm} | 0 .../luasrc/view/themes/argon/sysauth.htm | 51 +- .../root/etc/uci-defaults/30_luci-theme-argon | 2 +- 11 files changed, 1107 insertions(+), 32 deletions(-) create mode 100644 package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/dark.css create mode 100644 package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/dark.less rename package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/{header_login.htm => argon/out_header_login.htm} (100%) diff --git a/package/ctcgfw/luci-theme-argonv3/Makefile b/package/ctcgfw/luci-theme-argonv3/Makefile index b0c0939af7..386a43a0de 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.3 -PKG_RELEASE:=20200725 +PKG_VERSION:=1.6.4 +PKG_RELEASE:=20200727 include $(TOPDIR)/feeds/luci/luci.mk @@ -18,7 +18,7 @@ define Package/luci-theme-argon/postinst #!/bin/sh sed -i ":a;$!N;s/tmpl.render.*sysauth_template.*return/local scope = { duser = default_user, fuser = user }\nlocal ok, res = luci.util.copcall\(luci.template.render_string, [[<% include\(\"themes\/\" .. theme .. \"\/sysauth\"\) %>]], scope\)\nif ok then\nreturn res\nend\nreturn luci.template.render\(\"sysauth\", scope\)/;ba" /usr/lib/lua/luci/dispatcher.lua sed -i ":a;$!N;s/t.render.*sysauth_template.*return/local scope = { duser = h, fuser = a }\nlocal ok, res = luci.util.copcall\(luci.template.render_string, [[<% include\(\"themes\/\" .. theme .. \"\/sysauth\"\) %>]], scope\)\nif ok then\nreturn res\nend\nreturn luci.template.render\(\"sysauth\", scope\)/;ba" /usr/lib/lua/luci/dispatcher.lua -[ -f /usr/lib/lua/luci/view/themes/header_login.htm ] && mv -f /usr/lib/lua/luci/view/themes/header_login.htm /usr/lib/lua/luci/view/header_login.htm +[ -f /usr/lib/lua/luci/view/themes/argon/out_header_login.htm ] && mv -f /usr/lib/lua/luci/view/themes/argon/out_header_login.htm /usr/lib/lua/luci/view/header_login.htm rm -Rf /var/luci-modulecache rm -Rf /var/luci-indexcache exit 0 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 7a1a43a127..a4ecaeb2f7 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 @@ -283,6 +283,7 @@ li { margin-top: auto; padding: 0px 0px 30px; z-index: 10; + color: #525461; } .login-page .login-container footer .luci-link { display: block; @@ -2862,6 +2863,9 @@ input[name="nslookup"] { .login-page .login-container .login-form .form-login .cbi-button-apply:focus { background-image: linear-gradient(-135deg, #554c8a 0%, #483d8b 100%); } + .login-page .login-container footer { + color: #adb5bd; + } header::after { background-color: #1e1e1e !important; } diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/dark.css b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/dark.css new file mode 100644 index 0000000000..db1955cf7b --- /dev/null +++ b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/dark.css @@ -0,0 +1,438 @@ +/** + * Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template + * + * luci-theme-argon + * Copyright 2020 Jerryk + * + * Have a bug? Please create an issue here on GitHub! + * https://github.com/jerrykuku/luci-theme-argon/issues + * + * luci-theme-bootstrap: + * Copyright 2008 Steven Barth + * Copyright 2008 Jo-Philipp Wich + * Copyright 2012 David Menting + * + * MUI: + * https://github.com/muicss/mui + * + * luci-theme-material: + * https://github.com/LuttyYang/luci-theme-material/ + * + * Agron Theme + * https://demos.creative-tim.com/argon-dashboard/index.html + * + * Login background + * https://unsplash.com/ + * + * Licensed to the public under the Apache License 2.0 + */ +body { + background: #1e1e1e; + color: #cccccc; +} +.login-page .login-container .login-form { + background-color: #1e1e1e; +} +.login-page .login-container .login-form .brand { + color: #adb5bd; +} +.login-page .login-container .login-form .form-login .input-group::before { + color: #adb5bd; +} +.login-page .login-container .login-form .form-login .input-group input { + background-color: transparent !important; + color: #adb5bd; + border-bottom: #adb5bd 1px solid !important; + border-radius: 0; + 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%); +} +.login-page .login-container .login-form .form-login .cbi-button-apply:hover, +.login-page .login-container .login-form .form-login .cbi-button-apply:focus { + background-image: linear-gradient(-135deg, #554c8a 0%, #483d8b 100%); +} +.login-page .login-container footer { + color: #adb5bd; +} +header::after { + background-color: #1e1e1e !important; +} +.main .main-left { + background-color: #333333 !important; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, 0.15); +} +.main .main-left .sidenav-header .brand { + color: #ccc; +} +.main .main-left .nav .slide .slide-menu .active a { + color: #cccccc; +} +.main .main-left .nav .slide .slide-menu .active a::after { + background-color: #cccccc !important; +} +.main .main-left .nav .slide .slide-menu li a { + color: #cccccc; +} +.main .main-left .nav .slide .slide-menu li a:hover { + background: none !important; +} +.main .main-left .nav .slide .menu.active { + background-color: darkslateblue !important; + color: #cccccc !important; +} +.main .main-left .nav .slide .menu.active a::after { + background-color: #cccccc !important; +} +.main .main-left .nav li a { + color: #cccccc !important; +} +.main .main-left .nav li a:hover { + background-color: darkslateblue !important; + color: #cccccc !important; +} +.main .main-left::-webkit-scrollbar-thumb { + background-color: #252526 !important; +} +.main .main-left::-webkit-scrollbar-track { + background-color: #333; +} +.main .main-right { + background-color: #1e1e1e; +} +h2 { + color: #ccc; + background: #333333; +} +h3 { + color: #ccc; + border-bottom: 0; + background: #333333; +} +a:-webkit-any-link { + color: -webkit-link; + cursor: pointer; + color: darkslateblue; +} +input:-webkit-autofill { + background-color: #3c3c3c !important; +} +.cbi-value-field .cbi-input-apply, +.cbi-button-apply, +.cbi-button-edit { + color: #fff !important; + background-color: darkslateblue !important; + border-color: darkslateblue !important; +} +.cbi-section em { + color: darkslateblue; +} +header.bg-primary { + background-color: #1e1e1e !important; +} +.cbi-map-descr { + color: #ccc; +} +.cbi-section { + background: none; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, 0.35); +} +.panel-title { + color: #ccc; + background-color: #333333; + border-bottom: 0px; +} +table > tbody > tr > td, +table > tfoot > tr > td, +table > thead > tr > td { + color: #ccc; +} +fieldset > table > tbody > tr:nth-of-type(2n) { + background-color: #252526; +} +table > tbody > tr > td, +table > tfoot > tr > td, +table > thead > tr > td { + border-top: 1px solid #252526; +} +#swaptotal > div > div, +#swapfree > div > div, +#memfree > div > div, +#membuff > div > div, +#conns > div > div, +#memtotal > div > div { + background-color: #32325d !important; +} +#swaptotal > div > div > div > small, +#swapfree > div > div > div > small, +#memfree > div > div > div > small, +#membuff > div > div > div > small, +#conns > div > div > div > small, +#memtotal > div > div > div > small { + color: #ccc !important; +} +.node-system-packages > .main .cbi-section-node:first-child .cbi-value-last { + line-height: 1.8em; +} +.node-system-packages > .main .cbi-section-node:first-child .cbi-value-last div[style="margin:3px 0; width:300px; height:10px; border:1px solid #000000; background-color:#80C080"] { + border: 1px solid #999999 !important; + background-color: transparent !important; +} +.node-system-packages > .main .cbi-section-node:first-child .cbi-value-last div[style="margin:3px 0; width:300px; height:10px; border:1px solid #000000; background-color:#80C080"] div { + background-color: #32325d !important; +} +table > tbody > tr > th, +table > tfoot > tr > th, +table > thead > tr > th { + background-color: #252526; + border-bottom: black 1px solid !important; +} +.cbi-rowstyle-2 { + background-color: #1e1e1e; +} +.cbi-rowstyle-1 { + background-color: #252526; +} +.cbi-section > h3:first-child, +.panel-title { + color: #ccc; + border-bottom: 0; +} +.cbi-section-table .cbi-section-table-titles .cbi-section-table-cell { + background-color: #1e1e1f; +} +.cbi-button { + color: #ccc; + background-color: #252526; +} +.cbi-section-node { + background: none; + border-radius: 0 0 0.375rem 0.375rem; + padding: 0rem; +} +abbr { + color: #5e72e4; +} +div > table > tbody > tr:nth-of-type(2n), +div > .table > .tbody > .tr:nth-of-type(2n) { + background-color: #252526; +} +#content_syslog { + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, 0.35); +} +#syslog { + color: #ccc; + background-color: #1e1e1e; +} +#iwsvg, +#iwsvg2, +#bwsvg { + overflow: hidden; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, 0.35); + background-color: #1e1e1e !important; +} +.tabs { + background-color: #252526; +} +.tabs > li[class~="active"] > a { + color: #ccc; +} +.tabs > li[class~="active"], +.tabs > li:hover { + border-bottom: 0.18751rem solid darkslateblue; + color: #ccc; + background-color: #181819; +} +.cbi-tabmenu > li > a, +.tabs > li > a { + color: #ccc; +} +.cbi-tabmenu > li > a:hover, +.tabs > li > a:hover { + color: #ccc; +} +.cbi-tabmenu > li { + background: #2d2d2d; +} +.cbi-tabmenu { + border-bottom: 0px solid #ddd !important; +} +.cbi-tabmenu li[class~="cbi-tab"] a { + color: #ccc; +} +.cbi-tabmenu > li:hover { + color: #ccc; + background: #2d2d2d; +} +.cbi-tabmenu > li[class~="cbi-tab"] { + background-color: #181819; +} +.cbi-tabcontainer > .cbi-value:nth-of-type(2n) { + background-color: #252526; +} +.cbi-value-title { + color: #ccc; +} +select, +input { + color: #ccc; + 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 !important; + background-color: transparent; + outline: 0; + box-shadow: none; +} +#cbi-dropbear h2, +#cbi-dropbear .cbi-map-descr, +#cbi-dropbear .cbi-map-descr abbr, +#cbi-rc h2, +#cbi-rc .cbi-map-descr, +#cbi-distfeedconf h2, +#cbi-distfeedconf .cbi-map-descr, +#cbi-customfeedconf h2, +#cbi-customfeedconf .cbi-map-descr, +#cbi-download h2, +#cbi-filelist h2 { + color: #ccc !important; +} +.cbi-value-field > ul > li .ifacebadge { + background-color: #3c3c3c; +} +.cbi-section-descr { + color: #ccc; +} +.cbi-input-textarea { + background-color: #1e1e1e; + color: #ccc; +} +.cbi-section-remove:nth-of-type(2n), +.cbi-section-node:nth-of-type(2n) { + background-color: #1e1e1e; +} +.node-system-packages > .main table tr td:nth-last-child(1) { + color: #ccc; +} +.cbi-section-node .cbi-value { + padding: 1rem 1rem 0.3rem 1rem; +} +.ifacebox { + background-color: none; + border: 1px solid #1e1e1e; +} +.ifacebox-head { + color: #666; +} +.ifacebox-body { + background-color: #333; +} +.zonebadge strong { + color: #333; +} +.zonebadge > .ifacebadge { + background-color: #3c3c3c; +} +div.cbi-value var, +td.cbi-value-field var { + color: #5e72e4; +} +#diag-rc-output > pre { + color: #ccc; + background-color: #1e1e1e; +} +.node-services-vssr .block { + background-color: #3c3c3c !important; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, 0.35); +} +.node-services-vssr .block h4 { + color: #ccc !important; +} +.node-services-vssr .status-bar { + color: #ccc; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, 0.35); + background-color: #1e1e1e; +} +.node-services-vssr .cbi-section-table-row { + color: #ccc; + background-color: #3c3c3c !important; + box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.35); +} +.node-services-vssr .cbi-section-table-row.fast { + background: darkslateblue !important; + color: #fff; +} +.node-services-vssr .ssr-button { + color: #ccc; +} +.node-services-vssr .incon:nth-child(2) { + border-right: #1e1e1e 1px solid; +} +#xhr_poll_status > .label.success { + color: #ccc !important; + background-color: darkolivegreen !important; +} +.notice { + background-color: darkslateblue !important; +} +.cbi-input-find, +.cbi-input-save, +.cbi-button-add, +.cbi-button-save, +.cbi-button-find, +.cbi-input-reload, +.cbi-button-reload { + background-color: darkseagreen !important; + border-color: darkseagreen !important; +} +.cbi-button-reset, +.cbi-input-remove { + color: #fff !important; + background-color: darkorange !important; + border-color: darkorange !important; +} +.cbi-page-actions .cbi-button-apply, +.cbi-section-actions .cbi-button-edit, +.cbi-button-edit.important, +.cbi-button-apply.important, +.cbi-button-reload.important, +.cbi-button-action.important { + border: 1px darkslateblue solid !important; +} +fieldset[id^="cbi-apply-"] { + background-color: #333333; +} +#detail-bubble > div { + border: 1px solid #ccc; + border-radius: 2px; + padding: 5px; + background: #252525; +} +.cbi-section-error { + color: darkorange; +} +@supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) { + .login-page .login-container .login-form { + -webkit-backdrop-filter: blur(10px); + backdrop-filter: blur(10px); + background-color: rgba(0, 0, 0, 0.7); + } +} +@media screen and (max-width: 480px) { + .node-status-iptables > .main div > .cbi-map > form { + background-color: #1e1e1e; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, 0.35); + } +} 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 60429feeef..08658bb50d 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 @@ -324,6 +324,7 @@ li { margin-top: auto; padding: 0px 0px 30px; z-index: 10; + color: #525461; .luci-link { display: block; @@ -1305,6 +1306,7 @@ small { .cbi-section>legend { display: none !important; } + .cbi-section-error { padding: 1.5rem; color: #fb6340; @@ -3393,7 +3395,7 @@ input[name="nslookup"] { } - + fieldset { padding: 0; @@ -3635,8 +3637,12 @@ input[name="nslookup"] { } } } + } + footer { + color: #adb5bd; + } } header::after { @@ -4138,5 +4144,5 @@ input[name="nslookup"] { box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35); } - + } \ No newline at end of file diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/dark.less b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/dark.less new file mode 100644 index 0000000000..cee0b7b66a --- /dev/null +++ b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/dark.less @@ -0,0 +1,585 @@ +/** + * Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template + * + * luci-theme-argon + * Copyright 2020 Jerryk + * + * Have a bug? Please create an issue here on GitHub! + * https://github.com/jerrykuku/luci-theme-argon/issues + * + * luci-theme-bootstrap: + * Copyright 2008 Steven Barth + * Copyright 2008 Jo-Philipp Wich + * Copyright 2012 David Menting + * + * MUI: + * https://github.com/muicss/mui + * + * luci-theme-material: + * https://github.com/LuttyYang/luci-theme-material/ + * + * Agron Theme + * https://demos.creative-tim.com/argon-dashboard/index.html + * + * Login background + * https://unsplash.com/ + * + * Licensed to the public under the Apache License 2.0 + */ + +body { + background: #1e1e1e; + color: #cccccc; +} + +.login-page .login-container { + + .login-form { + background-color: #1e1e1e; + + .brand { + color: #adb5bd; + } + + .form-login { + .input-group { + &::before { + color: #adb5bd; + } + + input { + background-color: transparent !important; + color: #adb5bd; + border-bottom: #adb5bd 1px solid !important; + border-radius: 0; + 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 { + background-image: linear-gradient(-135deg, #6c61ab 0%, #594ca9 100%); + + &:hover, + &:focus { + background-image: linear-gradient(-135deg, rgb(85, 76, 138) 0%, rgb(72, 61, 139) 100%); + } + } + } + + + } + + footer { + color: #adb5bd; + } + +} + +header::after { + background-color: #1e1e1e !important; +} + + +.main { + .main-left { + + background-color: #333333 !important; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .15); + + .sidenav-header .brand { + color: #ccc; + } + + .nav { + .slide { + .slide-menu { + .active { + a { + color: #cccccc; + + &::after { + background-color: #cccccc !important; + } + } + } + + li { + a { + color: #cccccc; + } + + a:hover { + background: none !important; + } + } + } + + .menu.active { + background-color: darkslateblue !important; + color: #cccccc !important; + + a::after { + background-color: #cccccc !important; + } + } + } + + li { + a { + color: #cccccc !important; + } + + a:hover { + background-color: darkslateblue !important; + color: #cccccc !important; + + + } + } + } + + + &::-webkit-scrollbar-thumb { + background-color: #252526 !important; + } + + &::-webkit-scrollbar-track { + background-color: #333; + } + } + + .main-right { + background-color: #1e1e1e; + } +} + +h2 { + color: #ccc; + background: #333333; +} + +h3 { + color: #ccc; + border-bottom: 0; + background: #333333; +} + +a:-webkit-any-link { + color: -webkit-link; + cursor: pointer; + color: darkslateblue; +} + + +input:-webkit-autofill { + background-color: #3c3c3c !important; +} + +.cbi-value-field .cbi-input-apply, +.cbi-button-apply, +.cbi-button-edit { + color: #fff !important; + background-color: darkslateblue !important; + border-color: darkslateblue !important; +} + + +.cbi-section em { + color: darkslateblue; +} + + + +header.bg-primary { + background-color: #1e1e1e !important; +} + + + +.cbi-map-descr { + color: #ccc; +} + +.cbi-section { + background: none; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35) +} + +.panel-title { + color: #ccc; + background-color: #333333; + border-bottom: 0px; +} + +table>tbody>tr>td, +table>tfoot>tr>td, +table>thead>tr>td { + color: #ccc; +} + +fieldset>table>tbody>tr:nth-of-type(2n) { + background-color: #252526; +} + +table>tbody>tr>td, +table>tfoot>tr>td, +table>thead>tr>td { + border-top: 1px solid #252526; +} + +#swaptotal>div>div, +#swapfree>div>div, +#memfree>div>div, +#membuff>div>div, +#conns>div>div, +#memtotal>div>div { + background-color: #32325d !important; +} + +#swaptotal>div>div>div>small, +#swapfree>div>div>div>small, +#memfree>div>div>div>small, +#membuff>div>div>div>small, +#conns>div>div>div>small, +#memtotal>div>div>div>small { + + color: #ccc !important; +} + +.node-system-packages>.main .cbi-section-node:first-child .cbi-value-last { + line-height: 1.8em; + + div[style="margin:3px 0; width:300px; height:10px; border:1px solid #000000; background-color:#80C080"] { + border: 1px solid #999999 !important; + background-color: transparent !important; + + div { + background-color: #32325d !important; + } + } + +} + + +table>tbody>tr>th, +table>tfoot>tr>th, +table>thead>tr>th { + + background-color: #252526; + border-bottom: black 1px solid !important; +} + +.cbi-rowstyle-2 { + background-color: #1e1e1e; +} + +.cbi-rowstyle-1 { + background-color: #252526; +} + +.cbi-section>h3:first-child, +.panel-title { + color: #ccc; + border-bottom: 0; +} + +.cbi-section-table .cbi-section-table-titles .cbi-section-table-cell { + background-color: #1e1e1f; +} + +.cbi-button { + color: #ccc; + background-color: #252526; +} + +.cbi-section-node { + background: none; + border-radius: 0 0 .375rem .375rem; + padding: 0rem; +} + +abbr { + color: #5e72e4; + +} + +div>table>tbody>tr:nth-of-type(2n), +div>.table>.tbody>.tr:nth-of-type(2n) { + background-color: #252526; +} + +#content_syslog { + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35) +} + +#syslog { + color: #ccc; + background-color: #1e1e1e; +} + +#iwsvg, +#iwsvg2, +#bwsvg { + overflow: hidden; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35); + background-color: #1e1e1e !important; +} + +.tabs { + background-color: #252526; +} + +.tabs>li[class~="active"]>a { + color: #ccc; +} + +.tabs>li[class~="active"], +.tabs>li:hover { + border-bottom: 0.18751rem solid darkslateblue; + color: #ccc; + background-color: #181819; +} + +.cbi-tabmenu>li>a, +.tabs>li>a { + color: #ccc; + + &:hover { + color: #ccc; + } +} + +.cbi-tabmenu>li { + background: #2d2d2d; +} + +.cbi-tabmenu { + border-bottom: 0px solid #ddd !important; +} + +.cbi-tabmenu li[class~="cbi-tab"] a { + color: #ccc; +} + +.cbi-tabmenu>li:hover { + color: #ccc; + background: #2d2d2d; +} + +.cbi-tabmenu>li[class~="cbi-tab"] { + background-color: #181819; +} + +.cbi-tabcontainer>.cbi-value:nth-of-type(2n) { + background-color: #252526; +} + +.cbi-value-title { + color: #ccc; +} + +select, +input { + color: #ccc; + 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 !important; + background-color: transparent; + outline: 0; + box-shadow: none; +} + +#cbi-dropbear h2, +#cbi-dropbear .cbi-map-descr, +#cbi-dropbear .cbi-map-descr abbr, +#cbi-rc h2, +#cbi-rc .cbi-map-descr, +#cbi-distfeedconf h2, +#cbi-distfeedconf .cbi-map-descr, +#cbi-customfeedconf h2, +#cbi-customfeedconf .cbi-map-descr, +#cbi-download h2, +#cbi-filelist h2 { + color: #ccc !important; +} + +.cbi-value-field>ul>li .ifacebadge { + background-color: #3c3c3c; +} + +.cbi-section-descr { + color: #ccc; +} + +.cbi-input-textarea { + background-color: #1e1e1e; + color: #ccc; +} + + + +.cbi-section-remove:nth-of-type(2n), +.cbi-section-node:nth-of-type(2n) { + background-color: #1e1e1e; +} + +.node-system-packages>.main table tr td:nth-last-child(1) { + color: #ccc; + +} + +.cbi-section-node .cbi-value { + padding: 1rem 1rem 0.3rem 1rem; +} + +.ifacebox { + background-color: none; + border: 1px solid #1e1e1e; +} + +.ifacebox-head { + color: #666; +} + +.ifacebox-body { + background-color: #333; +} + +.zonebadge strong { + color: #333; +} + +.zonebadge>.ifacebadge { + background-color: #3c3c3c; +} + +div.cbi-value var, +td.cbi-value-field var { + color: #5e72e4; +} + +#diag-rc-output>pre { + color: #ccc; + background-color: #1e1e1e; +} + +.node-services-vssr .block { + background-color: #3c3c3c !important; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35); +} + +.node-services-vssr .block h4 { + color: #ccc !important; +} + +.node-services-vssr .status-bar { + color: #ccc; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35); + background-color: #1e1e1e; +} + +.node-services-vssr .cbi-section-table-row { + color: #ccc; + background-color: #3c3c3c !important; + box-shadow: 0 0 5px 0 rgba(0, 0, 0, .35) +} + +.node-services-vssr .cbi-section-table-row.fast { + background: darkslateblue !important; + color: #fff; +} + +.node-services-vssr .ssr-button { + color: #ccc; + +} + +.node-services-vssr .incon:nth-child(2) { + border-right: #1e1e1e 1px solid; +} + +#xhr_poll_status>.label.success { + color: #ccc !important; + + background-color: darkolivegreen !important; +} + +.notice { + background-color: darkslateblue !important; +} + +.cbi-input-find, +.cbi-input-save, +.cbi-button-add, +.cbi-button-save, +.cbi-button-find, +.cbi-input-reload, +.cbi-button-reload { + background-color: darkseagreen !important; + border-color: darkseagreen !important; +} + +.cbi-button-reset, +.cbi-input-remove { + color: #fff !important; + background-color: darkorange !important; + border-color: darkorange !important; +} + +.cbi-page-actions .cbi-button-apply, +.cbi-section-actions .cbi-button-edit, +.cbi-button-edit.important, +.cbi-button-apply.important, +.cbi-button-reload.important, +.cbi-button-action.important { + border: 1px darkslateblue solid !important; +} + + + +fieldset[id^="cbi-apply-"] { + background-color: #333333; +} + +#detail-bubble>div { + border: 1px solid #ccc; + border-radius: 2px; + padding: 5px; + background: #252525; +} + +.cbi-section-error { + color: darkorange; +} + +@supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) { + .login-page .login-container .login-form { + -webkit-backdrop-filter: blur(10px); + backdrop-filter: blur(10px); + background-color: rgba(0, 0, 0, 0.7); + + } +} + +@media screen and (max-width: 480px) { + .node-status-iptables>.main div>.cbi-map>form { + background-color: #1e1e1e; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35); + } +} \ No newline at end of file diff --git a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm index 7708343079..77278bb5d5 100644 --- a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm +++ b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/footer.htm @@ -37,12 +37,24 @@ local category = request[1] local tree = disp.node() local categories = disp.node_childs(tree) + local ipkg = require "luci.model.ipkg" + + function split( str,reps ) + local resultStrList = {} + string.gsub(str,'[^'..reps..']+',function ( w ) + table.insert(resultStrList,w) + end) + return resultStrList + end + + local themepkg = ipkg.info("luci-theme-argon") + local theme_version = split(themepkg["luci-theme-argon"]["Version"],"-") %>