Skip to content

Commit fb24e11

Browse files
refactor(ui): update udjat.css
1 parent 5195cca commit fb24e11

29 files changed

+505
-453
lines changed

esbuild.mjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ let ctx = await esbuild.context({
2626
"./ui/js/index.js",
2727
"./ui/js/helper.js",
2828
"./ui/js/edit-task.js",
29-
"./node_modules/htmx.org/dist/ext/path-deps.js",
30-
"./node_modules/htmx.org/dist/ext/json-enc.js",
31-
"./node_modules/htmx.org/dist/ext/client-side-templates.js",
29+
"./node_modules/htmx-ext-path-deps/path-deps.js",
30+
"./node_modules/htmx-ext-json-enc/json-enc.js",
31+
"./node_modules/htmx-ext-client-side-templates/client-side-templates.js",
3232
],
3333
external: ["*.svg", "*.woff2", "*.ttf"],
3434
entryNames: "[ext]/[name]", // will name the result files by their folder names

maat/app/maat-api.hoon

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
[(send [404 ~ [%plain "404 - Not Found"]]) state]
122122
::
123123
%version
124-
[(send [200 ~ [%json (version:enjs '2024-06-16.3')]]) state]
124+
[(send [200 ~ [%json (version:enjs '2024-06-21.2')]]) state]
125125
::
126126
%members
127127
[(send [200 ~ [%json (ships:enjs reg)]]) state]

maat/app/maat-ui.hoon

+3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
/* js-index %js /app/ui/js/index/js
2828
/* js-helper %js /app/ui/js/helper/js
2929
/* js-edit-task %js /app/ui/js/edit-task/js
30+
/* js-htmx %js /app/ui/js/htmx/js
3031
/* js-json-enc %js /app/ui/js/json-enc/js
3132
/* js-path-deps %js /app/ui/js/path-deps/js
3233
/* js-client-side-templates %js /app/ui/js/client-side-templates/js
@@ -156,6 +157,8 @@
156157
[(send [200 ~ [%js js-helper]]) state]
157158
[%apps %maat %edit-task ~]
158159
[(send [200 ~ [%js js-edit-task]]) state]
160+
[%apps %maat %htmx ~]
161+
[(send [200 ~ [%js js-htmx]]) state]
159162
[%apps %maat %json-enc ~]
160163
[(send [200 ~ [%js js-json-enc]]) state]
161164
[%apps %maat %path-deps ~]

package-lock.json

+40-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
"author": "~talfus-laddus",
77
"license": "MIT",
88
"dependencies": {
9-
"htmx.org": "^1.9.12",
9+
"htmx.org": "^2.0.0",
10+
"htmx-ext-client-side-templates": "^2.0.0",
11+
"htmx-ext-json-enc": "^2.0.0",
12+
"htmx-ext-path-deps": "^2.0.0",
1013
"mustache": "^4.2.0"
1114
},
1215
"devDependencies": {

ui/css/style.css

+15-76
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,6 @@ button::after.icon-circle {
1818
font-display: swap;
1919
}
2020

21-
:root {
22-
--sidebar-gap: var(--vspace);
23-
/* --sidebar-side-minwidth: 0; */
24-
--sidebar-main-minwidth: 50%;
25-
26-
font-family: Inter, sans-serif;
27-
font-feature-settings:
28-
"liga" 1,
29-
"calt" 1;
30-
/* fix for Chrome */
31-
}
32-
33-
@supports (font-variation-settings: normal) {
34-
:root {
35-
font-family: InterVariable, sans-serif;
36-
}
37-
}
3821

3922
body {
4023
position: relative;
@@ -48,12 +31,13 @@ h1 {
4831
font-weight: 600;
4932
}
5033

51-
h2 {
52-
font-family: "Soria";
53-
font-weight: normal;
54-
text-transform: none;
55-
}
34+
/* h2 { */
35+
/* font-family: "Soria"; */
36+
/* font-weight: normal; */
37+
/* text-transform: none; */
38+
/* } */
5639

40+
.inline_form,
5741
form.inline {
5842
display: inline-block;
5943

@@ -81,10 +65,11 @@ header > .header-icon {
8165
}
8266

8367
.svg-ico {
84-
margin-top: var(--vspace);
68+
margin-top: var(--vspace-0);
8569
display: inline;
8670
vertical-align: middle;
8771
height: 4em;
72+
/* margin-bottom: var(--vspace-2); */
8873
/* height: 2em; */
8974
/* width: 2em; */
9075
}
@@ -108,52 +93,6 @@ header > .header-icon {
10893
/* max-width: calc(1.3 * var(--max-width)); */
10994
/* } */
11095

111-
.with-sidebar {
112-
display: flex;
113-
flex-wrap: wrap;
114-
gap: var(--sidebar-gap);
115-
}
116-
117-
.with-sidebar > :first-child {
118-
/* sidebar */
119-
/* ↓ The width when the sidebar _is_ a sidebar */
120-
/* flex-basis: 30%; */
121-
flex-basis: var(--sidebar-minwidth);
122-
flex-grow: 1;
123-
}
124-
125-
.with-sidebar > :last-child {
126-
/* not-sidebar (main) */
127-
/* ↓ Grow from nothing and take up all available space */
128-
flex-basis: 0;
129-
flex-grow: 999;
130-
/* ↓ Wrap when the elements are of equal width */
131-
min-inline-size: 50%;
132-
}
133-
134-
.with-sidebar > div > nav ul,
135-
.with-sidebar > div > nav ol {
136-
/* align-content: space-around; */
137-
display: flex;
138-
flex-direction: column;
139-
justify-content: start;
140-
list-style-type: none;
141-
flex-wrap: wrap;
142-
padding: 0;
143-
}
144-
145-
/* List items are inline elements, make them behave more like blocks */
146-
.with-sidebar > div > nav ul li,
147-
.with-sidebar > div > nav ol li {
148-
display: inline-block;
149-
}
150-
151-
.with-sidebar > div > nav a,
152-
.with-sidebar > div > nav a:visited {
153-
display: inline-block;
154-
padding: 0.1rem 1rem;
155-
}
156-
15796
main > ul {
15897
padding: 0;
15998
}
@@ -238,7 +177,7 @@ main > ul > li {
238177
}
239178

240179
.tasks > li:not(:last-child) {
241-
margin-bottom: var(--vspace-4);
180+
margin-bottom: var(--vspace--1);
242181
}
243182

244183
/* .column { */
@@ -282,17 +221,17 @@ main > ul > li {
282221
position: sticky;
283222
top: 0;
284223
background: var(--color-bg);
285-
padding-top: var(--vspace-3);
286-
padding-bottom: var(--vspace-4);
224+
padding-top: var(--vspace--1);
225+
padding-bottom: var(--vspace--2);
287226
}
288227

289228
.sticky-bottom {
290229
/* use together with .top or .bottom */
291230
position: sticky;
292231
bottom: 0;
293232
background: var(--color-bg);
294-
padding-top: var(--vspace-4);
295-
padding-bottom: var(--vspace-3);
233+
padding-top: var(--vspace--2);
234+
padding-bottom: var(--vspace--1);
296235
}
297236

298237
/* lists table */
@@ -312,10 +251,10 @@ main > ul > li {
312251
.lists > :is(thead, tbody) > tr > :is(th, td) {
313252
overflow: hidden;
314253
text-overflow: ellipsis;
315-
padding-bottom: var(--vspace-4);
254+
padding-bottom: var(--vspace--2);
316255

317256
&:first-child {
318-
padding-top: var(--vspace-4);
257+
padding-top: var(--vspace--2);
319258
}
320259
}
321260

0 commit comments

Comments
 (0)