diff --git a/static/fields.css b/static/fields.css index 8acfe63..f1446af 100644 --- a/static/fields.css +++ b/static/fields.css @@ -37,6 +37,30 @@ border-radius: 0.5em; } +.dangerous-button, .action-button { + border: solid 1px var(--text-color2); + border-radius: 0.5em; + padding: 0.3em; + margin: 0.2em; +} + +.summary-actions { + display: flex; + flex-direction: row; + align-items: stretch; +} +.summary-actions * { + margin: 0; +} + +.dangerous-button { + background: var(--bg-danger); +} + +.action-button { + background: var(--brand-bg); +} + .nav-bar-element { margin: 0.5em; border-bottom: 2px solid var(--text-color2); @@ -76,12 +100,13 @@ margin: 0; } -.settings-set-container label * { +label * { display: block; } -.settings-set-container label { - margin: 1em 0; - display: block; + +label { + margin: 1em 0.5em; + /*display: block;*/ /*background: var(--bg-selected);*/ color: var(--text-color2); } @@ -113,27 +138,10 @@ select * { background: var(--bg-selected); } -.settings-set-container details summary { +details > summary { display: flex; justify-content: space-between; -} - -.dangerous-button, .action-button { - border: solid 1px var(--text-color2); - border-radius: 0.5em; - padding: 0.3em; - margin: 0.2em; -} -summary .dangerous-button, summary .action-button { - margin: 0; -} - -.dangerous-button { - background: var(--bg-danger); -} - -.action-button { - background: var(--brand-bg); + align-items: stretch; } .submit-spinner { @@ -154,7 +162,6 @@ summary .dangerous-button, summary .action-button { /*********************** Стили для красивых 'switch' ***********************/ .toggle-input { - display: inline-block; position: relative; margin: 5px 10px; width: 50px; diff --git a/static/main.html b/static/main.html index 96bf1cf..2487119 100644 --- a/static/main.html +++ b/static/main.html @@ -436,28 +436,49 @@
@@ -940,6 +959,7 @@ // addQosClass() qosAddClass(name) { let res = { + isDisabled: false, cir: 0, pir: 0, filters: [] @@ -954,12 +974,13 @@ qosClassAddRule(name, index) { let rule = { + isDisabled: false, vlan: "", - proto: "tcp", - sport: "22,80,448", - dport: "5000-6000", - ip_src: "192.168.0.0/24", - ip_dest: "192.168.0.0/24,172.16.0.0/16,95.127.91.34", + proto: "", + sport: "", + dport: "", + ip_src: "", + ip_dest: "", dscp: "" } switch (name) {