Skip to content

Commit 0d452d6

Browse files
committed
Improved layout.
1 parent 4f2f232 commit 0d452d6

File tree

3 files changed

+22
-27
lines changed

3 files changed

+22
-27
lines changed

src/common/themes.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
--img-ui-clock: url(/img/ui-clock64.png);
3232

3333
--icon-size: 2.2em;
34-
--line-size: 1.7em;
35-
--popup-size: 640px;
34+
--line-size: 1.5em;
35+
--popup-size: 600px;
3636

3737
--bg-preset-color: var(--form-color2);
3838
--bg-focused-row: linear-gradient(to bottom, var(--form-color1) 0, var(--form-color2) 70%, var(--bg-color1) 100%) no-repeat;

src/ui/ui.css

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,9 @@ input[type="checkbox"] {
181181
border-spacing: 0;
182182
width: 100%;
183183
image-rendering: -webkit-optimize-contrast;
184+
--extra-preset-width: 0px;
184185
}
186+
185187
.vintage .sites {
186188
image-rendering: auto;
187189
}
@@ -310,8 +312,9 @@ span.preset {
310312
-moz-appearance: none;
311313
background: var(--img-ui-no) no-repeat center;
312314
outline: 0;
313-
opacity: .8;
314-
margin: 0 .5em 0.13em .5em;
315+
opacity: .7;
316+
margin: 0 .5em;
317+
background-position: 0;
315318
background-size: var(--line-size);
316319
width: var(--line-size);
317320
height: var(--line-size);
@@ -334,8 +337,7 @@ span.preset {
334337
.presets input.preset:checked, #presets input.preset, #presets-sizer input.preset {
335338
opacity: 1;
336339
transform: none;
337-
min-width: 9.38em;
338-
background-position-x: calc(var(--line-size) / 10);
340+
min-width: calc(var(--preset-label-width) + var(--line-size) + var(--extra-preset-width));
339341
}
340342

341343
.presets input.preset:focus {
@@ -455,13 +457,22 @@ input.preset:checked ~ input.temp {
455457
position: relative;
456458
}
457459

458-
.customizing input.preset:checked, #presets input.preset, #presets input.preset:checked {
459-
margin: 0 0 -0.2em 1em;
460+
.customizing input.preset:checked {
461+
margin: 0 0 -0.2em 0;
462+
border-radius: 1em 1em 0 0;
463+
background-position: 0.5em 0;
464+
--extra-preset-width: 1em;
465+
}
466+
467+
#presets :is(input.preset, input.preset:checked) {
468+
margin: 0 .5em -0.2em 0;
460469
border-radius: 1em 1em 0 0;
470+
background-position: 0.5em 0;
471+
--extra-preset-width: 0px;
461472
}
462473

463-
.customizing input.preset:checked + label.preset {
464-
padding-left: 3.2em;
474+
#presets .customizing input.preset:not(:checked) {
475+
margin-bottom: 0;
465476
}
466477

467478
.sites .customizing, .customizer {

src/ui/ui.js

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -463,25 +463,9 @@ var UI = (() => {
463463
let labelWidth = 0;
464464
for (let l of sizer.querySelectorAll("label.preset")) {
465465
let lw = l.offsetWidth;
466-
debug("lw", l.textContent, lw);
467466
if (lw > labelWidth) labelWidth = lw;
468467
}
469-
470-
debug(`Preset: %s Label: %s`, presetWidth, labelWidth);
471-
labelWidth += 16;
472-
if (presetWidth < labelWidth) {
473-
for (let ss of document.styleSheets) {
474-
if (ss.href.endsWith("/ui.css")) {
475-
for (let r of ss.cssRules) {
476-
if (/input\.preset:checked.*min-width:/.test(r.cssText)) {
477-
r.style.minWidth = (labelWidth) + "px";
478-
break;
479-
}
480-
}
481-
}
482-
}
483-
}
484-
468+
document.documentElement.style.setProperty("--preset-label-width", (labelWidth) + "px");
485469
sizer.remove();
486470
UI.Sites.correctSize = () => {}; // just once, please!
487471
}

0 commit comments

Comments
 (0)