diff --git a/luci-theme-argone/Makefile b/luci-theme-argone/Makefile index 21c8244ca..52096d7de 100644 --- a/luci-theme-argone/Makefile +++ b/luci-theme-argone/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Argone kenzo LUCI_DEPENDS:=+curl +jsonfilter -PKG_VERSION:=1.8.3 -PKG_RELEASE:=5 +PKG_VERSION:=1.7.7 +PKG_RELEASE:=4 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-theme-argone/htdocs/luci-static/argone/css/cascade.css b/luci-theme-argone/htdocs/luci-static/argone/css/cascade.css index 84187532d..ec7850491 100644 --- a/luci-theme-argone/htdocs/luci-static/argone/css/cascade.css +++ b/luci-theme-argone/htdocs/luci-static/argone/css/cascade.css @@ -2,7 +2,6 @@ * Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template * * luci-theme-argone - * Copyright 2020 Jerryk * * Have a bug? Please create an issue here on GitHub! * https://github.com/kenzok78/luci-theme-argone/issues @@ -18,7 +17,7 @@ * luci-theme-material: * https://github.com/LuttyYang/luci-theme-material/ * - * Argone Theme + * Argon Theme * https://demos.creative-tim.com/argon-dashboard/index.html * * Login background @@ -47,7 +46,7 @@ --warning: #fb6340; --footer-color: #aaa; --menubar-background: #fff; - --menubar-scrollbar-thumb: #eee; + --menubar-scrollbar-thumb: #f6f9fc; --menubar-text-color: #4c4c4c; --blue: #5e72e4; --indigo: #5603ad; @@ -155,35 +154,13 @@ body { color: #ffffff; color: var(--white); } -::-webkit-scrollbar { - width: 10px; - height: 10px; -} -::-webkit-scrollbar, -::-webkit-scrollbar-corner { - background: transparent; -} -::-webkit-scrollbar-thumb { - background: #9e9e9e; -} -::-webkit-scrollbar-thumb:hover { - background: #757575; -} -::-webkit-scrollbar-thumb:active { - background: #424242; -} a:link, a:visited, a:active { + color: #5e72e4; color: var(--primary); text-decoration: none; } -a:-webkit-any-link:not(li a, .main-left a, .brand, .pull-right a, .alert-message a, .login-container footer a, .cbi-button) { - color: -webkit-link; - cursor: pointer; - color: var(--primary); - text-shadow: 1px 1px 2px #ccc; -} a:hover { text-decoration: underline; } @@ -243,8 +220,7 @@ li { } .login-page .video video { width: 100%; - height: 100%; - object-fit: cover; + height: auto; } .login-page .volume-control { position: fixed; @@ -301,41 +277,30 @@ li { max-width: 420px; background-color: #fff; background-color: var(--white); - overflow:hidden; } .login-page .login-container .login-form .brand { display: flex; -webkit-box-align: center; align-items: center; - margin: 50px auto 15px auto; + margin: 50px auto 100px 50px; color: #525461; color: var(--default); } .login-page .login-container .login-form .brand .icon { width: 50px; height: auto; + margin-right: 25px; } -.login-page .login-container .login-form .brand-text { - font-size: 1.8rem; +.login-page .login-container .login-form .brand .brand-text { + font-size: 1.25rem; font-weight: 700; - letter-spacing: 1px; - margin-bottom: 85px; font-family: "TypoGraphica"; - width: 420px; - padding: 0 0.5rem 0.1rem 0.5rem; - text-align: center; - word-break: break-word; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; } .login-page .login-container .login-form .brand:hover { text-decoration: none; } .login-page .login-container .login-form .form-login { - width: 420px; + width: 100%; padding: 20px 50px; box-sizing: border-box; } @@ -349,7 +314,7 @@ li { position: relative; } .login-page .login-container .login-form .form-login .input-group::before { - font-family: 'argone' !important; + font-family: 'argon' !important; font-style: normal; font-weight: normal; font-variant: normal; @@ -451,10 +416,6 @@ li { position: absolute; bottom: 0; } -.login-page .login-container footer, -.login-page .login-container footer a { - color: var(--default); -} .login-page .login-container footer .ftc { position: absolute; bottom: 30px; @@ -534,9 +495,13 @@ header .fill .container .brand { footer { text-align: right; padding: 1rem; + color: #aaa; + color: var(--footer-color); font-size: 0.8rem; } footer a { + color: #aaa; + color: var(--footer-color); text-decoration: none; } /*********************** @@ -576,7 +541,6 @@ footer a { position: fixed; z-index: 100; transition: width 0.2s ease-in-out; - overflow-y: scroll; } .main .main-left::-webkit-scrollbar { width: 5px; @@ -587,7 +551,8 @@ footer a { background-color: var(--menubar-scrollbar-thumb); } .main .main-left::-webkit-scrollbar-track { - background-color: transparent; + background-color: #fff; + background-color: var(--menubar-background); } .main .main-left .sidenav-header { padding: 1.5rem; @@ -667,7 +632,7 @@ footer a { position: relative; } .main .main-left .nav li.slide .menu::before { - font-family: 'argone' !important; + font-family: 'argon' !important; font-style: normal; font-weight: normal; font-variant: normal; @@ -686,7 +651,7 @@ footer a { position: absolute; right: 0.5rem; top: 0.8rem; - font-family: 'argone' !important; + font-family: 'argon' !important; font-style: normal; font-weight: normal; font-variant: normal; @@ -707,7 +672,6 @@ footer a { color: #fff; background: #5e72e4; background: var(--primary); - box-shadow: 0 0 1px #ccc; } .main .main-left .nav li.slide .menu:hover a, .main .main-left .nav li.slide .menu.active a { @@ -799,7 +763,6 @@ footer a { background-color: #5e72e4; background-color: var(--primary); transition: all 0.2s; - box-shadow: 0 0 1px #ccc; } .main .main-left .nav li.slide .slide-menu li a:hover::after { color: #000; @@ -966,6 +929,9 @@ form.inline + form.inline, border-color: #5e72e4 !important; border-color: var(--primary) !important; } +.cbi-button-add { + margin-left: 1.5rem; +} .node-services-vssr .ssr-button { margin-left: 0.3rem; } @@ -1034,20 +1000,13 @@ select { text-align: center; } /*textarea*/ -textarea { - border: 1px solid #dee2e6 !important; - outline: none; - min-height: 14rem !important; - padding: 0.8rem !important; - background-color: #fff; - font-family: var(--font-family-monospace) !important; - font-size: inherit; +.cbi-input-textarea { + width: 100%; + min-height: 14rem; + padding: 0.8rem; + font-size: 0.8rem; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; color: black; - border-radius: 0.375rem !important; - vertical-align: middle; -} -.cbi-value .cbi-value-field textarea { - margin: 0.25rem; } /* change */ .uci-change-list { @@ -1132,6 +1091,8 @@ input[type="checkbox"] { vertical-align: middle; } input[type="checkbox"]:checked { + border: 1px solid #5e72e4; + border: 1px solid var(--primary); background-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 8 8\'%3e%3cpath fill=\'%23fff\' d=\'M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z\'/%3e%3c/svg%3e') !important; background-color: #5e72e4; background-color: var(--primary); @@ -1156,6 +1117,8 @@ ul li .cbi-input-checkbox { margin: 0.25rem 0; } .cbi-input-radio:checked { + border: 1px solid #5e72e4; + border: 1px solid var(--primary); background-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'-4 -4 8 8\'%3e%3ccircle r=\'3\' fill=\'%23fff\'/%3e%3c/svg%3e') !important; background-color: #5e72e4; background-color: var(--primary); @@ -1265,8 +1228,7 @@ div.cbi-value var, td.cbi-value-field var, .td.cbi-value-field var { font-style: italic; - color: var(--primary); - text-shadow: 1px 1px 2px #ccc; + color: #0069D6; } small { font-size: 90%; @@ -1420,15 +1382,7 @@ input[name="nslookup"] { background-color: var(--primary) !important; background-image: url(../img/trafficbar.png); background-position: left top; - animation: sparkle 1000ms linear infinite; -} -#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 { - text-shadow: 1px 1px 2px #ccc; + animation: sparkle 1500ms linear infinite; } /* fix multiple table */ table table, @@ -1675,6 +1629,10 @@ th h5, td h5, th h6, td h6 { background: var(--lighter); } +/* OCD: Change the background color of the "now in use" node in PassWall */ +.cbi-section-table > tbody > ._now_use { + background: #5e72e473 !important; +} /* language fix */ body.lang_pl.node-main-login .cbi-value-title { width: 12rem; @@ -1788,14 +1746,14 @@ body.lang_pl.node-main-login .cbi-value-title { } .cbi-rowstyle-2 .cbi-button-up, .cbi-rowstyle-2 .cbi-button-down { - background-color: var(--lighter); + background-color: #FFF !important; } .cbi-button-up, .cbi-button-down, .cbi-value-helpicon, .showSide, .main > .loading > span { - font-family: 'argone' !important; + font-family: 'argon' !important; font-style: normal !important; font-weight: normal !important; font-variant: normal !important; @@ -1830,8 +1788,7 @@ input { transition: box-shadow 0.15s ease; margin: 0.25rem; } -select:not([multiple="multiple"]):hover, -input:hover, +select:not([multiple="multiple"]):focus, input:focus { border-color: #5e72e4; border-color: var(--primary); @@ -2066,7 +2023,7 @@ h3 { letter-spacing: 0.1rem; padding: 1rem 1.5rem; border-radius: 0.375rem; - background: var(--lighter); + background: #fff; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.03); } fieldset { @@ -2108,8 +2065,6 @@ fieldset.cbi-section p { letter-spacing: 0.1rem; color: #32325d; font-weight: 600; - position: sticky; - left: 0; } table { border-spacing: 0; @@ -2176,25 +2131,15 @@ td > table > tbody > tr > td { white-space: nowrap; overflow-x: auto; } -.tabs::-webkit-scrollbar, -.cbi-section::-webkit-scrollbar, -.cbi-section > *::-webkit-scrollbar, -textarea::-webkit-scrollbar, -div::-webkit-scrollbar { - width: 5px; +.tabs::-webkit-scrollbar { + width: 1px; height: 5px; } .tabs::-webkit-scrollbar-thumb { - background-color: #9e9e9e; -} -.tabs::-webkit-scrollbar-thumb:hover { - background: #757575; -} -.tabs::-webkit-scrollbar-thumb:active { - background: #424242; + background-color: #f6f9fc; } .tabs::-webkit-scrollbar-track { - background-color: transparent; + background-color: #fff; } .tabs li[class~="active"], .tabs li:hover { @@ -2203,7 +2148,7 @@ div::-webkit-scrollbar { border-bottom: 0.18751rem solid var(--primary); color: #5e72e4; color: var(--primary); - background-color: var(--light-subtabs-background); + background-color: #dce1fe; margin-bottom: 0; border-radius: 0; } @@ -2239,19 +2184,13 @@ div::-webkit-scrollbar { height: 5px; } .cbi-tabmenu::-webkit-scrollbar-thumb { - background-color: #9e9e9e; -} -.cbi-tabmenu::-webkit-scrollbar-thumb:hover { - background: #757575; -} -.cbi-tabmenu::-webkit-scrollbar-thumb:active { - background: #424242; + background-color: #f6f9fc; } .cbi-tabmenu::-webkit-scrollbar-track { - background-color: transparent; + background-color: #fff; } .cbi-tabmenu li { - background: #e3e3e3; + background: #dce3e9; display: inline-block; font-size: 0.875rem; border-top-left-radius: 0.25rem; @@ -2270,7 +2209,7 @@ div::-webkit-scrollbar { border-bottom: 0.18751rem solid var(--primary); color: #5e72e4; color: var(--primary); - background-color: var(--light-subtabs-background); + background-color: #dce1fe; margin-bottom: 0; } .cbi-tabmenu li:hover a { @@ -2280,7 +2219,7 @@ div::-webkit-scrollbar { border-bottom: 0.18751rem solid #5e72e4; border-bottom: 0.18751rem solid var(--primary); color: var(--primary); - background-color: var(--light-subtabs-background); + background-color: #dce1fe; margin-bottom: 0; } .cbi-tabmenu li[class~="cbi-tab"] a { @@ -2503,8 +2442,7 @@ select[multiple="multiple"] { .cbi-section-node .cbi-value { padding: 0.5rem 1rem 0.5rem 1rem !important; } -.cbi-tabcontainer > .cbi-value:nth-of-type(2n), -.cbi-tabcontainer > .cbi-value:nth-of-type(2n)>textarea { +.cbi-tabcontainer > .cbi-value:nth-of-type(2n) { background-color: #f9f9f9; } .cbi-value-field, @@ -2532,9 +2470,8 @@ form > .cbi-map > .cbi-section > .cbi-section-node > .cbi-value > .cbi-value-fie content: "\f059"; } .cbi-value-description { - color: #8d8d8d; - opacity: 0.8; font-size: small; + opacity: 0.5; padding: 0.5rem; } .cbi-value-title { @@ -2603,11 +2540,23 @@ td > .ifacebadge { float: right; margin: 0 0.3rem; } +/*textarea*/ +.cbi-input-textarea { + width: 100%; + border: 0; + outline: none; + min-height: 14rem; + padding: 0.8rem; + font-size: 0.8rem; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + color: black; +} #syslog { width: 100%; min-height: 15rem; padding: 1rem; line-height: 1.4em; + font-size: small; color: #1e1e1e; border-radius: 0; background-color: #fff; @@ -2631,7 +2580,7 @@ td > .ifacebadge, .ifacebadge > img { display: inline-block; margin: 0 0.3rem; - align-self: center; + align-self: flex-start; } .ifacebadge span { line-height: 1.6em; @@ -2761,6 +2710,16 @@ td > .ifacebadge, .cbi-section-remove { padding: 0.5rem; } +div.cbi-value var, +td.cbi-value-field var { + font-style: italic; + color: #0069D6; +} +small { + font-size: 90%; + white-space: normal; + line-height: 1.42857143; +} .cbi-optionals { padding: 1rem 1rem 0 1rem; border-top: 1px solid #CCC; @@ -2853,7 +2812,7 @@ input[name="nslookup"] { height: 100% !important; background-image: url(../img/trafficbar.png); background-position: left top; - animation: sparkle 1000ms linear infinite; + animation: sparkle 1500ms linear infinite; } .node-system-leds .cbi-section em { display: block; @@ -2870,13 +2829,14 @@ input[name="nslookup"] { overflow-y: hidden; } .cbi-section em { + padding: 0.75rem 1.5rem; font-size: 0.7rem; font-weight: 600; - color: var(--primary); - text-shadow: 1px 1px 2px #ccc; + color: #525f7f; text-align: center; } .cbi-section h4 { + padding: 0.75rem 1.5rem; font-size: 0.7rem; font-weight: 600; color: #525f7f; @@ -2905,12 +2865,6 @@ input[name="nslookup"] { .node-system-flashops fieldset { margin-top: 0; } -.node-system-flashops fieldset > ul { - padding: 1rem; -} -.node-system-flashops fieldset + .cbi-page-actions { - margin-top: 1rem; -} .node-status-iptables .cbi-tabmenu, .node-system-packages .cbi-tabmenu, .node-system-flashops .cbi-tabmenu { @@ -2955,95 +2909,6 @@ input[name="nslookup"] { .node-nas-usb_printer em { display: block; } -/* luci-app-passwall */ -#cbi-passwall #add_link_div, -#cbi-passwall #set_node_div { - background: #fffffff0; -} -#cbi-passwall .cbi-section-table tbody ._now_use { - background: #5e72e473 !important; -} -/* luci-app-commands */ -.commandbox h3 { - overflow: hidden; - text-overflow: ellipsis; -} -.commandbox code { - word-break: break-word; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; -} -div.commandbox { - height: 16em; -} -/* luci-app-ssr-plus */ -#cbi-shadowsocksr .cbi-map-descr h3 { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} -/* luci-app-mwan3 */ -.node-status-mwan .cbi-tabmenu { - padding: 3rem 0.5rem 0 0.5rem; -} -/* luci-app-openclash */ -.node-services-openclash .cbi-tabmenu { - font-size: 0; -} -.node-services-openclash .cbi-tabmenu > li { - margin-right: 4px; -} -.node-services-openclash .cbi-tabmenu > li:last-child { - margin-right: 0; -} -/* luci-app-ddnsto */ -.node-services-ddnsto .cbi-section-node .cbi-value div { - display: table-cell; - line-height: 1.6; - font-size: 0.875rem; -} - -/* luci-app-dockerman */ -#cbi-dockerd > .cbi-section > br, -#cbi-docker > .cbi-section > br { - display: none; -} - -/* luci-app-diskman */ -#cbi-diskman > .cbi-section > br { - display: none; -} - -/* luci-app-istorex (Quick Start) */ -#app #main #page .app-container_body .btn-f, -#app #main #page .app-container_body .btn-r { - -webkit-user-select: none; /* Safari */ - -moz-user-select: none; /* Firefox */ - -ms-user-select: none; /* IE10+/Edge */ - user-select: none; /* Standard */ - width: 30px; -} - -/* luci-app-ttyd */ -.TTYD.node-system-terminal .main { - height: 100%!important; -} -.TTYD.node-system-terminal .main .main-right, -.TTYD.node-system-terminal .main .main-right #maincontent, -.TTYD.node-system-terminal .main .main-right #maincontent .container .cbi-map { - height: 100%!important; - display: flex!important; - flex-direction: column!important; -} -.TTYD.node-system-terminal .main .main-right #maincontent, -.TTYD.node-system-terminal .main .main-right #maincontent .container, -.TTYD.node-system-terminal .main .main-right #maincontent .container .cbi-map #terminal { - flex: 1!important; -} - @media screen and (max-width: 1600px) { .main .main-left { width: calc(0% + 13rem); @@ -3051,7 +2916,7 @@ div.commandbox { .main .main-right { width: calc(100% - 13rem); } - .cbi-button:not(.cbi-button-up, .cbi-button-down) { + .cbi-button { /*padding: 0.3rem 1.5rem;*/ font-size: 0.8rem; } @@ -3068,6 +2933,9 @@ div.commandbox { fieldset { padding: 0; } + .cbi-input-textarea { + font-size: small; + } .node-status-iptables > .main fieldset li > a { padding: 0.3rem 0.6rem; } @@ -3103,6 +2971,25 @@ div.commandbox { font-size: 0.7rem; } } +@media screen and (min-width: 600px) { + ::-webkit-scrollbar { + width: 10px; + height: 10px; + } + ::-webkit-scrollbar, + ::-webkit-scrollbar-corner { + background: transparent; + } + ::-webkit-scrollbar-thumb { + background: #9e9e9e; + } + ::-webkit-scrollbar-thumb:hover { + background: #757575; + } + ::-webkit-scrollbar-thumb:active { + background: #424242; + } +} @media screen and (max-width: 992px) { .main .main-left { width: 0; @@ -3147,15 +3034,6 @@ div.commandbox { font-size: 1rem; } } -@media screen and (max-width: 500px) { - .login-page .login-container { - margin-left: 0rem !important; - width: 500px; - } - .login-page .login-container .login-form { - max-width: 500px; - } -} @media screen and (max-width: 480px) { body { font-size: 0.8rem; @@ -3164,10 +3042,17 @@ div.commandbox { float: right; margin-top: 0rem !important; } + .login-page .video video { + width: auto !important; + height: 100% !important; + } .login-page .login-container { margin-left: 0rem !important; width: 100%; } + .login-page .login-container .login-form { + max-width: 480px; + } .login-page .login-container .login-form .form-login .input-group::before { color: #525461; } @@ -3239,9 +3124,10 @@ div.commandbox { .cbi-page-actions > div > input { display: none; } - ::-webkit-scrollbar { - width: 0px !important; - height: 0px !important; + .tabs::-webkit-scrollbar, + .cbi-tabmenu::-webkit-scrollbar { + width: 0px; + height: 0px; } .tabs > li > a { font-size: 0.9rem; @@ -3332,4 +3218,4 @@ div.commandbox { width: 2.3rem !important; height: auto; } -} +} \ No newline at end of file diff --git a/luci-theme-argone/htdocs/luci-static/argone/css/dark.css b/luci-theme-argone/htdocs/luci-static/argone/css/dark.css index 085c7f639..370cbcd08 100644 --- a/luci-theme-argone/htdocs/luci-static/argone/css/dark.css +++ b/luci-theme-argone/htdocs/luci-static/argone/css/dark.css @@ -15,10 +15,6 @@ body { color: #adb5bd; } -.login-page .login-container .login-form .form-login .input-group .border { - border-bottom: 1px var(--dark-primary) solid; -} - .login-page .login-container .login-form .form-login .input-group input { background-color: transparent !important; color: #adb5bd; @@ -46,8 +42,7 @@ body { opacity: .9; } -.login-page .login-container footer, -.login-page .login-container footer a { +.login-page .login-container footer { color: #adb5bd; } @@ -65,36 +60,29 @@ header::after { } .main .main-left .nav .slide .slide-menu .active a { - color: #fff !important; + 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::after { - background-color: var(--dark-primary) !important; - box-shadow: 0 0 1px #000 !important; -} - .main .main-left .nav .slide .slide-menu li a:hover { background: none !important; } -.main .main-left .nav .slide .menu:hover, .main .main-left .nav .slide .menu.active { background-color: #483d8b !important; background-color: var(--dark-primary) !important; - color: #fff !important; - box-shadow: 0 0 1px #000 !important; + color: #cccccc !important; } -.main .main-left .nav .slide .menu[data-title=Status]:before { - color: var(--dark-primary) !important; -} - -.main .main-left .nav .slide .menu[data-title=Control]:before { - color: var(--dark-primary) !important; +.main .main-left .nav .slide .menu.active a::after { + background-color: #cccccc !important; } .main .main-left .nav li a { @@ -104,13 +92,17 @@ header::after { .main .main-left .nav li a:hover { background-color: #483d8b !important; background-color: var(--dark-primary) !important; - color: #fff !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; } @@ -126,31 +118,17 @@ h3 { background: #333333; } -a:link, -a:visited, -a:active { - color: var(--dark_webkit-any-link); -} - -a:-webkit-any-link:not(li a, .main-left a, .brand, .pull-right a, .alert-message a, .login-container footer a, .cbi-button) { - color: var(--dark_webkit-any-link) !important; - text-shadow: 1px 1px 2px #000 !important; +a:-webkit-any-link { + color: -webkit-link; + cursor: pointer; + color: #483d8b; + color: var(--dark-primary); } input:-webkit-autofill { background-color: #3c3c3c !important; } -input[type="checkbox"]:checked { - background-color: #483d8b !important; - background-color: var(--dark-primary) !important; -} - -.cbi-input-radio:checked { - background-color: #483d8b !important; - background-color: var(--dark-primary) !important; -} - .cbi-value-field .cbi-input-apply, .cbi-button-apply, .cbi-button-edit { @@ -162,8 +140,8 @@ input[type="checkbox"]:checked { } .cbi-section em { - color: var(--dark_webkit-any-link); - text-shadow: 1px 1px 2px #000; + color: #483d8b; + color: var(--dark-primary); } header.bg-primary { @@ -218,7 +196,6 @@ table>thead>tr>td { #conns>div>div>div>small, #memtotal>div>div>div>small { color: #ccc !important; - text-shadow: 1px 1px 2px #000 !important; } .node-system-packages>.main .cbi-section-node:first-child .cbi-value-last { @@ -239,7 +216,6 @@ table>tbody>tr>th, table>tfoot>tr>th, table>thead>tr>th { background-color: #252526; - border-top: none; border-bottom: black 1px solid !important; } @@ -278,7 +254,8 @@ table>thead>tr>th { } abbr { - color: #8898aa; + color: #483d8b; + color: var(--dark-primary); } div>table>tbody>tr:nth-of-type(2n), @@ -342,6 +319,16 @@ th h6, td h6 { background-color: #00ff0a45 !important; } +/* OCD: Compatible the background color of the "Add the node via the link" & "USE(node)" pop-up window in PassWall (dark mode only) */ +#add_link_div, +#set_node_div { + background-color: #333333f0 !important; + box-shadow: #00000094 10px 10px 30px 5px !important; +} +#add_link_div>.cbi-value>.cbi-value-field>#nodes_link { + background: #ccc; +} + #content_syslog { box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35); } @@ -363,26 +350,26 @@ th h6, td h6 { background-color: #252526; } -.tabs>li:hover, -.tabs>li[class~="active"], -.cbi-tabmenu>li:hover, -.cbi-tabmenu>li[class~="cbi-tab"] { - border-bottom: .18751rem solid var(--dark-primary); - background-color: #3c3c3c; +.tabs>li[class~="active"]>a { + color: #ccc; } -.tabs>li>a, -.cbi-tabmenu>li>a { - color: #ccc !important; +.tabs>li[class~="active"], +.tabs>li:hover { + border-bottom: .18751rem solid #483d8b; + border-bottom: .18751rem solid var(--dark-primary); + color: #ccc; + background-color: #181819; +} + +.cbi-tabmenu>li>a, +.tabs>li>a { + color: #ccc; } .cbi-tabmenu>li>a:hover, -.cbi-tabmenu>li:hover>a, -.cbi-tabmenu>.cbi-tab>a, -.tabs>li>a:hover, -.tabs>li:hover>a, -.tabs>li[class~="active"]>a { - color: #fff !important; +.tabs>li>a:hover { + color: #ccc; } .cbi-tabmenu>li { @@ -393,12 +380,20 @@ th h6, td h6 { border-bottom: 0 solid #ddd !important; } -.cbi-tab-descr { +.cbi-tabmenu li[class~="cbi-tab"] a { color: #ccc; } -.cbi-tabcontainer>.cbi-value:nth-of-type(2n), -.cbi-tabcontainer>.cbi-value:nth-of-type(2n)>textarea { +.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; } @@ -414,8 +409,7 @@ input { box-shadow: 0 3px 2px rgba(0,0,0,0.05); } -select:not([multiple="multiple"]):hover, -input:hover, +select:not([multiple="multiple"]):focus, input:focus { border-color: #483d8b !important; border-color: var(--dark-primary) !important; @@ -450,9 +444,7 @@ select { color: #ccc; } -/*textarea for dark mode*/ -textarea { - border: 1px solid #3c3c3c !important; +.cbi-input-textarea { background-color: #1e1e1e; color: #ccc; } @@ -520,11 +512,9 @@ img[src="/luci-static/resources/icons/loading.gif"] { } div.cbi-value var, -td.cbi-value-field var, -.td.cbi-value-field var { +td.cbi-value-field var { color: #483d8b; - color: var(--dark_webkit-any-link); - text-shadow: 1px 1px 2px #000; + color: var(--dark-primary); } #diag-rc-output>pre { @@ -534,7 +524,7 @@ td.cbi-value-field var, .node-services-vssr .block { background-color: #1e1e1e !important; - box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35) !important; + box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35); } .node-services-vssr .block h4 { @@ -543,8 +533,8 @@ td.cbi-value-field var, .node-services-vssr .status-bar { color: #ccc; - background: #333333f0; - box-shadow: #00000094 10px 10px 30px 5px; + box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35); + background-color: #1e1e1e; } .node-services-vssr .cbi-section-table-row { @@ -676,150 +666,6 @@ fieldset[id^="cbi-apply-"] { color: #ccc !important; } -/* luci-app-passwall */ -#cbi-passwall #add_link_div, -#cbi-passwall #set_node_div { - background: #333333f0 !important; - box-shadow: #00000094 10px 10px 30px 5px !important; -} - -/* luci-app-bypass */ -#cbi-bypass .status-bar { - color: #ccc; - background: #333333f0; - box-shadow: #00000094 10px 10px 30px 5px; -} - -/* luci-app-clash */ -#cbi-clash .cbi-section .pure-u-1-4 .pure-g, -#cbi-clash .cbi-section .siz .pure-g { - background-color: #1e1e1e !important; - box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35) !important; -} - -/* luci-app-openclash */ -#cbi-openclash #eye-icon, -#cbi-openclash img[title="刷新"] { - filter: invert(100%); -} -#cbi-openclash #cbi-openclash-config fieldset[control-id="ControlID-46"], -#cbi-openclash .CodeMirror-merge-copybuttons-right, -.CodeMirror-scroll { - background-color: #333333 !important; -} -#cbi-openclash .cbi-section .cbi-tabmenu li { - border-right: 1px solid #3c3c3c !important; -} -#cbi-openclash .CodeMirror-merge { - border: 1px solid transparent !important; -} -#cbi-openclash-config-clog .cbi-section { - border: 1px solid #3c3c3c !important; -} -#cbi-openclash .CodeMirror-gutters { - border-right: 1px solid #3c3c3c !important; - background-color: #1e1e1e !important; -} - -/* luci-app-dockerman */ -#cbi-dockerd .img-con img { - filter: invert(0.4); -} - -/* luci-app-istorex (interface config[NetworkPort]) */ -#cbi-nfs-mount .app-container_status-label_bg { - background: #333333; -} -#cbi-nfs-mount td svg { - filter: invert(0.3); -} -#actioner .actioner-dns { - background-color: #333333; -} -#actioner .actioner-dns_header, -#actioner .actioner-container_header { - border-bottom: 1px solid #cbcbcb !important; -} -#actioner .actioner-dns_footer { - border-top: 1px solid #cbcbcb !important; -} - -/* luci-app-istorex (Network Guide) */ -#app #main #page .title, -#app #main #page .desc { - color: #cccccc; - background-color: #333333; -} -#app #main #page .network-message li:not(span):not(a) { - color: #8d8d8d; -} -#app #main #page code { - background-color: #333333; -} - -/* luci-app-istorex (Quick Start) */ -#app #main #page .network-container_flow-container, -#app #main #page .app-container_status-container, -#app #main #page .nas-container .nas-container_card .app-container, -#app #main #page .app-container { - background-color: #333333; -} -#app #main #page .flow-data span, -#app #main #page .app-container_status-label_block span, -#app #main #page .app-container .item-label span:not(#app #main #page .app-container .progress-value span) { - color: #cccccc; -} -#app #main #page .app-container_status-info span, -#app #main #page .app-container_status-info span, -#app #main #page .app-container_title span { - color: #dddddd; -} -.app-container_body .app-container_status-label_bg { - background-color: #282828 !important; -} -#app #main #page .item-label_value .progress { - background-color: rgb(118, 118, 118); -} -#app #main #page .app-container_nas-menu button[class=""] { - background-color: #8b8b8b; -} -#app #main #page .app-container_nas-menu button[class="on"] { - background-color: #555555; -} -#app #main #page .app-container_title .DeviceBlock ul { - background-color: #cccccc; -} -#actioner div.action, -#actioner div.actioner-container { - background-color: #3c3c3c; -} -#actioner div.action .title { - color: #cccccc; -} -#actioner div.action .desc { - color: #cbcbcb; -} -#actioner div.action div.roots span, -#actioner div.action div.move span:not(span.tip), -#actioner div.action div.left span, -#actioner div.action div.input_row span, -#actioner div.label-item label span { - color: #cbcbcb; -} -#actioner div.action span.tooltip-trigger svg path { - fill: #cbcbcb; -} -#actioner div.actioner-dns_body div.label-item_value select { - height: 43px; -} -#actioner div.actioner-container_footer div.close { - color: #ffffff; -} -#app #main div.app-container div.app-container_title span a svg path, -#app #main #page span.disk_infoicon svg g { - fill: #8b8b8b; -} - @supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) { .login-page .login-container .login-form { -webkit-backdrop-filter: blur(var(--blur-radius-dark)); diff --git a/luci-theme-argone/htdocs/luci-static/argone/css/fonts.css b/luci-theme-argone/htdocs/luci-static/argone/css/fonts.css index 4e2b4ae62..1f42a79f9 100644 --- a/luci-theme-argone/htdocs/luci-static/argone/css/fonts.css +++ b/luci-theme-argone/htdocs/luci-static/argone/css/fonts.css @@ -2,7 +2,6 @@ * Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template * * luci-theme-argone - * Copyright 2020 Jerryk * * Have a bug? Please create an issue here on GitHub! * https://github.com/kenzok78/luci-theme-argone/issues @@ -47,12 +46,12 @@ /* ICON Font */ @font-face { - font-family: 'argone'; + font-family: 'argon'; src: url('../fonts/argon.eot?u6kthm'); src: url('../fonts/argon.eot?u6kthm#iefix') format('embedded-opentype'), url('../fonts/argon.ttf?u6kthm') format('truetype'), url('../fonts/argon.woff?u6kthm') format('woff'), - url('../fonts/argon.svg?u6kthm#argone') format('svg'); + url('../fonts/argon.svg?u6kthm#argon') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -61,7 +60,7 @@ [class^="icon-"], [class*=" icon-"] { /* use !important to prevent issues with browser extensions that change fonts */ - font-family: 'argone' !important; + font-family: 'argon' !important; font-style: normal; font-weight: normal; font-variant: normal; diff --git a/luci-theme-argone/htdocs/luci-static/argone/css/pure-min.css b/luci-theme-argone/htdocs/luci-static/argone/css/pure-min.css index e898cf2ca..81dbb1509 100644 --- a/luci-theme-argone/htdocs/luci-static/argone/css/pure-min.css +++ b/luci-theme-argone/htdocs/luci-static/argone/css/pure-min.css @@ -8,4 +8,4 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md normalize.css v | MIT License | git.io/normalize Copyright (c) Nicolas Gallagher and Jonathan Neal */ -/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select{font-family:inherit;font-size:100%;line-height:1.15;margin:5px}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{-webkit-box-sizing:border-box;box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none}html{font-family:sans-serif}.hidden,[hidden]{display:none!important}.pure-img{max-width:100%;height:auto}.pure-g{letter-spacing:-.31em;text-rendering:optimizespeed;font-family:FreeSans,Arimo,"Droid Sans",Helvetica,Arial,sans-serif;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-line-pack:start;align-content:flex-start}@media all and (-ms-high-contrast:none),(-ms-high-contrast:active){table .pure-g{display:block}}.opera-only :-o-prefocus,.pure-g{word-spacing:-.43em}.pure-u{display:inline-block;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-g [class*=pure-u]{font-family:sans-serif}.pure-u-1,.pure-u-1-1,.pure-u-1-12,.pure-u-1-2,.pure-u-1-24,.pure-u-1-3,.pure-u-1-4,.pure-u-1-5,.pure-u-1-6,.pure-u-1-8,.pure-u-10-24,.pure-u-11-12,.pure-u-11-24,.pure-u-12-24,.pure-u-13-24,.pure-u-14-24,.pure-u-15-24,.pure-u-16-24,.pure-u-17-24,.pure-u-18-24,.pure-u-19-24,.pure-u-2-24,.pure-u-2-3,.pure-u-2-5,.pure-u-20-24,.pure-u-21-24,.pure-u-22-24,.pure-u-23-24,.pure-u-24-24,.pure-u-3-24,.pure-u-3-4,.pure-u-3-5,.pure-u-3-8,.pure-u-4-24,.pure-u-4-5,.pure-u-5-12,.pure-u-5-24,.pure-u-5-5,.pure-u-5-6,.pure-u-5-8,.pure-u-6-24,.pure-u-7-12,.pure-u-7-24,.pure-u-7-8,.pure-u-8-24,.pure-u-9-24{display:inline-block;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-u-1-24{width:4.1667%}.pure-u-1-12,.pure-u-2-24{width:8.3333%}.pure-u-1-8,.pure-u-3-24{width:12.5%}.pure-u-1-6,.pure-u-4-24{width:16.6667%}.pure-u-1-5{width:20%}.pure-u-5-24{width:20.8333%}.pure-u-1-4,.pure-u-6-24{width:25%}.pure-u-7-24{width:29.1667%}.pure-u-1-3,.pure-u-8-24{width:33.3333%}.pure-u-3-8,.pure-u-9-24{width:37.5%}.pure-u-2-5{width:40%}.pure-u-10-24,.pure-u-5-12{width:41.6667%}.pure-u-11-24{width:45.8333%}.pure-u-1-2,.pure-u-12-24{width:50%}.pure-u-13-24{width:54.1667%}.pure-u-14-24,.pure-u-7-12{width:58.3333%}.pure-u-3-5{width:60%}.pure-u-15-24,.pure-u-5-8{width:62.5%}.pure-u-16-24,.pure-u-2-3{width:66.6667%}.pure-u-17-24{width:70.8333%}.pure-u-18-24,.pure-u-3-4{width:75%}.pure-u-19-24{width:79.1667%}.pure-u-4-5{width:80%}.pure-u-20-24,.pure-u-5-6{width:83.3333%}.pure-u-21-24,.pure-u-7-8{width:87.5%}.pure-u-11-12,.pure-u-22-24{width:91.6667%}.pure-u-23-24{width:95.8333%}.pure-u-1,.pure-u-1-1,.pure-u-24-24,.pure-u-5-5{width:100%}.pure-button{display:inline-block;line-height:normal;white-space:nowrap;vertical-align:middle;text-align:center;cursor:pointer;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-box-sizing:border-box;box-sizing:border-box}.pure-button::-moz-focus-inner{padding:0;border:0}.pure-button-group{letter-spacing:-.31em;text-rendering:optimizespeed}.opera-only :-o-prefocus,.pure-button-group{word-spacing:-.43em}.pure-button-group .pure-button{letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-button{font-family:inherit;font-size:100%;padding:.5em 1em;color:rgba(0,0,0,.8);border:none transparent;background-color:#e6e6e6;text-decoration:none;border-radius:2px}.pure-button-hover,.pure-button:focus,.pure-button:hover{background-image:-webkit-gradient(linear,left top,left bottom,from(transparent),color-stop(40%,rgba(0,0,0,.05)),to(rgba(0,0,0,.1)));background-image:linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.1))}.pure-button:focus{outline:0}.pure-button-active,.pure-button:active{-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.15) inset,0 0 6px rgba(0,0,0,.2) inset;box-shadow:0 0 0 1px rgba(0,0,0,.15) inset,0 0 6px rgba(0,0,0,.2) inset;border-color:#000}.pure-button-disabled,.pure-button-disabled:active,.pure-button-disabled:focus,.pure-button-disabled:hover,.pure-button[disabled]{border:none;background-image:none;opacity:.4;cursor:not-allowed;-webkit-box-shadow:none;box-shadow:none;pointer-events:none}.pure-button-hidden{display:none}.pure-button-primary,.pure-button-selected,a.pure-button-primary,a.pure-button-selected{background-color:#0078e7;color:#fff}.pure-button-group .pure-button{margin:0;border-radius:0;border-right:1px solid rgba(0,0,0,.2)}.pure-button-group .pure-button:first-child{border-top-left-radius:2px;border-bottom-left-radius:2px}.pure-button-group .pure-button:last-child{border-top-right-radius:2px;border-bottom-right-radius:2px;border-right:none}.pure-form input[type=color],.pure-form input[type=date],.pure-form input[type=datetime-local],.pure-form input[type=datetime],.pure-form input[type=email],.pure-form input[type=month],.pure-form input[type=number],.pure-form input[type=password],.pure-form input[type=search],.pure-form input[type=tel],.pure-form input[type=text],.pure-form input[type=time],.pure-form input[type=url],.pure-form input[type=week],.pure-form select,.pure-form textarea{padding:.5em .6em;display:inline-block;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 3px #ddd;box-shadow:inset 0 1px 3px #ddd;border-radius:4px;vertical-align:middle;-webkit-box-sizing:border-box;box-sizing:border-box}.pure-form input:not([type]){padding:.5em .6em;display:inline-block;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 3px #ddd;box-shadow:inset 0 1px 3px #ddd;border-radius:4px;-webkit-box-sizing:border-box;box-sizing:border-box}.pure-form input[type=color]{padding:.2em .5em}.pure-form input[type=color]:focus,.pure-form input[type=date]:focus,.pure-form input[type=datetime-local]:focus,.pure-form input[type=datetime]:focus,.pure-form input[type=email]:focus,.pure-form input[type=month]:focus,.pure-form input[type=number]:focus,.pure-form input[type=password]:focus,.pure-form input[type=search]:focus,.pure-form input[type=tel]:focus,.pure-form input[type=text]:focus,.pure-form input[type=time]:focus,.pure-form input[type=url]:focus,.pure-form input[type=week]:focus,.pure-form select:focus,.pure-form textarea:focus{outline:0;border-color:#129fea}.pure-form input:not([type]):focus{outline:0;border-color:#129fea}.pure-form input[type=checkbox]:focus,.pure-form input[type=file]:focus,.pure-form input[type=radio]:focus{outline:thin solid #129fea;outline:1px auto #129fea}.pure-form .pure-checkbox,.pure-form .pure-radio{margin:.5em 0;display:block}.pure-form input[type=color][disabled],.pure-form input[type=date][disabled],.pure-form input[type=datetime-local][disabled],.pure-form input[type=datetime][disabled],.pure-form input[type=email][disabled],.pure-form input[type=month][disabled],.pure-form input[type=number][disabled],.pure-form input[type=password][disabled],.pure-form input[type=search][disabled],.pure-form input[type=tel][disabled],.pure-form input[type=text][disabled],.pure-form input[type=time][disabled],.pure-form input[type=url][disabled],.pure-form input[type=week][disabled],.pure-form select[disabled],.pure-form textarea[disabled]{cursor:not-allowed;background-color:#eaeded;color:#cad2d3}.pure-form input:not([type])[disabled]{cursor:not-allowed;background-color:#eaeded;color:#cad2d3}.pure-form input[readonly],.pure-form select[readonly],.pure-form textarea[readonly]{background-color:#eee;color:#777;border-color:#ccc}.pure-form input:focus:invalid,.pure-form select:focus:invalid,.pure-form textarea:focus:invalid{color:#b94a48;border-color:#e9322d}.pure-form input[type=checkbox]:focus:invalid:focus,.pure-form input[type=file]:focus:invalid:focus,.pure-form input[type=radio]:focus:invalid:focus{outline-color:#e9322d}.pure-form select{height:2.25em;border:1px solid #ccc;background-color:#fff}.pure-form select[multiple]{height:auto}.pure-form label{margin:.5em 0 .2em}.pure-form fieldset{margin:0;padding:.35em 0 .75em;border:0}.pure-form legend{display:block;width:100%;padding:.3em 0;margin-bottom:.3em;color:#333;border-bottom:1px solid #e5e5e5}.pure-form-stacked input[type=color],.pure-form-stacked input[type=date],.pure-form-stacked input[type=datetime-local],.pure-form-stacked input[type=datetime],.pure-form-stacked input[type=email],.pure-form-stacked input[type=file],.pure-form-stacked input[type=month],.pure-form-stacked input[type=number],.pure-form-stacked input[type=password],.pure-form-stacked input[type=search],.pure-form-stacked input[type=tel],.pure-form-stacked input[type=text],.pure-form-stacked input[type=time],.pure-form-stacked input[type=url],.pure-form-stacked input[type=week],.pure-form-stacked label,.pure-form-stacked select,.pure-form-stacked textarea{display:block;margin:.25em 0}.pure-form-stacked input:not([type]){display:block;margin:.25em 0}.pure-form-aligned input,.pure-form-aligned select,.pure-form-aligned textarea,.pure-form-message-inline{display:inline-block;vertical-align:middle}.pure-form-aligned textarea{vertical-align:top}.pure-form-aligned .pure-control-group{margin-bottom:.5em}.pure-form-aligned .pure-control-group label{text-align:right;display:inline-block;vertical-align:middle;width:10em;margin:0 1em 0 0}.pure-form-aligned .pure-controls{margin:1.5em 0 0 11em}.pure-form .pure-input-rounded,.pure-form input.pure-input-rounded{border-radius:2em;padding:.5em 1em}.pure-form .pure-group fieldset{margin-bottom:10px}.pure-form .pure-group input,.pure-form .pure-group textarea{display:block;padding:10px;margin:0 0 -1px;border-radius:0;position:relative;top:-1px}.pure-form .pure-group input:focus,.pure-form .pure-group textarea:focus{z-index:3}.pure-form .pure-group input:first-child,.pure-form .pure-group textarea:first-child{top:1px;border-radius:4px 4px 0 0;margin:0}.pure-form .pure-group input:first-child:last-child,.pure-form .pure-group textarea:first-child:last-child{top:1px;border-radius:4px;margin:0}.pure-form .pure-group input:last-child,.pure-form .pure-group textarea:last-child{top:-2px;border-radius:0 0 4px 4px;margin:0}.pure-form .pure-group button{margin:.35em 0}.pure-form .pure-input-1{width:100%}.pure-form .pure-input-3-4{width:75%}.pure-form .pure-input-2-3{width:66%}.pure-form .pure-input-1-2{width:50%}.pure-form .pure-input-1-3{width:33%}.pure-form .pure-input-1-4{width:25%}.pure-form-message-inline{display:inline-block;padding-left:.3em;color:#666;vertical-align:middle;font-size:.875em}.pure-form-message{display:block;color:#666;font-size:.875em}@media only screen and (max-width :480px){.pure-form button[type=submit]{margin:.7em 0 0}.pure-form input:not([type]),.pure-form input[type=color],.pure-form input[type=date],.pure-form input[type=datetime-local],.pure-form input[type=datetime],.pure-form input[type=email],.pure-form input[type=month],.pure-form input[type=number],.pure-form input[type=password],.pure-form input[type=search],.pure-form input[type=tel],.pure-form input[type=text],.pure-form input[type=time],.pure-form input[type=url],.pure-form input[type=week],.pure-form label{margin-bottom:.3em;display:block}.pure-group input:not([type]),.pure-group input[type=color],.pure-group input[type=date],.pure-group input[type=datetime-local],.pure-group input[type=datetime],.pure-group input[type=email],.pure-group input[type=month],.pure-group input[type=number],.pure-group input[type=password],.pure-group input[type=search],.pure-group input[type=tel],.pure-group input[type=text],.pure-group input[type=time],.pure-group input[type=url],.pure-group input[type=week]{margin-bottom:0}.pure-form-aligned .pure-control-group label{margin-bottom:.3em;text-align:left;display:block;width:100%}.pure-form-aligned .pure-controls{margin:1.5em 0 0 0}.pure-form-message,.pure-form-message-inline{display:block;font-size:.75em;padding:.2em 0 .8em}}.pure-menu{-webkit-box-sizing:border-box;box-sizing:border-box}.pure-menu-fixed{position:fixed;left:0;top:0;z-index:3}.pure-menu-item,.pure-menu-list{position:relative}.pure-menu-list{list-style:none;margin:0;padding:0}.pure-menu-item{padding:0;margin:0;height:100%}.pure-menu-heading,.pure-menu-link{display:block;text-decoration:none;white-space:nowrap}.pure-menu-horizontal{width:100%;white-space:nowrap}.pure-menu-horizontal .pure-menu-list{display:inline-block}.pure-menu-horizontal .pure-menu-heading,.pure-menu-horizontal .pure-menu-item,.pure-menu-horizontal .pure-menu-separator{display:inline-block;vertical-align:middle}.pure-menu-item .pure-menu-item{display:block}.pure-menu-children{display:none;position:absolute;left:100%;top:0;margin:0;padding:0;z-index:3}.pure-menu-horizontal .pure-menu-children{left:0;top:auto;width:inherit}.pure-menu-active>.pure-menu-children,.pure-menu-allow-hover:hover>.pure-menu-children{display:block;position:absolute}.pure-menu-has-children>.pure-menu-link:after{padding-left:.5em;content:"\25B8";font-size:small}.pure-menu-horizontal .pure-menu-has-children>.pure-menu-link:after{content:"\25BE"}.pure-menu-scrollable{overflow-y:scroll;overflow-x:hidden}.pure-menu-scrollable .pure-menu-list{display:block}.pure-menu-horizontal.pure-menu-scrollable .pure-menu-list{display:inline-block}.pure-menu-horizontal.pure-menu-scrollable{white-space:nowrap;overflow-y:hidden;overflow-x:auto;padding:.5em 0}.pure-menu-horizontal .pure-menu-children .pure-menu-separator,.pure-menu-separator{background-color:#ccc;height:1px;margin:.3em 0}.pure-menu-horizontal .pure-menu-separator{width:1px;height:1.3em;margin:0 .3em}.pure-menu-horizontal .pure-menu-children .pure-menu-separator{display:block;width:auto}.pure-menu-heading{text-transform:uppercase;color:#565d64}.pure-menu-link{color:#777}.pure-menu-children{background-color:#fff}.pure-menu-disabled,.pure-menu-heading,.pure-menu-link{padding:.5em 1em}.pure-menu-disabled{opacity:.5}.pure-menu-disabled .pure-menu-link:hover{background-color:transparent}.pure-menu-active>.pure-menu-link,.pure-menu-link:focus,.pure-menu-link:hover{background-color:#eee}.pure-menu-selected>.pure-menu-link,.pure-menu-selected>.pure-menu-link:visited{color:#000}.pure-table{border-collapse:collapse;border-spacing:0;empty-cells:show;border:1px solid #cbcbcb}.pure-table caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.pure-table td,.pure-table th{border-left:1px solid #cbcbcb;border-width:0 0 0 1px;font-size:inherit;margin:0;overflow:visible;padding:.5em 1em}.pure-table thead{background-color:#e0e0e0;color:#000;text-align:left;vertical-align:bottom}.pure-table td{background-color:transparent}.pure-table-odd td{background-color:#f2f2f2}.pure-table-striped tr:nth-child(2n-1) td{background-color:#f2f2f2}.pure-table-bordered td{border-bottom:1px solid #cbcbcb}.pure-table-bordered tbody>tr:last-child>td{border-bottom-width:0}.pure-table-horizontal td,.pure-table-horizontal th{border-width:0 0 1px 0;border-bottom:1px solid #cbcbcb}.pure-table-horizontal tbody>tr:last-child>td{border-bottom-width:0} \ No newline at end of file +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{-webkit-box-sizing:border-box;box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}template{display:none}[hidden]{display:none}html{font-family:sans-serif}.hidden,[hidden]{display:none!important}.pure-img{max-width:100%;height:auto}.pure-g{letter-spacing:-.31em;text-rendering:optimizespeed;font-family:FreeSans,Arimo,"Droid Sans",Helvetica,Arial,sans-serif;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-line-pack:start;align-content:flex-start}@media all and (-ms-high-contrast:none),(-ms-high-contrast:active){table .pure-g{display:block}}.opera-only :-o-prefocus,.pure-g{word-spacing:-.43em}.pure-u{display:inline-block;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-g [class*=pure-u]{font-family:sans-serif}.pure-u-1,.pure-u-1-1,.pure-u-1-12,.pure-u-1-2,.pure-u-1-24,.pure-u-1-3,.pure-u-1-4,.pure-u-1-5,.pure-u-1-6,.pure-u-1-8,.pure-u-10-24,.pure-u-11-12,.pure-u-11-24,.pure-u-12-24,.pure-u-13-24,.pure-u-14-24,.pure-u-15-24,.pure-u-16-24,.pure-u-17-24,.pure-u-18-24,.pure-u-19-24,.pure-u-2-24,.pure-u-2-3,.pure-u-2-5,.pure-u-20-24,.pure-u-21-24,.pure-u-22-24,.pure-u-23-24,.pure-u-24-24,.pure-u-3-24,.pure-u-3-4,.pure-u-3-5,.pure-u-3-8,.pure-u-4-24,.pure-u-4-5,.pure-u-5-12,.pure-u-5-24,.pure-u-5-5,.pure-u-5-6,.pure-u-5-8,.pure-u-6-24,.pure-u-7-12,.pure-u-7-24,.pure-u-7-8,.pure-u-8-24,.pure-u-9-24{display:inline-block;letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-u-1-24{width:4.1667%}.pure-u-1-12,.pure-u-2-24{width:8.3333%}.pure-u-1-8,.pure-u-3-24{width:12.5%}.pure-u-1-6,.pure-u-4-24{width:16.6667%}.pure-u-1-5{width:20%}.pure-u-5-24{width:20.8333%}.pure-u-1-4,.pure-u-6-24{width:25%}.pure-u-7-24{width:29.1667%}.pure-u-1-3,.pure-u-8-24{width:33.3333%}.pure-u-3-8,.pure-u-9-24{width:37.5%}.pure-u-2-5{width:40%}.pure-u-10-24,.pure-u-5-12{width:41.6667%}.pure-u-11-24{width:45.8333%}.pure-u-1-2,.pure-u-12-24{width:50%}.pure-u-13-24{width:54.1667%}.pure-u-14-24,.pure-u-7-12{width:58.3333%}.pure-u-3-5{width:60%}.pure-u-15-24,.pure-u-5-8{width:62.5%}.pure-u-16-24,.pure-u-2-3{width:66.6667%}.pure-u-17-24{width:70.8333%}.pure-u-18-24,.pure-u-3-4{width:75%}.pure-u-19-24{width:79.1667%}.pure-u-4-5{width:80%}.pure-u-20-24,.pure-u-5-6{width:83.3333%}.pure-u-21-24,.pure-u-7-8{width:87.5%}.pure-u-11-12,.pure-u-22-24{width:91.6667%}.pure-u-23-24{width:95.8333%}.pure-u-1,.pure-u-1-1,.pure-u-24-24,.pure-u-5-5{width:100%}.pure-button{display:inline-block;line-height:normal;white-space:nowrap;vertical-align:middle;text-align:center;cursor:pointer;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-box-sizing:border-box;box-sizing:border-box}.pure-button::-moz-focus-inner{padding:0;border:0}.pure-button-group{letter-spacing:-.31em;text-rendering:optimizespeed}.opera-only :-o-prefocus,.pure-button-group{word-spacing:-.43em}.pure-button-group .pure-button{letter-spacing:normal;word-spacing:normal;vertical-align:top;text-rendering:auto}.pure-button{font-family:inherit;font-size:100%;padding:.5em 1em;color:rgba(0,0,0,.8);border:none transparent;background-color:#e6e6e6;text-decoration:none;border-radius:2px}.pure-button-hover,.pure-button:focus,.pure-button:hover{background-image:-webkit-gradient(linear,left top,left bottom,from(transparent),color-stop(40%,rgba(0,0,0,.05)),to(rgba(0,0,0,.1)));background-image:linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.1))}.pure-button:focus{outline:0}.pure-button-active,.pure-button:active{-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.15) inset,0 0 6px rgba(0,0,0,.2) inset;box-shadow:0 0 0 1px rgba(0,0,0,.15) inset,0 0 6px rgba(0,0,0,.2) inset;border-color:#000}.pure-button-disabled,.pure-button-disabled:active,.pure-button-disabled:focus,.pure-button-disabled:hover,.pure-button[disabled]{border:none;background-image:none;opacity:.4;cursor:not-allowed;-webkit-box-shadow:none;box-shadow:none;pointer-events:none}.pure-button-hidden{display:none}.pure-button-primary,.pure-button-selected,a.pure-button-primary,a.pure-button-selected{background-color:#0078e7;color:#fff}.pure-button-group .pure-button{margin:0;border-radius:0;border-right:1px solid rgba(0,0,0,.2)}.pure-button-group .pure-button:first-child{border-top-left-radius:2px;border-bottom-left-radius:2px}.pure-button-group .pure-button:last-child{border-top-right-radius:2px;border-bottom-right-radius:2px;border-right:none}.pure-form input[type=color],.pure-form input[type=date],.pure-form input[type=datetime-local],.pure-form input[type=datetime],.pure-form input[type=email],.pure-form input[type=month],.pure-form input[type=number],.pure-form input[type=password],.pure-form input[type=search],.pure-form input[type=tel],.pure-form input[type=text],.pure-form input[type=time],.pure-form input[type=url],.pure-form input[type=week],.pure-form select,.pure-form textarea{padding:.5em .6em;display:inline-block;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 3px #ddd;box-shadow:inset 0 1px 3px #ddd;border-radius:4px;vertical-align:middle;-webkit-box-sizing:border-box;box-sizing:border-box}.pure-form input:not([type]){padding:.5em .6em;display:inline-block;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 3px #ddd;box-shadow:inset 0 1px 3px #ddd;border-radius:4px;-webkit-box-sizing:border-box;box-sizing:border-box}.pure-form input[type=color]{padding:.2em .5em}.pure-form input[type=color]:focus,.pure-form input[type=date]:focus,.pure-form input[type=datetime-local]:focus,.pure-form input[type=datetime]:focus,.pure-form input[type=email]:focus,.pure-form input[type=month]:focus,.pure-form input[type=number]:focus,.pure-form input[type=password]:focus,.pure-form input[type=search]:focus,.pure-form input[type=tel]:focus,.pure-form input[type=text]:focus,.pure-form input[type=time]:focus,.pure-form input[type=url]:focus,.pure-form input[type=week]:focus,.pure-form select:focus,.pure-form textarea:focus{outline:0;border-color:#129fea}.pure-form input:not([type]):focus{outline:0;border-color:#129fea}.pure-form input[type=checkbox]:focus,.pure-form input[type=file]:focus,.pure-form input[type=radio]:focus{outline:thin solid #129fea;outline:1px auto #129fea}.pure-form .pure-checkbox,.pure-form .pure-radio{margin:.5em 0;display:block}.pure-form input[type=color][disabled],.pure-form input[type=date][disabled],.pure-form input[type=datetime-local][disabled],.pure-form input[type=datetime][disabled],.pure-form input[type=email][disabled],.pure-form input[type=month][disabled],.pure-form input[type=number][disabled],.pure-form input[type=password][disabled],.pure-form input[type=search][disabled],.pure-form input[type=tel][disabled],.pure-form input[type=text][disabled],.pure-form input[type=time][disabled],.pure-form input[type=url][disabled],.pure-form input[type=week][disabled],.pure-form select[disabled],.pure-form textarea[disabled]{cursor:not-allowed;background-color:#eaeded;color:#cad2d3}.pure-form input:not([type])[disabled]{cursor:not-allowed;background-color:#eaeded;color:#cad2d3}.pure-form input[readonly],.pure-form select[readonly],.pure-form textarea[readonly]{background-color:#eee;color:#777;border-color:#ccc}.pure-form input:focus:invalid,.pure-form select:focus:invalid,.pure-form textarea:focus:invalid{color:#b94a48;border-color:#e9322d}.pure-form input[type=checkbox]:focus:invalid:focus,.pure-form input[type=file]:focus:invalid:focus,.pure-form input[type=radio]:focus:invalid:focus{outline-color:#e9322d}.pure-form select{height:2.25em;border:1px solid #ccc;background-color:#fff}.pure-form select[multiple]{height:auto}.pure-form label{margin:.5em 0 .2em}.pure-form fieldset{margin:0;padding:.35em 0 .75em;border:0}.pure-form legend{display:block;width:100%;padding:.3em 0;margin-bottom:.3em;color:#333;border-bottom:1px solid #e5e5e5}.pure-form-stacked input[type=color],.pure-form-stacked input[type=date],.pure-form-stacked input[type=datetime-local],.pure-form-stacked input[type=datetime],.pure-form-stacked input[type=email],.pure-form-stacked input[type=file],.pure-form-stacked input[type=month],.pure-form-stacked input[type=number],.pure-form-stacked input[type=password],.pure-form-stacked input[type=search],.pure-form-stacked input[type=tel],.pure-form-stacked input[type=text],.pure-form-stacked input[type=time],.pure-form-stacked input[type=url],.pure-form-stacked input[type=week],.pure-form-stacked label,.pure-form-stacked select,.pure-form-stacked textarea{display:block;margin:.25em 0}.pure-form-stacked input:not([type]){display:block;margin:.25em 0}.pure-form-aligned input,.pure-form-aligned select,.pure-form-aligned textarea,.pure-form-message-inline{display:inline-block;vertical-align:middle}.pure-form-aligned textarea{vertical-align:top}.pure-form-aligned .pure-control-group{margin-bottom:.5em}.pure-form-aligned .pure-control-group label{text-align:right;display:inline-block;vertical-align:middle;width:10em;margin:0 1em 0 0}.pure-form-aligned .pure-controls{margin:1.5em 0 0 11em}.pure-form .pure-input-rounded,.pure-form input.pure-input-rounded{border-radius:2em;padding:.5em 1em}.pure-form .pure-group fieldset{margin-bottom:10px}.pure-form .pure-group input,.pure-form .pure-group textarea{display:block;padding:10px;margin:0 0 -1px;border-radius:0;position:relative;top:-1px}.pure-form .pure-group input:focus,.pure-form .pure-group textarea:focus{z-index:3}.pure-form .pure-group input:first-child,.pure-form .pure-group textarea:first-child{top:1px;border-radius:4px 4px 0 0;margin:0}.pure-form .pure-group input:first-child:last-child,.pure-form .pure-group textarea:first-child:last-child{top:1px;border-radius:4px;margin:0}.pure-form .pure-group input:last-child,.pure-form .pure-group textarea:last-child{top:-2px;border-radius:0 0 4px 4px;margin:0}.pure-form .pure-group button{margin:.35em 0}.pure-form .pure-input-1{width:100%}.pure-form .pure-input-3-4{width:75%}.pure-form .pure-input-2-3{width:66%}.pure-form .pure-input-1-2{width:50%}.pure-form .pure-input-1-3{width:33%}.pure-form .pure-input-1-4{width:25%}.pure-form-message-inline{display:inline-block;padding-left:.3em;color:#666;vertical-align:middle;font-size:.875em}.pure-form-message{display:block;color:#666;font-size:.875em}@media only screen and (max-width :480px){.pure-form button[type=submit]{margin:.7em 0 0}.pure-form input:not([type]),.pure-form input[type=color],.pure-form input[type=date],.pure-form input[type=datetime-local],.pure-form input[type=datetime],.pure-form input[type=email],.pure-form input[type=month],.pure-form input[type=number],.pure-form input[type=password],.pure-form input[type=search],.pure-form input[type=tel],.pure-form input[type=text],.pure-form input[type=time],.pure-form input[type=url],.pure-form input[type=week],.pure-form label{margin-bottom:.3em;display:block}.pure-group input:not([type]),.pure-group input[type=color],.pure-group input[type=date],.pure-group input[type=datetime-local],.pure-group input[type=datetime],.pure-group input[type=email],.pure-group input[type=month],.pure-group input[type=number],.pure-group input[type=password],.pure-group input[type=search],.pure-group input[type=tel],.pure-group input[type=text],.pure-group input[type=time],.pure-group input[type=url],.pure-group input[type=week]{margin-bottom:0}.pure-form-aligned .pure-control-group label{margin-bottom:.3em;text-align:left;display:block;width:100%}.pure-form-aligned .pure-controls{margin:1.5em 0 0 0}.pure-form-message,.pure-form-message-inline{display:block;font-size:.75em;padding:.2em 0 .8em}}.pure-menu{-webkit-box-sizing:border-box;box-sizing:border-box}.pure-menu-fixed{position:fixed;left:0;top:0;z-index:3}.pure-menu-item,.pure-menu-list{position:relative}.pure-menu-list{list-style:none;margin:0;padding:0}.pure-menu-item{padding:0;margin:0;height:100%}.pure-menu-heading,.pure-menu-link{display:block;text-decoration:none;white-space:nowrap}.pure-menu-horizontal{width:100%;white-space:nowrap}.pure-menu-horizontal .pure-menu-list{display:inline-block}.pure-menu-horizontal .pure-menu-heading,.pure-menu-horizontal .pure-menu-item,.pure-menu-horizontal .pure-menu-separator{display:inline-block;vertical-align:middle}.pure-menu-item .pure-menu-item{display:block}.pure-menu-children{display:none;position:absolute;left:100%;top:0;margin:0;padding:0;z-index:3}.pure-menu-horizontal .pure-menu-children{left:0;top:auto;width:inherit}.pure-menu-active>.pure-menu-children,.pure-menu-allow-hover:hover>.pure-menu-children{display:block;position:absolute}.pure-menu-has-children>.pure-menu-link:after{padding-left:.5em;content:"\25B8";font-size:small}.pure-menu-horizontal .pure-menu-has-children>.pure-menu-link:after{content:"\25BE"}.pure-menu-scrollable{overflow-y:scroll;overflow-x:hidden}.pure-menu-scrollable .pure-menu-list{display:block}.pure-menu-horizontal.pure-menu-scrollable .pure-menu-list{display:inline-block}.pure-menu-horizontal.pure-menu-scrollable{white-space:nowrap;overflow-y:hidden;overflow-x:auto;padding:.5em 0}.pure-menu-horizontal .pure-menu-children .pure-menu-separator,.pure-menu-separator{background-color:#ccc;height:1px;margin:.3em 0}.pure-menu-horizontal .pure-menu-separator{width:1px;height:1.3em;margin:0 .3em}.pure-menu-horizontal .pure-menu-children .pure-menu-separator{display:block;width:auto}.pure-menu-heading{text-transform:uppercase;color:#565d64}.pure-menu-link{color:#777}.pure-menu-children{background-color:#fff}.pure-menu-disabled,.pure-menu-heading,.pure-menu-link{padding:.5em 1em}.pure-menu-disabled{opacity:.5}.pure-menu-disabled .pure-menu-link:hover{background-color:transparent}.pure-menu-active>.pure-menu-link,.pure-menu-link:focus,.pure-menu-link:hover{background-color:#eee}.pure-menu-selected>.pure-menu-link,.pure-menu-selected>.pure-menu-link:visited{color:#000}.pure-table{border-collapse:collapse;border-spacing:0;empty-cells:show;border:1px solid #cbcbcb}.pure-table caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.pure-table td,.pure-table th{border-left:1px solid #cbcbcb;border-width:0 0 0 1px;font-size:inherit;margin:0;overflow:visible;padding:.5em 1em}.pure-table thead{background-color:#e0e0e0;color:#000;text-align:left;vertical-align:bottom}.pure-table td{background-color:transparent}.pure-table-odd td{background-color:#f2f2f2}.pure-table-striped tr:nth-child(2n-1) td{background-color:#f2f2f2}.pure-table-bordered td{border-bottom:1px solid #cbcbcb}.pure-table-bordered tbody>tr:last-child>td{border-bottom-width:0}.pure-table-horizontal td,.pure-table-horizontal th{border-width:0 0 1px 0;border-bottom:1px solid #cbcbcb}.pure-table-horizontal tbody>tr:last-child>td{border-bottom-width:0} \ No newline at end of file diff --git a/luci-theme-argone/htdocs/luci-static/argone/favicon.ico b/luci-theme-argone/htdocs/luci-static/argone/favicon.ico index 79c8f860a..461133680 100644 Binary files a/luci-theme-argone/htdocs/luci-static/argone/favicon.ico and b/luci-theme-argone/htdocs/luci-static/argone/favicon.ico differ diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/android-icon-192x192.png b/luci-theme-argone/htdocs/luci-static/argone/icon/android-icon-192x192.png index 7bfe4e5fd..7c17009d3 100644 Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/android-icon-192x192.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/android-icon-192x192.png differ diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-144x144.png b/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-144x144.png index 8d523df8b..5308d66b7 100644 Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-144x144.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-144x144.png differ diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-60x60.png b/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-60x60.png index 4c80656de..f18dfa49c 100644 Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-60x60.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-60x60.png differ diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-72x72.png b/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-72x72.png index 07753022e..bb3e24233 100644 Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-72x72.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/apple-icon-72x72.png differ diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-16x16.png b/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-16x16.png index 88bf32978..308843a09 100644 Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-16x16.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-16x16.png differ diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-32x32.png b/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-32x32.png index d524df3ea..bfcd09707 100644 Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-32x32.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-32x32.png differ diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-96x96.png b/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-96x96.png index 6c8e88740..d0fe1ed09 100644 Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-96x96.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/favicon-96x96.png differ diff --git a/luci-theme-argone/htdocs/luci-static/argone/icon/ms-icon-144x144.png b/luci-theme-argone/htdocs/luci-static/argone/icon/ms-icon-144x144.png index 8d523df8b..5308d66b7 100644 Binary files a/luci-theme-argone/htdocs/luci-static/argone/icon/ms-icon-144x144.png and b/luci-theme-argone/htdocs/luci-static/argone/icon/ms-icon-144x144.png differ diff --git a/luci-theme-argone/htdocs/luci-static/argone/img/argone.svg b/luci-theme-argone/htdocs/luci-static/argone/img/argone.svg index 0c8aea07d..654e2fe24 100644 --- a/luci-theme-argone/htdocs/luci-static/argone/img/argone.svg +++ b/luci-theme-argone/htdocs/luci-static/argone/img/argone.svg @@ -1,37 +1,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/luci-theme-argone/htdocs/luci-static/argone/js/color_calc-argone.js b/luci-theme-argone/htdocs/luci-static/argone/js/color_calc-argone.js deleted file mode 100644 index bf7d7948b..000000000 --- a/luci-theme-argone/htdocs/luci-static/argone/js/color_calc-argone.js +++ /dev/null @@ -1,72 +0,0 @@ -/* - * The background color of the [Light Mode] subtabs follow the custom primary color and reduce its transparency - * Author: SpeedPartner - */ - -/* - * Get hex for the [Light mode] Primary Color ,then reduce it to 25% transparency and convert it to RGBA value - */ - const hexColor_primary_light = getComputedStyle(document.documentElement).getPropertyValue('--primary').replace(/\s/, ""); - const hexToRgba_primary_light = (hex) => { - const r = parseInt(hex.substring(1, 3), 16); - const g = parseInt(hex.substring(3, 5), 16); - const b = parseInt(hex.substring(5, 7), 16); - const a = 0.15 - return [r, g, b].map(x => x.toFixed()).concat(a); - }; - const rgbaColor_primary_light = hexToRgba_primary_light(hexColor_primary_light); - console.log(rgbaColor_primary_light); - -/* - * Constitute a css color variable named light-subtabs-background - */ - document.documentElement.style.setProperty('--light-subtabs-background', `rgba(`+rgbaColor_primary_light+`)`); - - -/* - * Improved link font color that follows custom [Dark mode] Primary Color - * Author: SpeedPartner - */ - -/* - * Get hex for the [Dark mode] Primary Color ,then reduce it to 70% transparency and convert it to RGB value - */ - const hexColor_primary = getComputedStyle(document.documentElement).getPropertyValue('--dark-primary').replace(/\s/, ""); - const hexToRgb_primary = (hex) => { - const r = parseInt(hex.substring(1, 3), 16); - const g = parseInt(hex.substring(3, 5), 16); - const b = parseInt(hex.substring(5, 7), 16); - const a = 0.7 - return [r*a, g*a, b*a].map(x => x.toFixed(2)); - }; - const rgbColor_primary = hexToRgb_primary(hexColor_primary); - //console.log(rgbColor_primary); - -/* - * Constitute overlay color #cccccc, then reduce it to 30% transparency and convert it to RGB value - */ - const hexColor_overlay = "#cccccc"; - const hexToRgb_overlay = (hex) => { - const r = parseInt(hex.substring(1, 3), 16); - const g = parseInt(hex.substring(3, 5), 16); - const b = parseInt(hex.substring(5, 7), 16); - const a = 0.3 - return [r*a, g*a, b*a].map(x => x.toFixed(2)); - }; - const rgbColor_overlay = hexToRgb_overlay(hexColor_overlay); - //console.log(rgbColor_overlay); - -/* - * Overlay the RGB value of two colors - */ - const New_Color = [ - Math.round(Number(rgbColor_primary[0]) + Number(rgbColor_overlay[0])), - Math.round(Number(rgbColor_primary[1]) + Number(rgbColor_overlay[1])), - Math.round(Number(rgbColor_primary[2]) + Number(rgbColor_overlay[2])) - ]; - //console.log(New_Color); - -/* - * Constitute a css color variable named dark_webkit-any-link - */ - document.documentElement.style.setProperty('--dark_webkit-any-link', `rgb(`+New_Color+`)`); diff --git a/luci-theme-argone/htdocs/luci-static/argone/js/menu-argone.js b/luci-theme-argone/htdocs/luci-static/argone/js/menu-argone.js index ff23dd96a..7547c39d3 100644 --- a/luci-theme-argone/htdocs/luci-static/argone/js/menu-argone.js +++ b/luci-theme-argone/htdocs/luci-static/argone/js/menu-argone.js @@ -2,7 +2,6 @@ * Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template * * luci-theme-argone - * Copyright 2023 Jerrykuku * * Have a bug? Please create an issue here on GitHub! * https://github.com/kenzok78/luci-theme-argone/issues diff --git a/luci-theme-argone/htdocs/luci-static/argone/js/sidebar-argone.js b/luci-theme-argone/htdocs/luci-static/argone/js/sidebar-argone.js index c5192884a..b8d94afb7 100644 --- a/luci-theme-argone/htdocs/luci-static/argone/js/sidebar-argone.js +++ b/luci-theme-argone/htdocs/luci-static/argone/js/sidebar-argone.js @@ -2,7 +2,6 @@ * Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template * * luci-theme-argone - * Copyright 2023 Jerrykuku * * Have a bug? Please create an issue here on GitHub! * https://github.com/kenzok78/luci-theme-argone/issues diff --git a/luci-theme-argone/htdocs/luci-static/argone/js/styles-argone.js b/luci-theme-argone/htdocs/luci-static/argone/js/styles-argone.js index b2689e099..459105d67 100644 --- a/luci-theme-argone/htdocs/luci-static/argone/js/styles-argone.js +++ b/luci-theme-argone/htdocs/luci-static/argone/js/styles-argone.js @@ -2,7 +2,6 @@ * Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template * * luci-theme-argone - * Copyright 2023 Jerrykuku * * Have a bug? Please create an issue here on GitHub! * https://github.com/kenzok78/luci-theme-argone/issues diff --git a/luci-theme-argone/htdocs/luci-static/argone/less/cascade.less b/luci-theme-argone/htdocs/luci-static/argone/less/cascade.less index cb8795438..5e15911f7 100644 --- a/luci-theme-argone/htdocs/luci-static/argone/less/cascade.less +++ b/luci-theme-argone/htdocs/luci-static/argone/less/cascade.less @@ -1,8 +1,8 @@ +// compress: false /** * Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template * * luci-theme-argone - * Copyright 2020 Jerryk * * Have a bug? Please create an issue here on GitHub! * https://github.com/kenzok78/luci-theme-argone/issues @@ -57,7 +57,7 @@ --warning: #fb6340; --footer-color: #aaa; --menubar-background: #fff; - --menubar-scrollbar-thumb: #eee; + --menubar-scrollbar-thumb: #f6f9fc; --menubar-text-color: #4c4c4c; --blue: #5e72e4; --indigo: #5603ad; @@ -178,42 +178,14 @@ body { color: var(--white); } -::-webkit-scrollbar { - width: 10px; - height: 10px; -} - -::-webkit-scrollbar, -::-webkit-scrollbar-corner { - background: transparent; -} - -::-webkit-scrollbar-thumb { - background: #9e9e9e; -} - -::-webkit-scrollbar-thumb:hover { - background: #757575; -} - -::-webkit-scrollbar-thumb:active { - background: #424242; -} - a:link, a:visited, a:active { + color: #5e72e4; color: var(--primary); text-decoration: none; } -a:-webkit-any-link:not(li a, .main-left a, .brand, .pull-right a, .alert-message a, .login-container footer a, .cbi-button) { - color: -webkit-link; - cursor: pointer; - color: var(--primary); - text-shadow: 1px 1px 2px #ccc; -} - a:hover { text-decoration: underline; } @@ -284,8 +256,7 @@ li { video { width: 100%; - height: 100%; - object-fit: cover; + height: auto; } } @@ -347,19 +318,26 @@ li { max-width: 420px; background-color: #fff; background-color: var(--white); - overflow:hidden; .brand { display: flex; -webkit-box-align: center; align-items: center; - margin: 50px auto 15px auto; + margin: 50px auto 100px 50px; color: #525461; color: var(--default); .icon { width: 50px; height: auto; + margin-right: 25px; + } + + .brand-text { + font-size: 1.25rem; + font-weight: 700; + font-family: "TypoGraphica"; + } &:hover { @@ -367,25 +345,8 @@ li { } } - .brand-text { - font-size: 1.8rem; - font-weight: 700; - letter-spacing: 1px; - margin-bottom: 85px; - font-family: "TypoGraphica"; - width: 420px; - padding: 0 0.5rem 0.1rem 0.5rem; - text-align: center; - word-break: break-word; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - } - .form-login { - width: 420px; + width: 100%; padding: 20px 50px; box-sizing: border-box; @@ -525,14 +486,6 @@ li { display: block; } } - - footer { - color: var(--default); - - a { - color: var(--default); - } - } } } @@ -629,9 +582,13 @@ footer { text-align: right; padding: 1rem; + color: #aaa; + color: var(--footer-color); font-size: 0.8rem; a { + color: #aaa; + color: var(--footer-color); text-decoration: none; } } @@ -678,7 +635,6 @@ footer { position: fixed; z-index: 100; transition: width 0.2s ease-in-out; - overflow-y: scroll; &::-webkit-scrollbar { width: 5px; @@ -692,7 +648,8 @@ footer { } &::-webkit-scrollbar-track { - background-color: transparent; + background-color: #fff; + background-color: var(--menubar-background); } .sidenav-header { @@ -831,7 +788,6 @@ footer { color: #fff; background: #5e72e4; background: var(--primary); - box-shadow: 0 0 1px #ccc; a { color: #000; @@ -946,7 +902,6 @@ footer { background-color: #5e72e4; background-color: var(--primary); transition: all 0.2s; - box-shadow: 0 0 1px #ccc; } &:hover::after { @@ -1155,6 +1110,10 @@ form.inline+form.inline, border-color: var(--primary) !important; } +.cbi-button-add { + margin-left: 1.5rem; +} + .node-services-vssr .ssr-button { margin-left: 0.3rem; @@ -1233,25 +1192,23 @@ select { text-align: center; } + + /*textarea*/ -textarea { - border: 1px solid #dee2e6 !important; - outline: none; - min-height: 14rem !important; - padding: 0.8rem !important; - background-color: #fff; - font-family: var(--font-family-monospace) !important; - font-size: inherit; + +.cbi-input-textarea { + width: 100%; + min-height: 14rem; + padding: 0.8rem; + font-size: 0.8rem; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; color: black; - border-radius: 0.375rem !important; - vertical-align: middle; } -.cbi-value .cbi-value-field textarea { - margin: 0.25rem; -} + /* change */ + .uci-change-list { font-family: monospace; } @@ -1349,6 +1306,8 @@ input[type="checkbox"] { } input[type="checkbox"]:checked { + border: 1px solid #5e72e4; + border: 1px solid var(--primary); background-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 8 8\'%3e%3cpath fill=\'%23fff\' d=\'M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z\'/%3e%3c/svg%3e') !important; background-color: #5e72e4; background-color: var(--primary); @@ -1377,6 +1336,8 @@ ul li .cbi-input-checkbox { } .cbi-input-radio:checked { + border: 1px solid #5e72e4; + border: 1px solid var(--primary); background-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'-4 -4 8 8\'%3e%3ccircle r=\'3\' fill=\'%23fff\'/%3e%3c/svg%3e') !important; background-color: #5e72e4; background-color: var(--primary); @@ -1507,8 +1468,7 @@ div.cbi-value var, td.cbi-value-field var, .td.cbi-value-field var { font-style: italic; - color: var(--primary); - text-shadow: 1px 1px 2px #ccc; + color: #0069D6; } small { @@ -1689,16 +1649,7 @@ input[name="nslookup"] { background-color: var(--primary) !important; background-image: url(../img/trafficbar.png); background-position: left top; - animation: sparkle 1000ms linear infinite; -} - -#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 { - text-shadow: 1px 1px 2px #ccc; + animation: sparkle 1500ms linear infinite; } /* fix multiple table */ @@ -2009,6 +1960,11 @@ th h6, td h6 { background: var(--lighter); } +/* OCD: Change the background color of the "now in use" node in PassWall */ +.cbi-section-table>tbody>._now_use { + background: #5e72e473 !important; +} + /* language fix */ body.lang_pl.node-main-login .cbi-value-title { width: 12rem; @@ -2154,7 +2110,7 @@ body.lang_pl.node-main-login .cbi-value-title { .cbi-rowstyle-2 .cbi-button-up, .cbi-rowstyle-2 .cbi-button-down { - background-color: var(--lighter); + background-color: #FFF !important; } @@ -2204,8 +2160,7 @@ input { margin: 0.25rem; } -select:not([multiple="multiple"]):hover, -input:hover, +select:not([multiple="multiple"]):focus, input:focus { border-color: #5e72e4; border-color: var(--primary); @@ -2489,7 +2444,7 @@ h3 { letter-spacing: 0.1rem; padding: 1rem 1.5rem; border-radius: 0.375rem; - background: var(--lighter); + background: #fff; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.03); } @@ -2543,8 +2498,6 @@ fieldset.cbi-section p { letter-spacing: 0.1rem; color: #32325d; font-weight: 600; - position: sticky; - left: 0; } table { @@ -2637,24 +2590,16 @@ td>table>tbody>tr>td { overflow-x: auto; &::-webkit-scrollbar { - width: 5px; + width: 1px; height: 5px; } &::-webkit-scrollbar-thumb { - background-color: #9e9e9e; - } - - &::-webkit-scrollbar-thumb:hover { - background-color: #757575; - } - - &::-webkit-scrollbar-thumb:active { - background-color: #424242; + background-color: #f6f9fc } &::-webkit-scrollbar-track { - background-color: transparent; + background-color: #fff; } li[class~="active"], @@ -2664,7 +2609,7 @@ td>table>tbody>tr>td { border-bottom: 0.18751rem solid var(--primary); color: #5e72e4; color: var(--primary); - background-color: var(--light-subtabs-background); + background-color: #dce1fe; margin-bottom: 0; border-radius: 0; @@ -2693,14 +2638,6 @@ td>table>tbody>tr>td { } } -.cbi-section::-webkit-scrollbar, -.cbi-section > *::-webkit-scrollbar, -textarea::-webkit-scrollbar, -div::-webkit-scrollbar { - width: 5px; - height: 5px; -} - .cbi-tabmenu { color: white; padding: 0.5rem 0.5rem 0 0.5rem; @@ -2714,23 +2651,15 @@ div::-webkit-scrollbar { } &::-webkit-scrollbar-thumb { - background-color: #9e9e9e; + background-color: #f6f9fc } - &::-webkit-scrollbar-thumb:hover { - background-color: #757575; - } - - &::-webkit-scrollbar-thumb:active { - background-color: t#424242; - } - - &::-webkit-scrollbar-track { - background-color: transparent; + &::-webkit-scrollbar-track { + background-color: #fff; } li { - background: #e3e3e3; + background: #dce3e9; display: inline-block; font-size: 0.875rem; border-top-left-radius: 0.25rem; @@ -2750,7 +2679,7 @@ div::-webkit-scrollbar { border-bottom: 0.18751rem solid var(--primary); color: #5e72e4; color: var(--primary); - background-color: var(--light-subtabs-background); + background-color: #dce1fe; margin-bottom: 0; a { @@ -2763,7 +2692,7 @@ div::-webkit-scrollbar { border-bottom: 0.18751rem solid #5e72e4; border-bottom: 0.18751rem solid var(--primary); color: var(--primary); - background-color: var(--light-subtabs-background); + background-color: #dce1fe; margin-bottom: 0; a { @@ -3042,8 +2971,7 @@ select[multiple="multiple"] { } -.cbi-tabcontainer>.cbi-value:nth-of-type(2n), -.cbi-tabcontainer>.cbi-value:nth-of-type(2n)>textarea { +.cbi-tabcontainer>.cbi-value:nth-of-type(2n) { background-color: #f9f9f9; } @@ -3052,6 +2980,7 @@ select[multiple="multiple"] { display: table-cell; line-height: 1.6; font-size: 0.875rem; + } /* Fix text position of the luci-app-filebrowser running state */ @@ -3077,9 +3006,8 @@ form>.cbi-map>.cbi-section>.cbi-section-node>.cbi-value>.cbi-value-field font { } .cbi-value-description { - color: #8d8d8d; - opacity: 0.8; font-size: small; + opacity: 0.5; padding: 0.5rem; } @@ -3170,11 +3098,25 @@ td>.ifacebadge { margin: 0 0.3rem; } +/*textarea*/ + +.cbi-input-textarea { + width: 100%; + border: 0; + outline: none; + min-height: 14rem; + padding: 0.8rem; + font-size: 0.8rem; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + color: black; +} + #syslog { width: 100%; min-height: 15rem; padding: 1rem; line-height: 1.4em; + font-size: small; color: #1e1e1e; border-radius: 0; background-color: #fff; @@ -3183,6 +3125,14 @@ td>.ifacebadge { } + + + + + + + + .ifacebadge { display: inline-flex; border-bottom: 0px solid #CCCCCC; @@ -3202,7 +3152,7 @@ td>.ifacebadge, .ifacebadge>img { display: inline-block; margin: 0 0.3rem; - align-self: center; + align-self: flex-start; } @@ -3367,6 +3317,18 @@ td>.ifacebadge, padding: 0.5rem; } +div.cbi-value var, +td.cbi-value-field var { + font-style: italic; + color: #0069D6; +} + +small { + font-size: 90%; + white-space: normal; + line-height: 1.42857143; +} + .cbi-optionals { padding: 1rem 1rem 0 1rem; @@ -3488,7 +3450,7 @@ input[name="nslookup"] { height: 100% !important; background-image: url(../img/trafficbar.png); background-position: left top; - animation: sparkle 1000ms linear infinite; + animation: sparkle 1500ms linear infinite; } } @@ -3511,14 +3473,15 @@ input[name="nslookup"] { overflow-y: hidden; em { + padding: 0.75rem 1.5rem; font-size: 0.7rem; font-weight: 600; - color: var(--primary); - text-shadow: 1px 1px 2px #ccc; + color: #525f7f; text-align: center; } h4 { + padding: 0.75rem 1.5rem; font-size: 0.7rem; font-weight: 600; color: #525f7f; @@ -3561,14 +3524,6 @@ input[name="nslookup"] { margin-top: 0; } -.node-system-flashops fieldset > ul { - padding: 1rem; -} - -.node-system-flashops fieldset + .cbi-page-actions { - margin-top: 1rem; -} - .node-status-iptables .cbi-tabmenu, .node-system-packages .cbi-tabmenu, .node-system-flashops .cbi-tabmenu { @@ -3631,99 +3586,6 @@ input[name="nslookup"] { display: block; } -/* luci-app-passwall */ -#cbi-passwall #add_link_div, -#cbi-passwall #set_node_div { - background: #fffffff0; -} -#cbi-passwall .cbi-section-table tbody ._now_use { - background: #5e72e473 !important; -} - -/* luci-app-commands */ -.commandbox h3 { - overflow: hidden; - text-overflow: ellipsis; -} -.commandbox code { - word-break: break-word; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; -} -div.commandbox { - height: 16em; -} - -/* luci-app-ssr-plus */ -#cbi-shadowsocksr .cbi-map-descr h3 { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} - -/* luci-app-mwan3 */ -.node-status-mwan .cbi-tabmenu { - padding: 3rem 0.5rem 0 0.5rem; -} - -/* luci-app-openclash */ -.node-services-openclash .cbi-tabmenu { - font-size: 0; -} -.node-services-openclash .cbi-tabmenu > li { - margin-right: 4px; -} -.node-services-openclash .cbi-tabmenu > li:last-child { - margin-right: 0; -} - -/* luci-app-ddnsto */ -.node-services-ddnsto .cbi-section-node .cbi-value div { - display: table-cell; - line-height: 1.6; - font-size: 0.875rem; -} - -/* luci-app-dockerman */ -#cbi-dockerd > .cbi-section > br, -#cbi-docker > .cbi-section > br { - display: none; -} - -/* luci-app-diskman */ -#cbi-diskman > .cbi-section > br { - display: none; -} - -/* luci-app-istorex (Quick Start) */ -#app #main #page .app-container_body .btn-f, -#app #main #page .app-container_body .btn-r { - -webkit-user-select: none; /* Safari */ - -moz-user-select: none; /* Firefox */ - -ms-user-select: none; /* IE10+/Edge */ - user-select: none; /* Standard */ - width: 30px; -} - -/* luci-app-ttyd */ -.TTYD.node-system-terminal .main { - height: 100%!important; -} -.TTYD.node-system-terminal .main .main-right, -.TTYD.node-system-terminal .main .main-right #maincontent, -.TTYD.node-system-terminal .main .main-right #maincontent .container .cbi-map { - height: 100%!important; - display: flex!important; - flex-direction: column!important; -} -.TTYD.node-system-terminal .main .main-right #maincontent, -.TTYD.node-system-terminal .main .main-right #maincontent .container, -.TTYD.node-system-terminal .main .main-right #maincontent .container .cbi-map #terminal { - flex: 1!important; -} @media screen and (max-width: 1600px) { @@ -3738,7 +3600,7 @@ div.commandbox { } - .cbi-button:not(.cbi-button-up, .cbi-button-down) { + .cbi-button { /*padding: 0.3rem 1.5rem;*/ font-size: 0.8rem; } @@ -3760,6 +3622,10 @@ div.commandbox { padding: 0; } + .cbi-input-textarea { + font-size: small; + } + .node-status-iptables>.main fieldset li>a { padding: 0.3rem 0.6rem; } @@ -3812,6 +3678,30 @@ div.commandbox { } } +@media screen and (min-width: 600px) { + ::-webkit-scrollbar { + width: 10px; + height: 10px; + } + + ::-webkit-scrollbar, + ::-webkit-scrollbar-corner { + background: transparent; + } + + ::-webkit-scrollbar-thumb { + background: #9e9e9e; + } + + ::-webkit-scrollbar-thumb:hover { + background: #757575; + } + + ::-webkit-scrollbar-thumb:active { + background: #424242; + } +} + @media screen and (max-width: 992px) { .main { .main-left { @@ -3872,18 +3762,6 @@ div.commandbox { } -@media screen and (max-width: 500px) { -.login-page { - .login-container { - margin-left: 0rem !important; - width: 500px; - - .login-form { - max-width: 500px; - } - } -} - @media screen and (max-width: 480px) { body { font-size: 0.8rem; @@ -3894,11 +3772,19 @@ div.commandbox { margin-top: 0rem !important; } + .login-page .video { + video { + width: auto !important; + height: 100% !important; + } + } + .login-page .login-container { margin-left: 0rem !important; width: 100%; .login-form { + max-width: 480px; .form-login { .input-group { @@ -4003,9 +3889,13 @@ div.commandbox { } - ::-webkit-scrollbar { - width: 0px !important; - height: 0px !important; + .tabs, + .cbi-tabmenu { + &::-webkit-scrollbar { + width: 0px; + height: 0px; + } + } @@ -4130,4 +4020,4 @@ div.commandbox { } } } -} +} \ No newline at end of file diff --git a/luci-theme-argone/htdocs/luci-static/argone/less/dark.less b/luci-theme-argone/htdocs/luci-static/argone/less/dark.less index 968cada28..e425d66b5 100644 --- a/luci-theme-argone/htdocs/luci-static/argone/less/dark.less +++ b/luci-theme-argone/htdocs/luci-static/argone/less/dark.less @@ -1,8 +1,8 @@ +// compress: true /** * Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argone Template * * luci-theme-argone - * Copyright 2020 Jerryk * * Have a bug? Please create an issue here on GitHub! * https://github.com/kenzok78/luci-theme-argone/issues @@ -47,10 +47,6 @@ body { color: #adb5bd; } - .border { - border-bottom: 1px var(--dark-primary) solid; - } - input { background-color: transparent !important; color: #adb5bd; @@ -84,9 +80,6 @@ body { footer { color: #adb5bd; - a { - color: #adb5bd; - } } } @@ -109,13 +102,12 @@ header::after { .nav { .slide { .slide-menu { - .active { a { - color: #fff !important; + color: #cccccc; &::after { - background-color: var(--dark-primary) !important; + background-color: #cccccc !important; } } } @@ -123,33 +115,22 @@ header::after { li { a { color: #cccccc; + } - &:hover { - background: none !important; - } - - &::after { - background-color: var(--dark-primary) !important; - box-shadow: 0 0 1px #000 !important; - } - + a:hover { + background: none !important; } } } - .menu { - &:hover, - &.active { - background-color: #483d8b !important; - background-color: var(--dark-primary) !important; - color: #fff !important; - box-shadow: 0 0 1px #000 !important; - } - } + .menu.active { + background-color: #483d8b !important; + background-color: var(--dark-primary) !important; + color: #cccccc !important; - .menu[data-title=Status]:before, - .menu[data-title=Control]:before { - color: var(--dark-primary) !important; + a::after { + background-color: #cccccc !important; + } } } @@ -161,7 +142,7 @@ header::after { a:hover { background-color: #483d8b !important; background-color: var(--dark-primary) !important; - color: #fff !important; + color: #cccccc !important; } @@ -173,6 +154,9 @@ header::after { background-color: #252526 !important; } + &::-webkit-scrollbar-track { + background-color: #333; + } } .main-right { @@ -191,31 +175,18 @@ h3 { background: #333333; } -a:link, -a:visited, -a:active { - color: var(--dark_webkit-any-link); +a:-webkit-any-link { + color: -webkit-link; + cursor: pointer; + color: #483d8b; + color: var(--dark-primary); } -a:-webkit-any-link:not(li a, .main-left a, .brand, .pull-right a, .alert-message a, .login-container footer a, .cbi-button) { - color: var(--dark_webkit-any-link) !important; - text-shadow: 1px 1px 2px #000 !important; -} input:-webkit-autofill { background-color: #3c3c3c !important; } -input[type="checkbox"]:checked { - background-color: #483d8b !important; - background-color: var(--dark-primary) !important; -} - -.cbi-input-radio:checked { - background-color: #483d8b !important; - background-color: var(--dark-primary) !important; -} - .cbi-value-field .cbi-input-apply, .cbi-button-apply, .cbi-button-edit { @@ -226,11 +197,14 @@ input[type="checkbox"]:checked { border-color: var(--dark-primary) !important; } + .cbi-section em { - color: var(--dark_webkit-any-link); - text-shadow: 1px 1px 2px #000; + color: #483d8b; + color: var(--dark-primary); } + + header.bg-primary { background-color: #1e1e1e !important; } @@ -284,8 +258,8 @@ table>thead>tr>td { #membuff>div>div>div>small, #conns>div>div>div>small, #memtotal>div>div>div>small { + color: #ccc !important; - text-shadow: 1px 1px 2px #000 !important; } .node-system-packages>.main .cbi-section-node:first-child .cbi-value-last { @@ -307,8 +281,8 @@ table>thead>tr>td { table>tbody>tr>th, table>tfoot>tr>th, table>thead>tr>th { + background-color: #252526; - border-top: none; border-bottom: black 1px solid !important; } @@ -347,7 +321,9 @@ table>thead>tr>th { } abbr { - color: #8898aa; + color: #483d8b; + color: var(--dark-primary); + } div>table>tbody>tr:nth-of-type(2n), @@ -411,6 +387,16 @@ th h6, td h6 { background-color: #00ff0a45 !important; } +/* OCD: Compatible the background color of the "Add the node via the link" & "USE(node)" pop-up window in PassWall (dark mode only) */ +#add_link_div, +#set_node_div { + background-color: #333333f0 !important; + box-shadow: #00000094 10px 10px 30px 5px !important; +} +#add_link_div>.cbi-value>.cbi-value-field>#nodes_link { + background: #ccc; +} + #content_syslog { box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35) } @@ -432,26 +418,25 @@ th h6, td h6 { background-color: #252526; } -.tabs>li:hover, -.tabs>li[class~="active"], -.cbi-tabmenu>li:hover, -.cbi-tabmenu>li[class~="cbi-tab"] { - border-bottom: .18751rem solid var(--dark-primary); - background-color: #3c3c3c; -} - -.tabs>li>a, -.cbi-tabmenu>li>a { - color: #ccc !important; -} - -.cbi-tabmenu>li>a:hover, -.cbi-tabmenu>li:hover>a, -.cbi-tabmenu>.cbi-tab>a, -.tabs>li>a:hover, -.tabs>li:hover>a, .tabs>li[class~="active"]>a { - color: #fff !important; + color: #ccc; +} + +.tabs>li[class~="active"], +.tabs>li:hover { + border-bottom: 0.18751rem solid #483d8b; + border-bottom: 0.18751rem solid var(--dark-primary); + color: #ccc; + background-color: #181819; +} + +.cbi-tabmenu>li>a, +.tabs>li>a { + color: #ccc; + + &:hover { + color: #ccc; + } } .cbi-tabmenu>li { @@ -462,12 +447,20 @@ th h6, td h6 { border-bottom: 0px solid #ddd !important; } -.cbi-tab-descr { +.cbi-tabmenu li[class~="cbi-tab"] a { color: #ccc; } -.cbi-tabcontainer>.cbi-value:nth-of-type(2n), -.cbi-tabcontainer>.cbi-value:nth-of-type(2n)>textarea { +.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; } @@ -483,8 +476,7 @@ input { box-shadow: 0 3px 2px rgba(0, 0, 0, .05); } -select:not([multiple="multiple"]):hover, -input:hover, +select:not([multiple="multiple"]):focus, input:focus { border-color: #483d8b !important; border-color: var(--dark-primary) !important; @@ -519,13 +511,13 @@ select { color: #ccc; } -/*textarea for dark mode*/ -textarea { - border: 1px solid #3c3c3c !important; +.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; @@ -588,11 +580,9 @@ img[src="/luci-static/resources/icons/loading.gif"] { } div.cbi-value var, -td.cbi-value-field var, -.td.cbi-value-field var { +td.cbi-value-field var { color: #483d8b; - color: var(--dark_webkit-any-link); - text-shadow: 1px 1px 2px #000; + color: var(--dark-primary); } #diag-rc-output>pre { @@ -602,7 +592,7 @@ td.cbi-value-field var, .node-services-vssr .block { background-color: #1e1e1e !important; - box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35) !important; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35); } .node-services-vssr .block h4 { @@ -611,8 +601,8 @@ td.cbi-value-field var, .node-services-vssr .status-bar { color: #ccc; - background: #333333f0; - box-shadow: #00000094 10px 10px 30px 5px; + box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, .35); + background-color: #1e1e1e; } .node-services-vssr .cbi-section-table-row { @@ -748,150 +738,6 @@ fieldset[id^="cbi-apply-"] { color: #ccc !important; } -/* luci-app-passwall */ -#cbi-passwall #add_link_div, -#cbi-passwall #set_node_div { - background: #333333f0 !important; - box-shadow: #00000094 10px 10px 30px 5px !important; -} - -/* luci-app-bypass */ -#cbi-bypass .status-bar { - color: #ccc; - background: #333333f0; - box-shadow: #00000094 10px 10px 30px 5px; -} - -/* luci-app-clash */ -#cbi-clash .cbi-section .pure-u-1-4 .pure-g, -#cbi-clash .cbi-section .siz .pure-g { - background-color: #1e1e1e !important; - box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35) !important; -} - -/* luci-app-openclash */ -#cbi-openclash #eye-icon, -#cbi-openclash img[title="刷新"] { - filter: invert(100%); -} -#cbi-openclash #cbi-openclash-config fieldset[control-id="ControlID-46"], -#cbi-openclash .CodeMirror-merge-copybuttons-right, -.CodeMirror-scroll { - background-color: #333333 !important; -} -#cbi-openclash .cbi-section .cbi-tabmenu li { - border-right: 1px solid #3c3c3c !important; -} -#cbi-openclash .CodeMirror-merge { - border: 1px solid transparent !important; -} -#cbi-openclash-config-clog .cbi-section { - border: 1px solid #3c3c3c !important; -} -#cbi-openclash .CodeMirror-gutters { - border-right: 1px solid #3c3c3c !important; - background-color: #1e1e1e !important; -} - -/* luci-app-dockerman */ -#cbi-dockerd .img-con img { - filter: invert(0.4); -} - -/* luci-app-istorex (interface config[NetworkPort]) */ -#cbi-nfs-mount .app-container_status-label_bg { - background: #333333; -} -#cbi-nfs-mount td svg { - filter: invert(0.3); -} -#actioner .actioner-dns { - background-color: #333333; -} -#actioner .actioner-dns_header, -#actioner .actioner-container_header { - border-bottom: 1px solid #cbcbcb !important; -} -#actioner .actioner-dns_footer { - border-top: 1px solid #cbcbcb !important; -} - -/* luci-app-istorex (Network Guide) */ -#app #main #page .title, -#app #main #page .desc { - color: #cccccc; - background-color: #333333; -} -#app #main #page .network-message li:not(span):not(a) { - color: #8d8d8d; -} -#app #main #page code { - background-color: #333333; -} - -/* luci-app-istorex (Quick Start) */ -#app #main #page .network-container_flow-container, -#app #main #page .app-container_status-container, -#app #main #page .nas-container .nas-container_card .app-container, -#app #main #page .app-container { - background-color: #333333; -} -#app #main #page .flow-data span, -#app #main #page .app-container_status-label_block span, -#app #main #page .app-container .item-label span:not(#app #main #page .app-container .progress-value span) { - color: #cccccc; -} -#app #main #page .app-container_status-info span, -#app #main #page .app-container_status-info span, -#app #main #page .app-container_title span { - color: #dddddd; -} -.app-container_body .app-container_status-label_bg { - background-color: #282828 !important; -} -#app #main #page .item-label_value .progress { - background-color: rgb(118, 118, 118); -} -#app #main #page .app-container_nas-menu button[class=""] { - background-color: #8b8b8b; -} -#app #main #page .app-container_nas-menu button[class="on"] { - background-color: #555555; -} -#app #main #page .app-container_title .DeviceBlock ul { - background-color: #cccccc; -} -#actioner div.action, -#actioner div.actioner-container { - background-color: #3c3c3c; -} -#actioner div.action .title { - color: #cccccc; -} -#actioner div.action .desc { - color: #cbcbcb; -} -#actioner div.action div.roots span, -#actioner div.action div.move span:not(span.tip), -#actioner div.action div.left span, -#actioner div.action div.input_row span, -#actioner div.label-item label span { - color: #cbcbcb; -} -#actioner div.action span.tooltip-trigger svg path { - fill: #cbcbcb; -} -#actioner div.actioner-dns_body div.label-item_value select { - height: 43px; -} -#actioner div.actioner-container_footer div.close { - color: #ffffff; -} -#app #main div.app-container div.app-container_title span a svg path, -#app #main #page span.disk_infoicon svg g { - fill: #8b8b8b; -} - @supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) { .login-page .login-container .login-form { -webkit-backdrop-filter: blur(var(--blur-radius-dark)); diff --git a/luci-theme-argone/luasrc/view/themes/argone/footer.htm b/luci-theme-argone/luasrc/view/themes/argone/footer.htm index 50a63ab0e..0b9f10c99 100644 --- a/luci-theme-argone/luasrc/view/themes/argone/footer.htm +++ b/luci-theme-argone/luasrc/view/themes/argone/footer.htm @@ -2,7 +2,6 @@ Argone is a clean HTML5 theme for LuCI. It is based on luci-theme-material Argone Template luci-theme-argone - Copyright 2020 Jerrykuku Have a bug? Please create an issue here on GitHub! https://github.com/kenzok78/luci-theme-argone/issues @@ -18,7 +17,7 @@ luci-theme-material: https://github.com/LuttyYang/luci-theme-material/ - Argone Theme + Argon Theme https://demos.creative-tim.com/argon-dashboard/index.html Login background @@ -41,9 +40,9 @@