Skip to content

Commit 9a926e7

Browse files
srg74srg74
authored
Merge branch 'wled:main' into main
2 parents 9edd538 + 610c80a commit 9a926e7

File tree

14 files changed

+153
-38
lines changed

14 files changed

+153
-38
lines changed

‎.github/copilot-instructions.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ The build has two main phases:
6363
### Code Validation
6464
- **No automated linting configured** - follow existing code style in files you edit
6565
- **Code style**: Use tabs for web files (.html/.css/.js), spaces (2 per level) for C++ files
66+
- **Language**: The repository language is English (british, american, canadian, or australian). If you find other languages, suggest a translation into English.
6667
- **C++ formatting available**: `clang-format` is installed but not in CI
6768
- **Always run tests before finishing**: `npm test`
6869
- **MANDATORY: Always run a hardware build before finishing** (see "Before Finishing Work" section below)

‎wled00/data/icons-ui/HowTo_AddNewIcons.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
To edit the current font, this is the workflow:
2+
3+
go to https://icomoon.io/
4+
In the menu, go to manage projects and import the json file from this folder and load it
5+
Add new icons or exchange existing ones: if changing existing one, make sure the unicode stays the same (can be edited before exporting)
6+
Go to "Generate SVG & More" and check the size of new icons (clicking on icons brings up the editor) -> scale new icons to match the size of existing ones
7+
Go to "Generate font" tab, check unicodes are correct (can use any unicode, range > e900 is "custom range" and now preferred)
8+
Download the font package and replace the files in this folder with new files
9+
Using an online converter, convert the *.woff font into woff2 format (about half the file size)
10+
Using another online converter, convert the woff2 font to base64 encoding for CSS
11+
in index.css, replace the font string at the top, keep the "data:font/woff2;charset=utf-8;" and dont use octet-stream (browser compatibility).
12+
13+
enjoy your new icons in the UI :)
14+

‎wled00/data/icons-ui/Read Me.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Open *demo.html* to see a list of all the glyphs in your font along with their codes/ligatures.
22

3-
To use the generated font in desktop programs, you can install the TTF font. In order to copy the character associated with each icon, refer to the text box at the bottom right corner of each glyph in demo.html. The character inside this text box may be invisible; but it can still be copied. See this guide for more info: https://icomoon.io/#docs/local-fonts
3+
To use the generated font in desktop programs, you can install the TTF font. In order to copy the character associated with each icon, refer to the text box at the bottom right corner of each glyph in demo.html. The character inside this text box may be invisible; but it can still be copied. See this guide for more info: https://icomoon.io/docs#install
44

55
You won't need any of the files located under the *demo-files* directory when including the generated font in your own projects.
66

‎wled00/data/icons-ui/demo-files/demo.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,12 @@ p {
147147
font-size: 16px;
148148
}
149149
.fs1 {
150+
font-size: 48px;
151+
}
152+
.fs2 {
153+
font-size: 28px;
154+
}
155+
.fs3 {
150156
font-size: 32px;
151157
}
152158

‎wled00/data/icons-ui/demo.html‎

Lines changed: 59 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!doctype html>
2-
<html lang="en">
2+
<html>
33
<head>
44
<meta charset="utf-8">
55
<title>IcoMoon Demo</title>
@@ -9,11 +9,45 @@
99
<link rel="stylesheet" href="style.css"></head>
1010
<body>
1111
<div class="bgc1 clearfix">
12-
<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> wled122 <small class="fgc1">(Glyphs:&nbsp;23)</small></h1>
12+
<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> wled122 <small class="fgc1">(Glyphs:&nbsp;25)</small></h1>
1313
</div>
1414
<div class="clearfix mhl ptl">
15-
<h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
15+
<h1 class="mvm mtn fgc1">Grid Size: 16</h1>
1616
<div class="glyph fs1">
17+
<div class="clearfix bshadow0 pbs">
18+
<span class="i-pixelforge"></span>
19+
<span class="mls"> i-pixelforge</span>
20+
</div>
21+
<fieldset class="fs0 size1of1 clearfix hidden-false">
22+
<input type="text" readonly value="e900" class="unit size1of2" />
23+
<input type="text" maxlength="1" readonly value="&#xe900;" class="unitRight size1of2 talign-right" />
24+
</fieldset>
25+
<div class="fs0 bshadow0 clearfix hidden-true">
26+
<span class="unit pvs fgc1">liga: </span>
27+
<input type="text" readonly value="" class="liga unitRight" />
28+
</div>
29+
</div>
30+
</div>
31+
<div class="clearfix mhl ptl">
32+
<h1 class="mvm mtn fgc1">Grid Size: 14</h1>
33+
<div class="glyph fs2">
34+
<div class="clearfix bshadow0 pbs">
35+
<span class="i-editor"></span>
36+
<span class="mls"> i-editor</span>
37+
</div>
38+
<fieldset class="fs0 size1of1 clearfix hidden-false">
39+
<input type="text" readonly value="e901" class="unit size1of2" />
40+
<input type="text" maxlength="1" readonly value="&#xe901;" class="unitRight size1of2 talign-right" />
41+
</fieldset>
42+
<div class="fs0 bshadow0 clearfix hidden-true">
43+
<span class="unit pvs fgc1">liga: </span>
44+
<input type="text" readonly value="" class="liga unitRight" />
45+
</div>
46+
</div>
47+
</div>
48+
<div class="clearfix mhl ptl">
49+
<h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
50+
<div class="glyph fs3">
1751
<div class="clearfix bshadow0 pbs">
1852
<span class="i-pattern"></span>
1953
<span class="mls"> i-pattern</span>
@@ -27,7 +61,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
2761
<input type="text" readonly value="" class="liga unitRight" />
2862
</div>
2963
</div>
30-
<div class="glyph fs1">
64+
<div class="glyph fs3">
3165
<div class="clearfix bshadow0 pbs">
3266
<span class="i-segments"></span>
3367
<span class="mls"> i-segments</span>
@@ -41,7 +75,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
4175
<input type="text" readonly value="" class="liga unitRight" />
4276
</div>
4377
</div>
44-
<div class="glyph fs1">
78+
<div class="glyph fs3">
4579
<div class="clearfix bshadow0 pbs">
4680
<span class="i-sun"></span>
4781
<span class="mls"> i-sun</span>
@@ -55,7 +89,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
5589
<input type="text" readonly value="" class="liga unitRight" />
5690
</div>
5791
</div>
58-
<div class="glyph fs1">
92+
<div class="glyph fs3">
5993
<div class="clearfix bshadow0 pbs">
6094
<span class="i-palette"></span>
6195
<span class="mls"> i-palette</span>
@@ -69,7 +103,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
69103
<input type="text" readonly value="" class="liga unitRight" />
70104
</div>
71105
</div>
72-
<div class="glyph fs1">
106+
<div class="glyph fs3">
73107
<div class="clearfix bshadow0 pbs">
74108
<span class="i-eye"></span>
75109
<span class="mls"> i-eye</span>
@@ -83,7 +117,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
83117
<input type="text" readonly value="" class="liga unitRight" />
84118
</div>
85119
</div>
86-
<div class="glyph fs1">
120+
<div class="glyph fs3">
87121
<div class="clearfix bshadow0 pbs">
88122
<span class="i-speed"></span>
89123
<span class="mls"> i-speed</span>
@@ -97,7 +131,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
97131
<input type="text" readonly value="" class="liga unitRight" />
98132
</div>
99133
</div>
100-
<div class="glyph fs1">
134+
<div class="glyph fs3">
101135
<div class="clearfix bshadow0 pbs">
102136
<span class="i-expand"></span>
103137
<span class="mls"> i-expand</span>
@@ -111,7 +145,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
111145
<input type="text" readonly value="" class="liga unitRight" />
112146
</div>
113147
</div>
114-
<div class="glyph fs1">
148+
<div class="glyph fs3">
115149
<div class="clearfix bshadow0 pbs">
116150
<span class="i-power"></span>
117151
<span class="mls"> i-power</span>
@@ -125,7 +159,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
125159
<input type="text" readonly value="" class="liga unitRight" />
126160
</div>
127161
</div>
128-
<div class="glyph fs1">
162+
<div class="glyph fs3">
129163
<div class="clearfix bshadow0 pbs">
130164
<span class="i-settings"></span>
131165
<span class="mls"> i-settings</span>
@@ -139,7 +173,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
139173
<input type="text" readonly value="" class="liga unitRight" />
140174
</div>
141175
</div>
142-
<div class="glyph fs1">
176+
<div class="glyph fs3">
143177
<div class="clearfix bshadow0 pbs">
144178
<span class="i-playlist"></span>
145179
<span class="mls"> i-playlist</span>
@@ -153,7 +187,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
153187
<input type="text" readonly value="" class="liga unitRight" />
154188
</div>
155189
</div>
156-
<div class="glyph fs1">
190+
<div class="glyph fs3">
157191
<div class="clearfix bshadow0 pbs">
158192
<span class="i-night"></span>
159193
<span class="mls"> i-night</span>
@@ -167,7 +201,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
167201
<input type="text" readonly value="" class="liga unitRight" />
168202
</div>
169203
</div>
170-
<div class="glyph fs1">
204+
<div class="glyph fs3">
171205
<div class="clearfix bshadow0 pbs">
172206
<span class="i-cancel"></span>
173207
<span class="mls"> i-cancel</span>
@@ -181,7 +215,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
181215
<input type="text" readonly value="" class="liga unitRight" />
182216
</div>
183217
</div>
184-
<div class="glyph fs1">
218+
<div class="glyph fs3">
185219
<div class="clearfix bshadow0 pbs">
186220
<span class="i-sync"></span>
187221
<span class="mls"> i-sync</span>
@@ -195,7 +229,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
195229
<input type="text" readonly value="" class="liga unitRight" />
196230
</div>
197231
</div>
198-
<div class="glyph fs1">
232+
<div class="glyph fs3">
199233
<div class="clearfix bshadow0 pbs">
200234
<span class="i-confirm"></span>
201235
<span class="mls"> i-confirm</span>
@@ -209,7 +243,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
209243
<input type="text" readonly value="" class="liga unitRight" />
210244
</div>
211245
</div>
212-
<div class="glyph fs1">
246+
<div class="glyph fs3">
213247
<div class="clearfix bshadow0 pbs">
214248
<span class="i-brightness"></span>
215249
<span class="mls"> i-brightness</span>
@@ -223,7 +257,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
223257
<input type="text" readonly value="" class="liga unitRight" />
224258
</div>
225259
</div>
226-
<div class="glyph fs1">
260+
<div class="glyph fs3">
227261
<div class="clearfix bshadow0 pbs">
228262
<span class="i-nodes"></span>
229263
<span class="mls"> i-nodes</span>
@@ -237,7 +271,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
237271
<input type="text" readonly value="" class="liga unitRight" />
238272
</div>
239273
</div>
240-
<div class="glyph fs1">
274+
<div class="glyph fs3">
241275
<div class="clearfix bshadow0 pbs">
242276
<span class="i-add"></span>
243277
<span class="mls"> i-add</span>
@@ -251,7 +285,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
251285
<input type="text" readonly value="" class="liga unitRight" />
252286
</div>
253287
</div>
254-
<div class="glyph fs1">
288+
<div class="glyph fs3">
255289
<div class="clearfix bshadow0 pbs">
256290
<span class="i-edit"></span>
257291
<span class="mls"> i-edit</span>
@@ -265,7 +299,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
265299
<input type="text" readonly value="" class="liga unitRight" />
266300
</div>
267301
</div>
268-
<div class="glyph fs1">
302+
<div class="glyph fs3">
269303
<div class="clearfix bshadow0 pbs">
270304
<span class="i-intensity"></span>
271305
<span class="mls"> i-intensity</span>
@@ -279,7 +313,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
279313
<input type="text" readonly value="" class="liga unitRight" />
280314
</div>
281315
</div>
282-
<div class="glyph fs1">
316+
<div class="glyph fs3">
283317
<div class="clearfix bshadow0 pbs">
284318
<span class="i-star"></span>
285319
<span class="mls"> i-star</span>
@@ -293,7 +327,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
293327
<input type="text" readonly value="" class="liga unitRight" />
294328
</div>
295329
</div>
296-
<div class="glyph fs1">
330+
<div class="glyph fs3">
297331
<div class="clearfix bshadow0 pbs">
298332
<span class="i-info"></span>
299333
<span class="mls"> i-info</span>
@@ -307,7 +341,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
307341
<input type="text" readonly value="" class="liga unitRight" />
308342
</div>
309343
</div>
310-
<div class="glyph fs1">
344+
<div class="glyph fs3">
311345
<div class="clearfix bshadow0 pbs">
312346
<span class="i-del"></span>
313347
<span class="mls"> i-del</span>
@@ -321,7 +355,7 @@ <h1 class="mvm mtn fgc1">Grid Size: Unknown</h1>
321355
<input type="text" readonly value="" class="liga unitRight" />
322356
</div>
323357
</div>
324-
<div class="glyph fs1">
358+
<div class="glyph fs3">
325359
<div class="clearfix bshadow0 pbs">
326360
<span class="i-presets"></span>
327361
<span class="mls"> i-presets</span>

0 commit comments

Comments
 (0)