Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
40f544f
Reimplemented simplified UI
w00000dy Nov 9, 2023
23374e9
Added preset quick load before palette list
w00000dy Nov 9, 2023
40cc30e
Remove unnecessary comment in simple.js
w00000dy Nov 9, 2023
63ad3f9
Show brightness slider
w00000dy Nov 9, 2023
d3b7b85
Fix palette list shadow of selected option
w00000dy Nov 9, 2023
b852b6f
Add simplifiedUI to info object
w00000dy Nov 13, 2023
0c97d77
Remove no longer needed code for simplifiedUI
w00000dy Nov 13, 2023
a3dd6ce
simplifiedUI moved to index.js
w00000dy Nov 14, 2023
3ee3b97
Remove old simplifiedUI code and update cdata.js
w00000dy Nov 14, 2023
e4ec656
Enable simplifiedUI by default
w00000dy Nov 14, 2023
029403e
Only Effect Search should stay on top
w00000dy Nov 14, 2023
0a97717
Add simplified segments
w00000dy Nov 16, 2023
d880f3c
Add palette list dropdown
w00000dy Nov 16, 2023
f717ce5
Display effect mode text on small screens
w00000dy Nov 16, 2023
3e7cc8a
add comment for simplifyUI()
w00000dy Nov 16, 2023
32af173
minor improvements
w00000dy Nov 17, 2023
5e1d601
Fix color picker
w00000dy Nov 17, 2023
520826a
Minor tewaks.
blazoncek Nov 22, 2023
ce0d906
Dev mode fix.
blazoncek Nov 22, 2023
db276d5
moved segcont simplification to simplifyUI()
w00000dy Nov 22, 2023
25eef2a
Show palette selection in a dialog
Moustachauve Nov 23, 2023
cff42b5
Improve palette list resizing a bit
Moustachauve Nov 23, 2023
bd620a7
Fix width issue with simplified UI due to desktop mode leftovers
Moustachauve Nov 30, 2023
fa5648c
Remove hideD class to use hide class instead
w00000dy Nov 30, 2023
518a0de
minor tweak
w00000dy Nov 30, 2023
0f24d92
Update background color of palette dialog
w00000dy Nov 30, 2023
0ab71ba
Clear palette search when dialog is opened
w00000dy Nov 30, 2023
8fc0dda
Reset scrolling when opening pallet dialog
w00000dy Nov 30, 2023
f223075
Update padding of palette dialog
w00000dy Nov 30, 2023
1578aa7
Finalize rebase
w00000dy Dec 1, 2023
2abbf7e
Hide palette dialog if not available
w00000dy Dec 1, 2023
23d44cb
Update top position in .dialog CSS
w00000dy Dec 4, 2023
fd3be88
Add dropdown for effects
w00000dy Dec 6, 2023
058995a
fix selected effect position
w00000dy Dec 6, 2023
d0c6e7a
Add check if UI was already simplified
w00000dy Dec 6, 2023
1db6c28
Hide buttons for pixel art and custom palettes
w00000dy Dec 7, 2023
aec331b
Add selected palette and effect names to dropdown
w00000dy Dec 7, 2023
930a1ae
Fix dialog scrollbar on Firefox
w00000dy Dec 7, 2023
21c2316
Minor optimizations
w00000dy Dec 8, 2023
830f806
Fix segments not be displayed in simplified ui
w00000dy Dec 8, 2023
64312ae
npm and minor tweak
blazoncek Dec 9, 2023
687e2ec
Merge branch '0_15' into simple-mode
blazoncek Dec 9, 2023
2dbf72e
Better implementation of dialog
w00000dy Dec 11, 2023
2a40baf
Update backdrop-filter blur value in index.css
w00000dy Dec 12, 2023
db17959
Fix dialog backdrop blur on Safari
w00000dy Dec 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 1 addition & 27 deletions tools/cdata.js
Original file line number Diff line number Diff line change
Expand Up @@ -219,36 +219,10 @@ function writeChunks(srcDir, specs, resultFile) {
}

writeHtmlGzipped("wled00/data/index.htm", "wled00/html_ui.h", 'index');
writeHtmlGzipped("wled00/data/simple.htm", "wled00/html_simple.h", 'simple');
writeHtmlGzipped("wled00/data/pixart/pixart.htm", "wled00/html_pixart.h", 'pixart');
writeHtmlGzipped("wled00/data/cpal/cpal.htm", "wled00/html_cpal.h", 'cpal');
writeHtmlGzipped("wled00/data/pxmagic/pxmagic.htm", "wled00/html_pxmagic.h", 'pxmagic');
/*
writeChunks(
"wled00/data",
[
{
file: "simple.css",
name: "PAGE_simpleCss",
method: "gzip",
filter: "css-minify",
},
{
file: "simple.js",
name: "PAGE_simpleJs",
method: "gzip",
filter: "js-minify",
},
{
file: "simple.htm",
name: "PAGE_simple",
method: "gzip",
filter: "html-minify-ui",
}
],
"wled00/html_simplex.h"
);
*/

writeChunks(
"wled00/data",
[
Expand Down
4 changes: 0 additions & 4 deletions wled00/cfg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
getStringFromJson(cmDNS, id[F("mdns")], 33);
getStringFromJson(serverDescription, id[F("name")], 33);
getStringFromJson(alexaInvocationName, id[F("inv")], 33);
#ifdef WLED_ENABLE_SIMPLE_UI
CJSON(simplifiedUI, id[F("sui")]);
#endif

JsonObject nw = doc["nw"];
#ifndef WLED_DISABLE_ESPNOW
Expand Down Expand Up @@ -655,9 +653,7 @@ void serializeConfig() {
id[F("mdns")] = cmDNS;
id[F("name")] = serverDescription;
id[F("inv")] = alexaInvocationName;
#ifdef WLED_ENABLE_SIMPLE_UI
id[F("sui")] = simplifiedUI;
#endif

JsonObject nw = doc.createNestedObject("nw");
#ifndef WLED_DISABLE_ESPNOW
Expand Down
38 changes: 36 additions & 2 deletions wled00/data/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,16 @@ button {
padding: 5px 0 0;
}

/* Quick load magin for simplified UI */
.simplified #pql {
margin-bottom: 8px;
}

/* Button margin for simplified UI */
.simplified #fx .btn, .simplified #palw .btn {
margin-top: 0;
}

.smooth { transition: transform calc(var(--f, 1)*.5s) ease-out }

.tab-label {
Expand Down Expand Up @@ -413,6 +423,7 @@ button {
position: sticky;
bottom: 0;
max-width: 300px;
z-index: 2;
}

#sliders .labels {
Expand Down Expand Up @@ -754,13 +765,17 @@ input[type=range]::-moz-range-thumb {
}

#Colors .sliderwrap {
margin: 4px 0 0;
margin: 2px 0 0;
}

/* Dynamically hide brightness slider label */
/* Dynamically hide labels */
.hd {
display: var(--bhd);
}
/* Do not hide quick load label in simplified mode on small screen widths */
.simplified #pql .hd {
display: var(--bhd) !important;
}

#briwrap {
min-width: 300px;
Expand Down Expand Up @@ -1284,6 +1299,12 @@ TD .checkmark, TD .radiomark {
margin-top: 0;
}

/* Simplify segments */
.simplified #segcont .lstI {
margin-top: 4px;
min-height: unset;
}

/* selected item/element */
.selected { /* has to be after .lstI since !important is not ok */
background: var(--c-4);
Expand Down Expand Up @@ -1324,6 +1345,19 @@ TD .checkmark, TD .radiomark {
top: calc(var(--sti) + 42px);
}

dialog::backdrop {
backdrop-filter: blur(10px);
-webkit-backdrop-filter: blur(10px);
}
dialog {
max-height: 70%;
border: 0;
border-radius: 10px;
background: linear-gradient(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.1)), var(--c-3);
box-shadow: 4px 4px 10px 4px var(--c-1);
color: var(--c-f);
}

#fxlist .lstI.sticky,
#pallist .lstI.sticky {
top: var(--sti);
Expand Down
2 changes: 1 addition & 1 deletion wled00/data/index.htm
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
<input id="hexc" tooltip="Hex RGB" type="text" class="noslide" onkeydown="hexEnter()" autocomplete="off" maxlength="8" />
<button id="hexcnf" class="btn btn-xs" onclick="fromHex();"><i class="icons btn-icon">&#xe390;</i></button>
</div>
<div style="padding: 8px 0;">
<div style="padding: 8px 0;" id="btns">
<button class="btn btn-xs" tooltip="Pixel Magic Tool" type="button" id="pxmb" onclick="window.location.href=getURL('/pxmagic.htm')"><i class="icons btn-icon">&#xe410;</i></button>
<button class="btn btn-xs" tooltip="Add custom palette" type="button" onclick="window.location.href=getURL('/cpal.htm')"><i class="icons btn-icon">&#xe18a;</i></button>
<button class="btn btn-xs" tooltip="Remove custom palette" type="button" id="rmPal" onclick="palettesData=null;localStorage.removeItem('wledPalx');requestJson({rmcpal:true});setTimeout(loadPalettes,250,loadPalettesData);"><i class="icons btn-icon">&#xe037;</i></button>
Expand Down
Loading