diff --git a/Makefile b/Makefile index 73e5011..775d8c5 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,8 @@ THEME_TITLE:=Kucat Theme PKG_NAME:=luci-theme-$(THEME_NAME) LUCI_TITLE:=Kucat Theme by sirpdboy LUCI_DEPENDS:= +curl -PKG_VERSION:=1.4.6 -PKG_RELEASE:=20231214 +PKG_VERSION:=1.4.8 +PKG_RELEASE:=20231217 diff --git a/htdocs/luci-static/kucat/css/dark.css b/htdocs/luci-static/kucat/css/dark.css index a6badcb..35f12ac 100644 --- a/htdocs/luci-static/kucat/css/dark.css +++ b/htdocs/luci-static/kucat/css/dark.css @@ -109,6 +109,10 @@ header.bar-primary .container-bar-left .pdboy-goadvanced:before { header.bg-primary { box-shadow: 0 0.5rem 1rem rgba(255, 255, 255, 0.35); } + +.uci_change_indicator.label.notice, +.pd-primary .fill .container .flex1 .showSide, +.pd-primary .fill .container .flex1 .brand, .showWord::after, .showWord::before , header>.fill>.container>.showWord , @@ -570,13 +574,13 @@ h3 { color: #fff; } +.cbi-progressbar { + color: #8391a2; +} .cbi-value-title { color: #8391a2; } - - - .cbi-section-descr { color: #8391a2 } @@ -663,16 +667,26 @@ background-color: rgba(0,0,0,0.15)!important; background-color: rgba(250, 250, 250, 0.1) } - - - - -#cbi-openclash .CodeMirror -{ - background-color: rgba(255,255,255,0.1)!important; - - color: #6c757d!important; +/* log */ +#cbi-openclash .CodeMirror.cm-s-idea.CodeMirror-wrap { + background: rgba(0,0,0,0.1)!important; + color: #adbcc9!important; } + +/* set modi file */ +#cbi-openclash .cm-s-material.CodeMirror +{ + background-color: #1b4c53!important; + color: #31b9c1!important; +} + +/* card */ +#cbi-openclash .card +{ + background: linear-gradient(#337ab7, #a8bfcf)!important; + box-shadow: 0 8px 16px -8px rgba(255,255,255,0.5)!important; +} + .node-services-adguardhome>.main .cbi-value .cbi-input-textarea { box-shadow: 0 0 1px rgba(255, 255, 255, 0.3)!important; } diff --git a/htdocs/luci-static/kucat/css/style.css b/htdocs/luci-static/kucat/css/style.css index d1d1a1f..a5ec6d4 100644 --- a/htdocs/luci-static/kucat/css/style.css +++ b/htdocs/luci-static/kucat/css/style.css @@ -113,11 +113,6 @@ body div { color: #f8f8f8 } -a:link,a:visited,a:active { - color: #c65621; - text-decoration: none -} - a { color: #c65621; text-decoration: none @@ -148,7 +143,7 @@ header.bar-primary .container-bar-right,header.bar-primary .container-bar-left { right: 0; margin: 0; padding: 0; - border-radius: 5px; + border-radius: 0.25rem; background-color: #51c291; background-color: rgba(var(--primary-rgbm),0.9); box-shadow: 0 0.5rem 1rem rgba(0,0,0,0.15); @@ -173,7 +168,7 @@ header.bar-primary .container-bar-right a { header.bar-primary .container-bar-left .labelbar:hover,header.bar-primary .container-bar-right .labelbar:hover { background-color: rgba(255,255,255,0.3); - border-radius: 5px; + border-radius: 0.25rem; text-decoration:none } @@ -254,78 +249,64 @@ header.bar-primary .container-bar-left .pdboy-gopoweroff:before { top: 0 } -.pull-right { - float: right; - display: inline-block +header.pd-primary { + -webkit-backdrop-filter: var(--primary-ufilter); + backdrop-filter: var(--primary-ufilter); + background-color: rgba(var(--primary-rgbm), var(--primary-rgbm-ts)); + background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent) !important; + box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.35); } -header.bg-primary { - width: 100%; - padding: 0; - position: relative; - -webkit-backdrop-filter: var(--primary-ufilter); - backdrop-filter: var(--primary-ufilter); - background-color: rgba(var(--primary-rgbm),var(--primary-rgbm-ts)); - background-image: -webkit-linear-gradient(135deg,rgba(255,255,255,0.2) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.2) 50%,rgba(255,255,255,0.2) 75%,transparent 75%,transparent) !important; - box-shadow: 0 0.5rem 1rem rgba(0,0,0,0.35) +.pd-primary .fill { + padding: 1rem 0; + border-bottom: 0 solid rgba(255,255,255,0.08) !important; + display: flex; } - -header .fill { - padding: 1rem 0 +.pd-primary .fill .container { + height: 2.8rem; + padding: 0 1rem; + display: flex; + align-items: center; + width: 100%; + background-color: rgba(255, 255, 255, 0) !important } - -header.bg-primary .fill .container { - height: 2.8rem; - padding: 0 1.25rem; - line-height: 2rem; - background-color: rgba(255,255,255,0) !important +.pd-primary .fill .container .flex1 { + flex: 1; } - -header>.fill>.container>.brand { - font-family: var(--font-sans); +.pd-primary .fill .container .flex1 .showSide { + display: none; +} +.pd-primary .fill .container .flex1 .brand { color: var(--menu-hover-color); - font-size: 1.2rem; - padding-left: 1rem; - line-height: 1.3; + font-family: var(--font-sans); + font-weight: bold; + font-size: 1.5rem; text-decoration: none; - letter-spacing: 3px; - font-weight: bolder; cursor: default; - font-weight: bold; - vertical-align: text-bottom; - white-space: nowrap; - text-align: center; - align-items: center; - justify-content: center; display: none; - vertical-align: text-bottom -} - -.pull-right span { - cursor: pointer; - display: inline-block -} - -.pull-right a,.pull-right span a { - cursor: pointer; - text-decoration: none; - color: var(--menu-color); - padding: 1rem -} - -.pull-right a:hover,.pull-right span a:hover { - background-color: var(--menu-item-hover-bgcolor); - text-decoration: none + } +.pd-primary .fill .container>span>a, .pdboy-qlogout { - font-weight: bold; - position: relative; - white-space: nowrap; - text-decoration: none; + line-height: 1.1; + cursor: pointer; + font-size: 1.4rem; + padding: 0.9rem; display: inline-block; - font-size: 1.3rem; - transition: all .1s +} + +.uci_change_indicator.label.notice +{ + padding: .3rem .6rem; + margin: 0.5rem; + background-color: #f8f8f8; + + white-space: nowrap; + font-size: 0.875rem; + border-radius: 0.25rem; + text-decoration: none; + color: rgba(var(--primary-rgbm),1); } .pdboy-qthems:before { @@ -334,12 +315,14 @@ header>.fill>.container>.brand { color: red } + .pdboy-qlogout:before { - font-size: 1.5rem !important; - content: "\e935"; - color: red + font-size: 1.5rem !important; + content: "\e935"; + color: red } + .pdboy-status_on::before { text-decoration: none; font-size: 1.5rem !important; @@ -353,8 +336,16 @@ header>.fill>.container>.brand { color: #aaa !important; text-decoration: none } +.pd-primary .fill .container>span>a:hover, +.pdboy-qlogout:hover, +.showSide:hover { + background-color: var(--menu-item-hover-bgcolor); + border-radius: 0.25rem; + text-decoration: none +} -.showWord::before { + +.showWord:before { padding: 1rem; font-size: 1.1rem; @@ -363,8 +354,7 @@ header>.fill>.container>.brand { color: var(--menu-color); text-decoration: none } - -.showWord::after { +.showWord:after { padding: 1rem; font-size: 1.1rem; line-height: 1.2; @@ -372,13 +362,14 @@ header>.fill>.container>.brand { color: var(--menu-color); text-decoration: none } -header>.fill>.container>.showWord { +.showWord { font-family: var(--font-sans); color: var(--menu-color); - font-size: 1.1rem; + font-size: 1.1rem!important; line-height: 1.2; + flex: auto; cursor: pointer; - width: calc(100% - 17rem); + width: calc(100% - 5rem); display: inline-block; text-decoration: none!important; vertical-align: text-bottom; @@ -388,25 +379,27 @@ header>.fill>.container>.showWord { text-decoration: none!important; } + .showSide { display: none; - cursor: default; - padding: 1rem; + line-height: 1.1; + font-size: 1.4rem; + padding: 0.9rem; + display: inline-block; color: var(--menu-hover-color); - white-space: nowrap; - font-size: 1.5rem !important; - line-height: 1; - text-decoration: none -} -.showWord::before,.showWord::after, -[class^="pdboy-"]:before,[class*=" pdboy-"]:before,[class^="pdboy-"]:after,[class*=" pdboy-"]:after { - font-family: 'sirpdboy-kucat' !important; - font-style: normal !important; - font-weight: normal !important; - font-variant: normal !important; - text-transform: none !important; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale + position: inherit; +} + +.showWord::before, +.showWord::after, +[class^="pdboy-"]:before, [class*=" pdboy-"]:before, [class^="pdboy-"]:after, [class*=" pdboy-"]:after { + font-family: 'sirpdboy-kucat' !important; + font-style: normal !important; + font-weight: normal !important; + font-variant: normal !important; + text-transform: none !important; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale } .notice { @@ -416,15 +409,13 @@ text-decoration: none!important; .label { display: inline-block; vertical-align: middle; - color: var(--menu-color); text-decoration: none } footer { text-align: right; padding: 1rem 1rem 2rem 0; - color: var(--primary-title-color); - color: #c65621; + color: rgba(var(--primary-rgbm),1); font-size: var(--font-x); -webkit-backdrop-filter: var(--primary-ufilter); backdrop-filter: var(--primary-ufilter); @@ -432,7 +423,7 @@ footer { } footer a { - color: var(--primary-title-color); + color: rgba(var(--primary-rgbm),1); text-decoration: none } @@ -793,10 +784,9 @@ select[multiple="multiple"] { } .center { - position: absolute; - width: 100%; - transform: translate(-50,-50%); - text-align: center + + width: 100%; + transform: translate(-50,-50%); } input[type="checkbox"] { @@ -804,9 +794,12 @@ input[type="checkbox"] { width: 25px !important; height: 25px !important; padding: 5px!important; + + background: rgba(var(--primary-rgbbody),0.7); + -webkit-appearance: none; outline: none; - border-radius: 5px; + border-radius: 0.25rem; transition: 0.1s } @@ -869,21 +862,21 @@ select:not([multiple="multiple"]):focus, input:not(.cbi-button):focus { .btn, button, select, input, .cbi-dropdown { outline: 0; cursor: pointer; - height: 2.6rem; + height: 2.4rem; color: var(--inputtext-color); - border-radius: 5px; + border-radius: 0.25rem; border: 1px solid var(--inputborder-color); background-color: var(--inputbg-color); transition: box-shadow .15s ease; } select,input { color: var(--inputtext-color); -font-size: var(--font-z); + font-size: var(--font-z); padding: 0 20px 0 10px; font-family: var(--font-sans); vertical-align: middle; margin: 3px 3px 3px 0; - line-height: 2.6rem; + line-height: 2.4rem; max-width: 550px; } @@ -895,7 +888,8 @@ font-size: var(--font-z); color: #f8f8f8; background-color: #008b89; display: inline-block; - padding: 0.8rem 1.5rem; + padding: 0.7rem 1rem; + margin-left: 0.2rem; cursor: pointer; -ms-touch-action: manipulation; touch-action: manipulation; @@ -909,7 +903,7 @@ font-size: var(--font-z); box-shadow: 0 0.5rem 1rem rgba(0,0,0,0.15); transform: translate(1) translate(0,0); transition: transform 225ms,box-shadow 225ms; - border-radius: 5px; + border-radius: 0.25rem; line-height: 1em } @@ -979,7 +973,7 @@ font-size: var(--font-z); vertical-align: baseline; border: none; outline: none; - border-radius: 5px; + border-radius: 0.25rem; color: var(--body-text-color); background-color: rgba(255,255,255,0.2); border: 1px solid var(--inputborder-color); @@ -1189,7 +1183,7 @@ fieldset>fieldset { width: 100% !important; height: 1.5rem !important; line-height: 1.5rem !important; - border-radius: 5px !important; + border-radius: 0.25rem !important; border-color: rgba(0,0,0,0.22) !important; background-color: rgba(0,0,0,0.18) !important } @@ -1203,7 +1197,7 @@ fieldset>fieldset { line-height: 1.5rem !important; background-color: rgba(var(--primary-rgbm),0.8)!important; background-image: var(--bgqs-image); - border-radius: 5px; + border-radius: 0.25rem; } #swaptotal>div>div>div,#swapfree>div>div>div,#memfree>div>div>div,#membuff>div>div>div,#conns>div>div>div,#memtotal>div>div>div { text-shadow: 0 0 4px #222; @@ -1230,28 +1224,19 @@ td>table>tbody>tr>td,.td>.table>.tbody>.tr>.td { } .cbi-button-add,.cbi-button-find,.cbi-button-link,.cbi-button-neutral,.cbi-input-find,.cbi-button-add,.cbi-button-find,.cbi-input-add { - /* background-color: #299e00 !important; - border-color: #268f00 !important */ - border: thin solid #4cae4c; background-color: #5cb85c; } .cbi-value-field .cbi-input-apply,.cbi-button-apply,.cbi-button-edit,.cbi-input-edit { -/* border-color: rgba(var(--primary-rgbm),1) !important */ border: thin solid rgba(var(--primary-rgbm), 1) !important; background-color: rgba(var(--primary-rgbm),0.9) !important; } .cbi-input-save,.cbi-button-save,.cbi-input-reload,.cbi-button-reload { -/* background-color: #39afd1 !important */ - border: thin solid #eea236; - background-color: #f0ad4e; + background-color: #39afd1; } .cbi-value-field .cbi-input-reset,.cbi-section-remove>.cbi-button,.cbi-button-remove,.cbi-button-reset,.cbi-button-negative { - /* color: #f8f8f8 !important; - background-color: #d83c88 !important*/ - border: thin solid #d43f3a; background-color: #d9534f; } @@ -1373,10 +1358,11 @@ body.lang_pl.node-main-login .cbi-value-title { margin: 2rem auto } -.node-main-login>.main>.main-right>header>.fill>.container>.brand { - display: none +.node-main-login>.main>.main-right>.pd-primary>.fill>.container>.flex1>.brand { + display: none } + .node-ma in-login>.main { top: 0; height: 100% !important @@ -1453,7 +1439,7 @@ body.lang_pl.node-main-login .cbi-value-title { position: relative; text-align: center; margin: 0; - border-radius: 5px; + border-radius: 10px; -webkit-backdrop-filter: blur(6px)!important; backdrop-filter: blur(6px)!important; background-color: rgba(var(--primary-rgbbody),0.5)!important; @@ -1514,7 +1500,7 @@ body.lang_pl.node-main-login .cbi-value-title { padding: .625rem 1.25rem; will-change: transform; line-height: 1.5em; - border-radius: 5px; + border-radius: 0.25rem; min-width: 16rem } @@ -1539,7 +1525,7 @@ body.lang_pl.node-main-login .cbi-value-title { .node-main-login>.main .cbi-value.cbi-value-last .cbi-input-text { box-shadow: 0 1px 3px rgba(50,50,93,.15),0 1px 0 rgba(0,0,0,.02); transition: box-shadow .15s ease; - border-radius: 5px; + border-radius: 0.25rem; box-sizing: border-box; padding-left: 3em; margin: 0 @@ -1552,7 +1538,7 @@ body.lang_pl.node-main-login .cbi-value-title { .node-main-login>.main .cbi-value.cbi-value .cbi-value-field .cbi-input-text,.node-main-login>.main .cbi-value.cbi-value .cbi-input-user,.node-main-login>.main .cbi-value.cbi-value-last .cbi-input-password,.node-main-login>.main .cbi-value.cbi-value-last .cbi-input-text[type="password"] { box-shadow: none; - border-radius: 5px; + border-radius: 0.25rem; padding: 0; color: #fff; text-shadow: 0px 2px 4px #222; @@ -1593,7 +1579,7 @@ body.lang_pl.node-main-login .cbi-value-title { position: absolute; z-index: 100; left: 10px; - top: 10px + top: 8px } .node-main-login>.main .cbi-value.cbi-value-last .cbi-value-field:before { @@ -1613,7 +1599,7 @@ body.lang_pl.node-main-login .cbi-value-title { position: absolute; z-index: 100; left: 10px; - top: 10px + top: 8px } .node-main-login>.main .cbi-value.cbi-value-last,.node-main-login>.main .cbi-value { @@ -1648,7 +1634,7 @@ body.lang_pl.node-main-login .cbi-value-title { position: absolute; color: #fff !important; margin-top: 6rem; - border-radius: 5px; + border-radius: 0.25rem; text-align: center; background-color: #e39f4d !important } @@ -1876,7 +1862,7 @@ fieldset[id^="cbi-apply-"] { padding: 1rem; font-size: var(--font-z); text-align: center; - border-radius: 5px; + border-radius: 0.25rem; background-color: rgba(var(--primary-rgbbody),1); box-sizing: border-box; -moz-box-sizing: border-box; @@ -1921,12 +1907,13 @@ fieldset[id^="cbi-apply-"] { background-color: rgba(var(--primary-rgbbody),1)!important } + .cbi-section>h3:first-child,.panel-title { - font-size: var(--font-z); + font-size: var(--font-d); width: 100%; display: block; margin: 0; - padding: .875rem 1.5rem; + padding: 1rem 1.5rem; letter-spacing: 1px; font-weight: bold; color: var(--primary-title-color) @@ -1938,7 +1925,6 @@ table>tbody>tr>td,table>tbody>tr>th,table>tfoot>tr>td,table>tfoot>tr>th,table>th letter-spacing: 1px; color: var(--body-color) } - .cbi-section-table-cell { white-space: nowrap; align-self: flex-end; @@ -1974,10 +1960,11 @@ table>tbody>tr>td,table>tbody>tr>th,table>tfoot>tr>td,table>tfoot>tr>th,table>th width: calc(100% - 1.5rem) } + .cbi-section-table tr .cbi-value-field { text-align: center; width: 30% !important; - padding: 10px !important + padding: 5px !important } .cbi-tabcontainer>.cbi-value:nth-of-type(4n+2),.cbi-map>.cbi-section .cbi-value:nth-of-type(4n+2),fieldset>table>tbody>tr:nth-of-type(4n+2),table>tbody>tr:nth-of-type(4n+2),div>.table>.tr:nth-of-type(4n+2) { @@ -2005,7 +1992,8 @@ table>tbody>tr>td,table>tbody>tr>th,table>tfoot>tr>td,table>tfoot>tr>th,table>th } table>tbody>tr,div>.table>.tr,.cbi-map>.cbi-section .cbi-value { - transition: background-color .15s + transition: background-color .15s; + line-height: 1.6em; } .success { @@ -2040,7 +2028,7 @@ table>tbody>tr,div>.table>.tr,.cbi-map>.cbi-section .cbi-value { font-family: inherit; min-width: inherit; overflow: unset; - border-radius: 5px; + border-radius: 0.25rem; box-shadow: 0 2px 2px 0 rgba(0,0,0,0.16),0 0 2px 0 rgba(0,0,0,0.12) } .alert-message > * { @@ -2076,7 +2064,7 @@ h1 { h2 { font-size: var(--font-d); - padding: 6px 12px; + padding: 0.5rem 1.5rem 0.2rem; font-weight: bold; text-transform: capitalize; color: var(--primary-title-color) @@ -2129,15 +2117,6 @@ fieldset.cbi-section p { padding: 1em } -.panel-title { - width: 100%; - display: block; - padding: 1rem 1.5rem; - color: var(--primary-title-color); - font-weight: bold; - margin: 0rem; - letter-spacing: .1rem -} table { border-spacing: 0; @@ -2218,27 +2197,10 @@ td>table>tbody>tr>td { } -.tabs li { - display: inline-block; - background: var(--menu-item-titlebg-color); - border-radius: 0.25rem; - margin: 0.2rem; - cursor: pointer; - border-left: 0.18751rem solid rgba(255,255,255,0); - border-right: 0.18751rem solid rgba(255,255,255,0); - font-size: var(--font-z); - box-shadow: 0 0.5rem 1rem rgba(0,0,0,0.15); - padding: 0.7rem 1rem; - text-align: center; - transform: translate(1) translate(0,0); - transition: transform 225ms,box-shadow 225ms -} - .tabs li[class~="active"] { - border-right: 0.18751rem solid var(--primary-solid); - border-left: 0.18751rem solid var(--primary-solid); - transform: scale(1) translate(0,0.15rem); - box-shadow: 0 0.5rem 1rem rgba(0,0,0,0.15); + border-right: 0.18751rem solid var(--primary-solid)!important; + border-left: 0.18751rem solid var(--primary-solid)!important; + box-shadow: 0 0.5rem 1rem rgba(0,0,0,0.4); background-color: rgba(var(--primary-rgbm),0.3) } @@ -2257,7 +2219,7 @@ td>table>tbody>tr>td { } .tabs li a { - padding: 0.7rem 0.5rem; + padding: 0.7rem 1rem; text-decoration: none; color: var(--primarytextcolor) } @@ -2273,24 +2235,24 @@ td>table>tbody>tr>td { } -.cbi-tabmenu li { - border: none; - background: var(--menu-item-titlebg-color); - display: inline-block; - font-size: var(--font-z); - border-left: 0.18751rem solid rgba(255,255,255,0); - border-right: 0.18751rem solid rgba(255,255,255,0); - border-radius: 0.25rem; - padding: 0.7rem 0rem; - box-shadow: 0 0.5rem 1rem rgba(0,0,0,0.15); - transform: translate(1) translate(0,0); - transition: transform 225ms,box-shadow 225ms; - margin-top: 0.4rem +.tabs > li, .cbi-tabmenu li { + display: inline-block; + font-size: var(--font-z); + border-left: 0.18751rem solid rgba(255, 255, 255, 0)!important; + border-right: 0.18751rem solid rgba(255, 255, 255, 0)!important; + border-radius: 0.25rem; + padding: 0.5rem 0rem; + box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); + transform: translate(1) translate(0, 0); + transition: transform 225ms, box-shadow 225ms; + background: var(--menu-item-titlebg-color); + margin: 0.2rem 0rem 0.2rem 0.4rem !important; } + .cbi-tabmenu li a { text-decoration: none; - padding: 0.7rem 1rem; + padding: 0.6rem 1rem; color: var(--primarytextcolor) } @@ -2307,10 +2269,9 @@ td>table>tbody>tr>td { } .cbi-tabmenu li[class~="cbi-tab"] { - border-right: 0.18751rem solid var(--primary-solid); - border-left: 0.18751rem solid var(--primary-solid); - transform: scale(1) translate(0,0.15rem); - box-shadow: 0 0.5rem 1rem rgba(0,0,0,0.15); + border-right: 0.18751rem solid var(--primary-solid) !important; + border-left: 0.18751rem solid var(--primary-solid) !important; + box-shadow: 0 0.5rem 1rem rgba(0,0,0,0.4); background-color: rgba(var(--primary-rgbm),0.3) } @@ -2519,9 +2480,6 @@ select[multiple="multiple"] { width: 100% } -.cbi-section>legend { - display: none !important -} .cbi-section-node-tabbed { padding: 0; @@ -2581,18 +2539,18 @@ select[multiple="multiple"] { float: left; padding: 13px 10px } - .cbi-value { display: flex; width: 100%; - align-items: center; - align-content: center; + align-items: flex-start; + align-content: flex-start; justify-content: flex-start; min-height: 40px; - padding: 8px 10px; - flex-flow: row wrap + padding: 0.2rem 0.8rem; + flex-flow: row wrap; } + .cbi-value:last-child { border-bottom: none !important } @@ -2705,7 +2663,7 @@ td>.ifacebadge,.td>.ifacebadge { .ifacebox { border: 1px solid #ccc; - border-radius: 5px; + border-radius: .375rem; background-color: #f9f9f9; border: 1px solid var(--inputborder-color); @@ -2722,6 +2680,7 @@ td>.ifacebadge,.td>.ifacebadge { .ifacebox-head { padding: 1rem; color: #333; + min-width: 7rem; color: var(--body-color) } @@ -2735,7 +2694,7 @@ img.cbi-image-button { #iwsvg,#iwsvg2,#bwsvg { border: none !important; - border-radius: 5px; + border-radius: 0.25rem; background-color: rgba(255,255,255,0.1)!important; box-shadow: 0 0 2rem 0 rgba(136,152,170,0.15); overflow: hidden @@ -2873,80 +2832,37 @@ input[name="ping"],input[name="traceroute"],input[name="nslookup"] { white-space: normal !important } -#cbi-AdGuardHome-AdGuardHome-escconf,#cbi-netspeedtest>fieldset>fieldset>div,.Software>fieldset>fieldset>div,#cbi-openclash>fieldset>div>div,.vue-form-render .cbi-section .cbi-section-node .cbi-value,#cbi-AdGuardHome >.main .cbi-section-node .cbi-value,#cbi-openclash >.main .cbi-section-node .cbi-value { +#cbi-AdGuardHome-AdGuardHome-escconf,#cbi-netspeedtest>fieldset>fieldset>div,.Software>fieldset>fieldset>div,.vue-form-render .cbi-section .cbi-section-node .cbi-value,#cbi-AdGuardHome >.main .cbi-section-node .cbi-value { display: inline-block } - -#cbi-openclash .cbi-section>div { - overflow: visible!important; - margin-bottom: 0.5rem +#cbi-openclash .CodeMirror.cm-s-idea.CodeMirror-wrap { + background: rgba(0,0,0,0.1)!important; + color: var(--body-color)!important; } - -#cbi-openclash #tab-header-openclash-dns_servers ul { - overflow-y: hidden -} - #cbi-openclash .cbi-section>div>ul>li { width: auto!important; - float: none!important; - padding: 0.7rem 1rem!important; - border-right: 3px solid rgba(255,255,255,0)!important; - border-left: 3px solid rgba(255,255,255,0)!important; - border-radius: 0.25rem!important; - line-height: 1!important + padding: 0rem 0.5rem!important; + } -#cbi-openclash .cm-s-material .CodeMirror-activeline-background { - background-color: rgba(0,0,0,0.2)!important -} - -#cbi-openclash .CodeMirror-gutters { - background-color: rgba(255,255,255,0.4)!important +#cbi-openclash .CodeMirror-scroll>.CodeMirror-gutters { + background-color: rgba(255,255,255,0.1)!important; + border-right: 1px solid #777!important; } #cbi-openclash .CodeMirror-merge,#cbi-openclash .CodeMirror-merge-2pane { - background-color: rgba(255,255,255,0.4)!important; height: auto!important; border: none!important } - -#cbi-openclash .CodeMirror { - background-color: rgba(255,255,255,0.2)!important; - color: var(--primary-title-color)!important; - width: 100% +#cbi-openclash .cm-s-idea span.cm-variable { + color: #fd8c73!important; } - -#cbi-openclash .cm-s-material .cm-string { - color: #1c8462!important -} - -#cbi-openclash .cm-s-material .cm-meta { - color: #db6707!important -} - -#cbi-openclash .cm-s-idea .CodeMirror-activeline-background { - background-color: rgba(255,255,255,0.2)!important -} - +/* tab border */ #cbi-openclash #tab { - box-shadow: 0 0 2px #aaa!important; + box-shadow: 0 0 2px rgba(255,255,255,0.2)!important; border: none!important } -#cbi-openclash #tab-header { - margin-left: 3rem; - background-color: rgba(255,255,255,0)!important -} - -#cbi-openclash #tab-header ul li.selected { - background-color: rgba(255,255,255,0.1)!important; - border-right: 1px solid #aaa!important -} - -#cbi-openclash #tab-header ul li { - border-bottom: 1px solid rgba(255,255,255,0)!important; - border-right: 1px solid #aaa!important -} .node-services-adguardhome>.main .cbi-value .cbi-input-textarea { width: 100%!important; @@ -3046,7 +2962,7 @@ input[name="ping"],input[name="traceroute"],input[name="nslookup"] { background-color: var(--inputbg-color); font-size: small; outline: none; - border-radius: 5px; + border-radius: 0.25rem; overflow: hidden } #syslog:focus{ @@ -3253,11 +3169,6 @@ img[src*="/luci-static/resources/cbi/reload.gif"] { width: calc(100% - 17rem) } - .panel-title { - font-size: var(--font-d); - padding-bottom: 1rem - } - table { font-size: var(--font-x) !important; width: 100% !important @@ -3323,13 +3234,11 @@ img[src*="/luci-static/resources/cbi/reload.gif"] { } @media screen and (max-width: 992px) { - header>.fill>.container>.brand { - display:inline-block - } - header>.fill>.container>.showWord { - display: none; - text-decoration: none + + .panel-title { + font-size: var(--font-z); + padding-bottom: 0.5rem } .cbi-section>div { @@ -3381,15 +3290,24 @@ img[src*="/luci-static/resources/cbi/reload.gif"] { .main .main-right { width: 100% } - - .showSide { - cursor: pointer; - position: relative; - display: inline-block + .pd-primary>.fill>.container>.flex1>.brand { + display: inline-block; } + + .pd-primary .fill .container .flex1 .showSide { + display: inline-block; + z-index: 99; + } + + .pd-primary>.fill>.container>.showWord { + display: none; + text-decoration: none + } + .showSide:hover { background-color: var(--menu-item-hover-bgcolor); + border-radius: 0.25rem; text-decoration: none } @@ -3645,15 +3563,6 @@ img[src*="/luci-static/resources/cbi/reload.gif"] { margin-top: -34px } - header>.fill>.container>.brand { - font-size: 1rem; - line-height: 1.3rem; - padding-left: 0 - } - - .pull-right>.uci_change_indicator { - display: none - } ::-webkit-scrollbar { width: 8px; diff --git a/htdocs/luci-static/kucat/img/logourl b/htdocs/luci-static/kucat/img/logourl new file mode 100644 index 0000000..b4cb809 --- /dev/null +++ b/htdocs/luci-static/kucat/img/logourl @@ -0,0 +1 @@ +https://www.github.com/sirpdboy/openwrt \ No newline at end of file diff --git a/htdocs/luci-static/kucat/img/logoword b/htdocs/luci-static/kucat/img/logoword index 693e541..da58233 100644 --- a/htdocs/luci-static/kucat/img/logoword +++ b/htdocs/luci-static/kucat/img/logoword @@ -1 +1 @@ -做事先做人,请尊重他人劳动成果与心血付出,是为人的基本准则! \ No newline at end of file +做事先做人,尊重他人劳动成果,是为人的基本准则! \ No newline at end of file diff --git a/luasrc/view/themes/kucat/header.htm b/luasrc/view/themes/kucat/header.htm index 92e8e4c..e6d9d65 100644 --- a/luasrc/view/themes/kucat/header.htm +++ b/luasrc/view/themes/kucat/header.htm @@ -211,7 +211,8 @@ local user = "admin" local setbar = "1" local bgqs = '1' - local showword = "" + local showword = sys.exec("cat /www/luci-static/kucat/img/logoword") + local showurl = sys.exec("cat /www/luci-static/kucat/img/logourl") local ssr = "" local gohome = bar .. "status/" ..home local gouser = bar .. "system/" ..user @@ -224,7 +225,7 @@ local primary_rgbm = '45,102,147' local primary_rgbm_ts = '0.8' local primary_rgbs = '132,188,218' - local primary_rgbs_ts = '0.2' + local primary_rgbs_ts = '0.1' local primary_opacity = '0' local bkuse = '1' local bklock = '1' @@ -315,8 +316,10 @@ function downIcibaUrl() check = 0 end end + + if check == 1 or not fs.access('/www/luci-static/kucat/img/down4.jpg') then -io.popen("curl -kLfsm 3 -o /www/luci-static/kucat/img/down4.jpg $(curl -kLfsm 5 'https://zhouxiaoben.info/iciba/dsapi' | awk -F 'picture4\":\"' '{print $2}' | awk -F '\"' '{print $1}') ") +io.popen("curl -kLfsm 3 -o /www/luci-static/kucat/img/down4.jpg $(curl -kLfsm 5 \"http://sentence.iciba.com/index.php?c=dailysentence&m=getdetail&title=$(date +%Y-%m-%d)\" | awk -F 'picture2\":\"' '{print $2}' | awk -F '\"' '{print $1}' | sed 's#\\##g') ") sys.exec("date +%Y%m%d > /tmp/kucaticiba.tmp") end if fs.access('/www/luci-static/kucat/img/down4.jpg') then @@ -332,18 +335,22 @@ function downIcibaword() end end if check == 1 or not fs.access('/tmp/showword.tmp') then - io.popen("echo $(curl -kLfsm 5 'https://zhouxiaoben.info/iciba/dsapi' | awk -F 'note\":\"' '{print $2}' | awk -F '\"' '{print $1}') >/tmp/showword.tmp ") - sys.exec("date +%Y%m%d > /tmp/kucaticibaword.tmp") + + local localword = sys.exec("a=`curl -kLfsm 5 https://v1.hitokoto.cn | awk -F 'hitokoto\":\"' '{print $2}'| awk -F '\"' '{print $1}' ` && printf $a ") + if localword ~= '' then + sys.exec("a=`curl -kLfsm 5 https://v1.hitokoto.cn | awk -F 'hitokoto\":\"' '{print $2}'| awk -F '\"' '{print $1}' ` && echo -e $a >/tmp/showword.tmp") + sys.exec("date +%Y%m%d > /tmp/kucaticibaword.tmp") + end end + if fs.access('/tmp/showword.tmp') then - localtime = sys.exec("cat /tmp/showword.tmp") - if localtime ~= '' then - showword = localtime - else - showword = sys.exec("cat /www/luci-static/kucat/img/logoword") + localword = sys.exec("a=`cat /tmp/showword.tmp` && printf $a ") + if localword ~= '' then + showword = localword end end end + function downbirdUrl() local check = 1 if fs.access('/tmp/kucatbird.tmp') then @@ -398,8 +405,6 @@ elseif ( background == "2" ) then elseif background == "3" then pcall(downbingUrl) elseif background == "4" then - pcall(downIcibaUrl) -elseif background == "5" then pcall(downbirdUrl) end pcall(downIcibaword) @@ -565,23 +570,23 @@ end <% render_topmenu() %>