From 9a29819d4f9eadcdfbe05659b0667a831e757b59 Mon Sep 17 00:00:00 2001 From: Yurii Date: Mon, 8 Apr 2024 05:37:36 +0300 Subject: [PATCH] refactor: reworked layout and styles of the portal --- data/index.html | 190 ++++++------- data/settings.html | 605 +++++++++++++++++++--------------------- data/static/app.css.gz | Bin 581 -> 663 bytes data/static/app.js.gz | Bin 4622 -> 4623 bytes src_data/static/app.css | 40 ++- src_data/static/app.js | 2 +- 6 files changed, 425 insertions(+), 412 deletions(-) diff --git a/data/index.html b/data/index.html index d431514..a6e9f9e 100644 --- a/data/index.html +++ b/data/index.html @@ -117,101 +117,104 @@
-
+
+
diff --git a/data/settings.html b/data/settings.html index 129df82..14b730b 100644 --- a/data/settings.html +++ b/data/settings.html @@ -23,331 +23,310 @@
-
-
-

Portal settings

-

-
+
+

Settings

+

+
-
- + - - -
-
+
+ System settings +
+
+ +
+
-
-
-
-

OpenTherm settings

-

-
+
+ OpenTherm settings +
+
+ +
+
-
- -
-
-
- -
-
-
-

MQTT settings

-

-
- -
- -
-
- -
-
-
-

Outdoor sensor settings

-

-
- -
- -
-
- -
-
-
-

Indoor sensor settings

-

-
- -
- + + +
+ Indoor sensor settings +
+
+
+ +
+ + +
+ + + +
+ - - - -
- -
-
-
-

External pump settings

-

-
- -
- -
- -
-
-
-

System settings

-

-
- -
- -
+
+ +
+ + +
+ +
+ + +
+ + + + +
diff --git a/data/static/app.css.gz b/data/static/app.css.gz index fc5510130521d1175f4057330b15b2f1a5ae777c..68d7c603b93656e53d454e78c418031653e20722 100644 GIT binary patch literal 663 zcmV;I0%-joiwFP!000001GQD{ZrU&u{S6ZD;Awwgnj@g4tx{>~JM0M@`;u5VzL9O{ z$Fz6fjT1s>X;eBYArQ{F$LHLyJd~icVAE1t{-{+bQntFish(!+&t%M)a6wB0%^$`% zue3y-8I&9DDByd42g*FOua&QhneVvar0He}#n$IXD=Yj7N#AL$n1~ zD;$kV@pP!foNN$wG~{)4^#zl$xX@%Q`jc_4+oaG+fsII|ePzUR$}C!7-*j1_3&Mu` z7F&Q&;C@cVC9%`b8Zoq&R6?m*a=?miaZnzIch55n0n1a6ctbC@B-`awf_}sv*1I^s zQ{ckr+)|Ff((xXYZ7I+uek&z-AHkWBo7~~nDlXBWJDS}!x{`x|l34hTC>7o9$Z&(L zGd$`aoEzL1wHDfdI#ZLj|E21^@Te=e#6oyPw@C}!wYl9l<&eV4X)4q+T_v|Zs*zjg zYfy!{UydYqAi{4dlrR@5M#E|eD9j-3ceuV=&F5W6Ce){73??vX6VY%+L`v_h<*IIU zj}&))UE87QdVgpn5`#G&PqDU!mO!&pj_6+R5-WC`pl{dLjPbteR$$yE_2OC1*bvKM zeML8W(*3k%!b2^veinrmpz|Ue<-d2{box-SBr4#WOucE?{*XAK^wy^*Y&B1sMLIy< zF*3F$bNsPYouN^&+eh)(>ldI3C09+2TJTzw+C0B%vF@CgXtB;7bZtdRWkxfR7Q#<| xF{O90(6dt;vg>dKwEm4}5#L|Wgn73MPggDSRSsUUB&)Xd{sEBm6ca`Y006YLN*n+H literal 581 zcmV-L0=oSliwFP!000001FcliZrd;nd`^J;gND7t!(^oGG88T_>>u_8w4~TVB+-y$ zC+X0CpCmh;v!({p?#ZxpJRW%z3ybK<@6~caX(JiZQX$(@*8r2IqBUCijK+g12m{5| zcUEZfh1}=&+wAGBs7_cf+0~fU@@2JLEq`jkC6Kk2h8`sMbwTd#A2-c0OImUkb4nv@ z`dw%^jXH8w&2R$^7ZT zt-(`KJCI878#PJuAysdMCtcp=M)(8TeNkgK^!7aJa|#mPUmo&~K^>y0oJvY7BHVKwq!3jL@m-L15Y?S=?_KnPd68N>epw z((`LA!HFm^-X)>6kX7w3`ae1ECwi{*}v7-v$5xCi5Ag diff --git a/data/static/app.js.gz b/data/static/app.js.gz index 1b62381334f26587e71d80d4f542274d0c392336..2b6f3282685b63b8b848b848a7dfd89337541c1c 100644 GIT binary patch delta 4140 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 diff --git a/src_data/static/app.css b/src_data/static/app.css index 885d43a..546ad75 100644 --- a/src_data/static/app.css +++ b/src_data/static/app.css @@ -1,15 +1,41 @@ -:root { - --pico-block-spacing-horizontal: calc(1rem * 2.25); - --pico-block-spacing-vertical: calc(1rem * 2.25) +@media (min-width: 576px) { + article { + --pico-block-spacing-vertical: calc(var(--pico-spacing) * 0.75); + --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 0.75); + } +} + +@media (min-width: 768px) { + article { + --pico-block-spacing-vertical: var(--pico-spacing); + --pico-block-spacing-horizontal: var(--pico-spacing); + } +} + +@media (min-width: 1024px) { + article { + --pico-block-spacing-vertical: calc(var(--pico-spacing) * 1.25); + --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 1.25); + } } @media (min-width: 1280px) { + article { + --pico-block-spacing-vertical: calc(var(--pico-spacing) * 1.5); + --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 1.5); + } + .container { max-width: 1000px; } } @media (min-width: 1536px) { + article { + --pico-block-spacing-vertical: calc(var(--pico-spacing) * 1.75); + --pico-block-spacing-horizontal: calc(var(--pico-spacing) * 1.75); + } + .container { max-width: 1000px; } @@ -82,4 +108,12 @@ tr.network:hover { nav li a:has(> div.logo) { margin-bottom: 0; +} + +details > div { + padding: 0 var(--pico-form-element-spacing-horizontal); +} + +pre { + padding: 0.5rem; } \ No newline at end of file diff --git a/src_data/static/app.js b/src_data/static/app.js index 0af1818..2e4285b 100644 --- a/src_data/static/app.js +++ b/src_data/static/app.js @@ -593,7 +593,7 @@ async function loadVars() { setValue('.slave-version', result.parameters.slaveVersion); setValue('.slave-ot-version', result.parameters.slaveOtVersion); - setBusy('.ot-busy', '.ot-table', false); + setBusy('.vars-busy', '.vars-table', false); setValue('.temp-unit', tempUnitStr); setValue('.pressure-unit', pressureUnitStr);