From 0be9f1015d5e4713197e0b6503d14ffb9f6e0203 Mon Sep 17 00:00:00 2001 From: Riley Date: Fri, 8 Sep 2023 17:24:44 -0400 Subject: [PATCH 1/9] Fixed diskman dropdown bug Changed cbi sections to relative positioning instead of static (this should be fine, and is needed to set stacking orders) Added stacking orders to all the sections so dropdowns won't render underneath stuff anymore. --- luasrc/gaya/gaya.css | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/luasrc/gaya/gaya.css b/luasrc/gaya/gaya.css index 8df6d3a..6b414e7 100644 --- a/luasrc/gaya/gaya.css +++ b/luasrc/gaya/gaya.css @@ -654,6 +654,7 @@ label { .cbi-map { margin-top: 10px; + position: relative; } #cbi-shadowsocksr .cbi-map-descr { @@ -1007,11 +1008,28 @@ strong { border-radius: 20px; backdrop-filter: blur(20px); -webkit-backdrop-filter: blur(20px); + position: relative; } .cbi-modal .cbi-section, .cbi-section .cbi-section { } + .cbi-section:nth-of-type(1) { + z-index: 4; /* the first section will be on top */ + } + + .cbi-section:nth-of-type(2) { + z-index: 3; + } + + .cbi-section:nth-of-type(3) { + z-index: 2; + } + + .cbi-section:nth-of-type(4) { + z-index: 1; /* the last section will be at the bottom */ + } + .cbi-modal .cbi-tabmenu { margin-left: 0; } @@ -1794,7 +1812,6 @@ strong { animation: anim-rotate 2s infinite cubic-bezier(0.18, 0.89, 0.32, 1.28); background: url(./icons/spinner16.svg) no-repeat center; } - } .left, .left::before { text-align: left !important; -- 2.38.4 From 0d96660df68598f8352f49461e0d3f3783a133ab Mon Sep 17 00:00:00 2001 From: Riley Date: Fri, 8 Sep 2023 19:01:32 -0400 Subject: [PATCH 2/9] Fixed offset plaintext password button This affects the position of all cbi buttons in the UI by 0.5rem, if this doesn't bother anyone I think it's a reasonable change to make sure things line up properly. --- luasrc/gaya/gaya.css | 1 - 1 file changed, 1 deletion(-) diff --git a/luasrc/gaya/gaya.css b/luasrc/gaya/gaya.css index 6b414e7..02d18ad 100644 --- a/luasrc/gaya/gaya.css +++ b/luasrc/gaya/gaya.css @@ -2586,7 +2586,6 @@ strong { font-size: 0.8rem; padding: 0.3rem 0.6rem; position: relative; - bottom: -0.5rem; } .label, [data-indicator] { -- 2.38.4 From 9d73db291ae7c07bf90d02b1d0e7c022a12aeb08 Mon Sep 17 00:00:00 2001 From: Riley Date: Sun, 10 Sep 2023 13:38:20 -0400 Subject: [PATCH 3/9] Formated for readability --- css/custom.css | 265 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 263 insertions(+), 2 deletions(-) diff --git a/css/custom.css b/css/custom.css index 0848c62..5702935 100644 --- a/css/custom.css +++ b/css/custom.css @@ -1,2 +1,263 @@ -.Dashboard{color:#212529!important}.Dashboard h3{color:#ffffff}.Dashboard hr{border:0;height:0;overflow:visible;box-sizing:content-box;border-top:1px solid rgba(0,0,0,.1);margin:0}.Dashboard .box-s1{min-height:466px}.Dashboard .internet-status-self .internet-status-info .title{height:97px}.Dashboard .dashboard-bg{border-radius:16px;background-color:#3f3f3f69}.Dashboard .title{text-align:center}.Dashboard .section-content{display:flex;vertical-align:top;align-items:flex-start;justify-content:space-between;padding:20px 0 0}.Dashboard .section-content > div{width:100%;padding:1.5em}.Dashboard .section-content .settings-info{padding-top:1em}.Dashboard .section-content .internet-status-info .settings-info > div > p > i{padding:0 0 0 5px}.Dashboard .section-content > div:nth-child(2){margin-left:20px}.Dashboard .devices-list .devices-info .tr .td{padding:0px 0 0 10px}.Dashboard .devices-list .devices-info .tr .td:first-child{width:33%;word-break:break-all}.Dashboard .devices-list hr:nth-child(4){margin-top:0;margin-bottom:8px}.Dashboard .router-status-lan .devices-list .table-titles .th:first-child{width:35%}.Dashboard .router-status-self .router-status-info .settings-info{padding-left:27px}.Dashboard .router-status-self .router-status-info .title h3{margin-top:-2px}.Dashboard .router-status-info svg{width:70px}.Dashboard .internet-status-self .settings-info p:first-child span:first-child{font-size:15px;font-weight:500}.Dashboard .internet-status-self .settings-info p:nth-child(2) span:first-child,.Dashboard .router-status-wifi .wifi-info .settings-info p:first-child span:first-child,.Dashboard .router-status-wifi .wifi-info .settings-info p:nth-child(2) span:first-child{font-weight:700}.Dashboard .settings-info p span:first-child{width:35%;font-size:12px;text-align:right}.Dashboard .settings-info p span:nth-child(2){display:inline-block;word-break:break-all;max-width:150px;overflow:hidden;max-height:16px;position:relative;top:2px}.Dashboard .router-status-info .settings-info p span:nth-child(2){max-width:283px}.Dashboard .settings-info p span.ssid{max-height:18px;top:3px}.Dashboard .settings-info p span.encryption{max-width:82px}.Dashboard .router-status-wifi .wifi-info .devices-info .tr .td{padding:0 10px}.Dashboard .router-status-wifi .wifi-info .devices-info .tr .td:first-child{width:30%;word-break:break-all}.Dashboard .router-status-wifi .wifi-info .devices-info .tr .td:nth-child(2){width:21%;overflow:hidden;padding-left:0;word-break:break-all}.Dashboard .router-status-wifi .wifi-info .settings-info{padding:1em 0}.Dashboard .router-status-wifi .wifi-info .devices-info .tr .td:nth-child(3){width:22%;overflow:hidden;position:relative;top:-3px}.Dashboard .router-status-wifi .wifi-info .devices-info .tr .td:nth-child(5){width:initial}.Dashboard .router-status-wifi .wifi-info .devices-info .device-info .progress{width:100%;margin:0;padding:0}.Dashboard .wifi-info .devices-info .table-titles{border-bottom:1px solid rgba(0,0,0,.1)}.Dashboard .section-content .internet-status-info .settings-info,.Dashboard .router-status-wifi .wifi-info .settings-info,.Dashboard .router-status-lan .lan-info .settings-info{display:flex;justify-content:space-around}.Dashboard .devices-list .devices-info,.Dashboard .router-status-wifi .wifi-info > hr:last-child{margin-bottom:0}@media screen and (min-width: 200px) and (max-width: 640px){.Dashboard .cbi-section-1 > .section-content{padding-top:10px}.Dashboard .section-content > div{padding:1em}.Dashboard .section-content > div:first-child{margin-bottom:10px}.Dashboard .section-content > div:nth-child(2){margin:0}.Dashboard .router-status-self .router-status-info .settings-info{padding:0}.Dashboard .section-content .internet-status-info .settings-info > div:first-child{margin-bottom:10px;border-bottom:1px solid rgba(0,0,0,.1)}.Dashboard .router-status-wifi .wifi-info .settings-info > div{flex:1}.Dashboard .section-content .router-status-lan .devices-info .table-titles .th:last-child{padding-left:70px}.Dashboard .section-content .router-status-lan .devices-info .td:first-child{flex:2 2 31%}.Dashboard .section-content .router-status-lan .devices-info .td:nth-child(2){flex:1 1 24%;padding:0}.Dashboard .section-content .router-status-lan .devices-info .td:last-child{word-wrap:normal}.Dashboard .router-status-wifi .wifi-info .settings-info > div p:nth-child(6) > span:last-child{display:inline-block;overflow:hidden;height:14px;width:52%;word-break:break-word;line-height:15px}.Dashboard .wifi-info .devices-info .table-titles{display:flex;border-radius:initial;margin:0;padding:0}.Dashboard .wifi-info .devices-info .table-titles .th{flex:2 2 24%}.Dashboard .wifi-info .devices-info .tr .td{flex:2 2 10%}.Dashboard .wifi-info hr:nth-child(4){margin-bottom:0}.Dashboard .section-content,.Dashboard .section-content .internet-status-info .settings-info,.Dashboard .section-content .router-status-lan .devices-info .table-titles{display:block}} -EOL +.Dashboard { + color: #212529 !important +} + +.Dashboard h3 { + color: #ffffff +} + +.Dashboard hr { + border: 0; + height: 0; + overflow: visible; + box-sizing: content-box; + border-top: 1px solid rgba(0, 0, 0, .1); + margin: 0 +} + +.Dashboard .box-s1 { + min-height: 466px +} + +.Dashboard .internet-status-self .internet-status-info .title { + height: 97px +} + +.Dashboard .dashboard-bg { + border-radius: 16px; + background-color: #3f3f3f69 +} + +.Dashboard .title { + text-align: center +} + +.Dashboard .section-content { + display: flex; + vertical-align: top; + align-items: flex-start; + justify-content: space-between; + padding: 20px 0 0 +} + +.Dashboard .section-content>div { + width: 100%; + padding: 1.5em +} + +.Dashboard .section-content .settings-info { + padding-top: 1em +} + +.Dashboard .section-content .internet-status-info .settings-info>div>p>i { + padding: 0 0 0 5px +} + +.Dashboard .section-content>div:nth-child(2) { + margin-left: 20px +} + +.Dashboard .devices-list .devices-info .tr .td { + padding: 0px 0 0 10px +} + +.Dashboard .devices-list .devices-info .tr .td:first-child { + width: 33%; + word-break: break-all +} + +.Dashboard .devices-list hr:nth-child(4) { + margin-top: 0; + margin-bottom: 8px +} + +.Dashboard .router-status-lan .devices-list .table-titles .th:first-child { + width: 35% +} + +.Dashboard .router-status-self .router-status-info .settings-info { + padding-left: 27px +} + +.Dashboard .router-status-self .router-status-info .title h3 { + margin-top: -2px +} + +.Dashboard .router-status-info svg { + width: 70px +} + +.Dashboard .internet-status-self .settings-info p:first-child span:first-child { + font-size: 15px; + font-weight: 500 +} + +.Dashboard .internet-status-self .settings-info p:nth-child(2) span:first-child, +.Dashboard .router-status-wifi .wifi-info .settings-info p:first-child span:first-child, +.Dashboard .router-status-wifi .wifi-info .settings-info p:nth-child(2) span:first-child { + font-weight: 700 +} + +.Dashboard .settings-info p span:first-child { + width: 35%; + font-size: 12px; + text-align: right +} + +.Dashboard .settings-info p span:nth-child(2) { + display: inline-block; + word-break: break-all; + max-width: 150px; + overflow: hidden; + max-height: 16px; + position: relative; + top: 2px +} + +.Dashboard .router-status-info .settings-info p span:nth-child(2) { + max-width: 283px +} + +.Dashboard .settings-info p span.ssid { + max-height: 18px; + top: 3px +} + +.Dashboard .settings-info p span.encryption { + max-width: 82px +} + +.Dashboard .router-status-wifi .wifi-info .devices-info .tr .td { + padding: 0 10px +} + +.Dashboard .router-status-wifi .wifi-info .devices-info .tr .td:first-child { + width: 30%; + word-break: break-all +} + +.Dashboard .router-status-wifi .wifi-info .devices-info .tr .td:nth-child(2) { + width: 21%; + overflow: hidden; + padding-left: 0; + word-break: break-all +} + +.Dashboard .router-status-wifi .wifi-info .settings-info { + padding: 1em 0 +} + +.Dashboard .router-status-wifi .wifi-info .devices-info .tr .td:nth-child(3) { + width: 22%; + overflow: hidden; + position: relative; + top: -3px +} + +.Dashboard .router-status-wifi .wifi-info .devices-info .tr .td:nth-child(5) { + width: initial +} + +.Dashboard .router-status-wifi .wifi-info .devices-info .device-info .progress { + width: 100%; + margin: 0; + padding: 0 +} + +.Dashboard .wifi-info .devices-info .table-titles { + border-bottom: 1px solid rgba(0, 0, 0, .1) +} + +.Dashboard .section-content .internet-status-info .settings-info, +.Dashboard .router-status-wifi .wifi-info .settings-info, +.Dashboard .router-status-lan .lan-info .settings-info { + display: flex; + justify-content: space-around +} + +.Dashboard .devices-list .devices-info, +.Dashboard .router-status-wifi .wifi-info>hr:last-child { + margin-bottom: 0 +} + +@media screen and (min-width: 200px) and (max-width: 640px) { + .Dashboard .cbi-section-1>.section-content { + padding-top: 10px + } + + .Dashboard .section-content>div { + padding: 1em + } + + .Dashboard .section-content>div:first-child { + margin-bottom: 10px + } + + .Dashboard .section-content>div:nth-child(2) { + margin: 0 + } + + .Dashboard .router-status-self .router-status-info .settings-info { + padding: 0 + } + + .Dashboard .section-content .internet-status-info .settings-info>div:first-child { + margin-bottom: 10px; + border-bottom: 1px solid rgba(0, 0, 0, .1) + } + + .Dashboard .router-status-wifi .wifi-info .settings-info>div { + flex: 1 + } + + .Dashboard .section-content .router-status-lan .devices-info .table-titles .th:last-child { + padding-left: 70px + } + + .Dashboard .section-content .router-status-lan .devices-info .td:first-child { + flex: 2 2 31% + } + + .Dashboard .section-content .router-status-lan .devices-info .td:nth-child(2) { + flex: 1 1 24%; + padding: 0 + } + + .Dashboard .section-content .router-status-lan .devices-info .td:last-child { + word-wrap: normal + } + + .Dashboard .router-status-wifi .wifi-info .settings-info>div p:nth-child(6)>span:last-child { + display: inline-block; + overflow: hidden; + height: 14px; + width: 52%; + word-break: break-word; + line-height: 15px + } + + .Dashboard .wifi-info .devices-info .table-titles { + display: flex; + border-radius: initial; + margin: 0; + padding: 0 + } + + .Dashboard .wifi-info .devices-info .table-titles .th { + flex: 2 2 24% + } + + .Dashboard .wifi-info .devices-info .tr .td { + flex: 2 2 10% + } + + .Dashboard .wifi-info hr:nth-child(4) { + margin-bottom: 0 + } + + .Dashboard .section-content, + .Dashboard .section-content .internet-status-info .settings-info, + .Dashboard .section-content .router-status-lan .devices-info .table-titles { + display: block + } +} \ No newline at end of file -- 2.38.4 From 53e3be3f975f4c6f483a831a1b4b3a899c10a452 Mon Sep 17 00:00:00 2001 From: riley Date: Mon, 11 Sep 2023 16:56:32 -0400 Subject: [PATCH 4/9] Fixed OpenVPN password wrapping bug --- luasrc/gaya/gaya.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/luasrc/gaya/gaya.css b/luasrc/gaya/gaya.css index 02d18ad..08fc140 100644 --- a/luasrc/gaya/gaya.css +++ b/luasrc/gaya/gaya.css @@ -675,10 +675,16 @@ strong { white-space: nowrap; color: #ffffff; } + .cbi-value.nowrap:not(.td) { + white-space: normal; + } [disabled="disabled"] { pointer-events: none; } - + #cbi-tgopenvpn_cfg-settings-password .control-group { + display: flex; + } + /* Sidebar */ .main > .main-left { position: fixed; @@ -2735,7 +2741,7 @@ strong { .cbi-value input[type="password"], .cbi-value input[name^="pw"], .cbi-value input[data-update="change"]:nth-child(2) { - width: 13rem !important; + width: 100%; min-width: 13rem; color: #fff; } -- 2.38.4 From 53bc50c0c7ac7b4bfc646ca5d664bd308346dcef Mon Sep 17 00:00:00 2001 From: riley Date: Mon, 11 Sep 2023 17:02:15 -0400 Subject: [PATCH 5/9] Added a gray bottom border to show/hide button --- luasrc/gaya/gaya.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/luasrc/gaya/gaya.css b/luasrc/gaya/gaya.css index 08fc140..3dd2ca6 100644 --- a/luasrc/gaya/gaya.css +++ b/luasrc/gaya/gaya.css @@ -684,6 +684,10 @@ strong { #cbi-tgopenvpn_cfg-settings-password .control-group { display: flex; } + #cbi-tgopenvpn_cfg-settings-password .cbi-button { + border-bottom: 2px solid #909090; + } + /* Sidebar */ .main > .main-left { -- 2.38.4 From 1c62cbde3f07857ae5635b766a6da364f3f1c300 Mon Sep 17 00:00:00 2001 From: riley Date: Mon, 11 Sep 2023 17:38:04 -0400 Subject: [PATCH 6/9] Fixed password wrapping more broadly --- luasrc/gaya/gaya.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/luasrc/gaya/gaya.css b/luasrc/gaya/gaya.css index 3dd2ca6..f7fe487 100644 --- a/luasrc/gaya/gaya.css +++ b/luasrc/gaya/gaya.css @@ -681,12 +681,9 @@ strong { [disabled="disabled"] { pointer-events: none; } - #cbi-tgopenvpn_cfg-settings-password .control-group { + div[id^="cbid"][id$=".settings.password"] .control-group { display: flex; } - #cbi-tgopenvpn_cfg-settings-password .cbi-button { - border-bottom: 2px solid #909090; - } /* Sidebar */ @@ -1220,6 +1217,9 @@ strong { font-weight: 700; background-color: #d4d4d4; } + .cbi-button-neutral { + border-bottom: 2px solid #909090; + } .btn.primary, .cbi-page-actions .cbi-button-save, .cbi-page-actions .cbi-button-apply + .cbi-button-save, -- 2.38.4 From 8ad6dfcb45c1b982a0c10850a53800d627e1598e Mon Sep 17 00:00:00 2001 From: riley Date: Mon, 11 Sep 2023 17:50:43 -0400 Subject: [PATCH 7/9] Moved CSS edits to custom.css for sanity --- css/custom.css | 12 +++++++++++- luasrc/gaya/gaya.css | 10 +--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/css/custom.css b/css/custom.css index 5702935..c97f95e 100644 --- a/css/custom.css +++ b/css/custom.css @@ -260,4 +260,14 @@ .Dashboard .section-content .router-status-lan .devices-info .table-titles { display: block } -} \ No newline at end of file + .cbi-button-neutral { + border-bottom: 2px solid #909090; + } + div[id^="cbid"][id$=".settings.password"] .control-group { + display: flex; + } + .cbi-value.nowrap:not(.td) { + white-space: normal; + } +} + diff --git a/luasrc/gaya/gaya.css b/luasrc/gaya/gaya.css index f7fe487..19cab0b 100644 --- a/luasrc/gaya/gaya.css +++ b/luasrc/gaya/gaya.css @@ -675,15 +675,10 @@ strong { white-space: nowrap; color: #ffffff; } - .cbi-value.nowrap:not(.td) { - white-space: normal; - } [disabled="disabled"] { pointer-events: none; } - div[id^="cbid"][id$=".settings.password"] .control-group { - display: flex; - } + /* Sidebar */ @@ -1217,9 +1212,6 @@ strong { font-weight: 700; background-color: #d4d4d4; } - .cbi-button-neutral { - border-bottom: 2px solid #909090; - } .btn.primary, .cbi-page-actions .cbi-button-save, .cbi-page-actions .cbi-button-apply + .cbi-button-save, -- 2.38.4 From 75eba26f15492efbccae336c66170170f8983a48 Mon Sep 17 00:00:00 2001 From: riley Date: Mon, 11 Sep 2023 17:50:43 -0400 Subject: [PATCH 8/9] Revert "Moved CSS edits to custom.css for sanity" This reverts commit 8ad6dfcb45c1b982a0c10850a53800d627e1598e. --- css/custom.css | 12 +----------- luasrc/gaya/gaya.css | 10 +++++++++- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/css/custom.css b/css/custom.css index c97f95e..5702935 100644 --- a/css/custom.css +++ b/css/custom.css @@ -260,14 +260,4 @@ .Dashboard .section-content .router-status-lan .devices-info .table-titles { display: block } - .cbi-button-neutral { - border-bottom: 2px solid #909090; - } - div[id^="cbid"][id$=".settings.password"] .control-group { - display: flex; - } - .cbi-value.nowrap:not(.td) { - white-space: normal; - } -} - +} \ No newline at end of file diff --git a/luasrc/gaya/gaya.css b/luasrc/gaya/gaya.css index 19cab0b..f7fe487 100644 --- a/luasrc/gaya/gaya.css +++ b/luasrc/gaya/gaya.css @@ -675,10 +675,15 @@ strong { white-space: nowrap; color: #ffffff; } + .cbi-value.nowrap:not(.td) { + white-space: normal; + } [disabled="disabled"] { pointer-events: none; } - + div[id^="cbid"][id$=".settings.password"] .control-group { + display: flex; + } /* Sidebar */ @@ -1212,6 +1217,9 @@ strong { font-weight: 700; background-color: #d4d4d4; } + .cbi-button-neutral { + border-bottom: 2px solid #909090; + } .btn.primary, .cbi-page-actions .cbi-button-save, .cbi-page-actions .cbi-button-apply + .cbi-button-save, -- 2.38.4 From 75205b02741a94a937dd696ac0c8ea801860ef05 Mon Sep 17 00:00:00 2001 From: riley Date: Mon, 11 Sep 2023 17:50:43 -0400 Subject: [PATCH 9/9] That was a bad idea This reverts commit 8ad6dfcb45c1b982a0c10850a53800d627e1598e. --- css/custom.css | 12 +----------- luasrc/gaya/gaya.css | 10 +++++++++- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/css/custom.css b/css/custom.css index c97f95e..5702935 100644 --- a/css/custom.css +++ b/css/custom.css @@ -260,14 +260,4 @@ .Dashboard .section-content .router-status-lan .devices-info .table-titles { display: block } - .cbi-button-neutral { - border-bottom: 2px solid #909090; - } - div[id^="cbid"][id$=".settings.password"] .control-group { - display: flex; - } - .cbi-value.nowrap:not(.td) { - white-space: normal; - } -} - +} \ No newline at end of file diff --git a/luasrc/gaya/gaya.css b/luasrc/gaya/gaya.css index 19cab0b..f7fe487 100644 --- a/luasrc/gaya/gaya.css +++ b/luasrc/gaya/gaya.css @@ -675,10 +675,15 @@ strong { white-space: nowrap; color: #ffffff; } + .cbi-value.nowrap:not(.td) { + white-space: normal; + } [disabled="disabled"] { pointer-events: none; } - + div[id^="cbid"][id$=".settings.password"] .control-group { + display: flex; + } /* Sidebar */ @@ -1212,6 +1217,9 @@ strong { font-weight: 700; background-color: #d4d4d4; } + .cbi-button-neutral { + border-bottom: 2px solid #909090; + } .btn.primary, .cbi-page-actions .cbi-button-save, .cbi-page-actions .cbi-button-apply + .cbi-button-save, -- 2.38.4