From e6056677192bdc6c33793e20d9b653195972694d Mon Sep 17 00:00:00 2001 From: David Vazgenovich Shakaryan Date: Fri, 13 May 2022 00:53:48 -0700 Subject: web: add better icons for PWA --- web/COPYING_bootstrap-icons | 21 +++ web/COPYING_icons | 21 --- web/Makefile | 2 +- web/static/dartboat.webmanifest | 23 ++-- web/static/dartboat_128.png | Bin 22291 -> 0 bytes web/static/dartboat_16.png | Bin 932 -> 0 bytes web/static/dartboat_192.png | Bin 38037 -> 0 bytes web/static/dartboat_256.png | Bin 55119 -> 0 bytes web/static/dartboat_32.png | Bin 2882 -> 0 bytes web/static/dartboat_512.png | Bin 141754 -> 0 bytes web/static/dartboat_64.png | Bin 7983 -> 0 bytes web/static/dartboat_96.png | Bin 14567 -> 0 bytes web/static/fonts/bootstrap-icons-sub.woff2 | Bin 0 -> 728 bytes web/static/fonts/inter-num.woff2 | Bin 0 -> 2244 bytes web/static/icons.woff2 | Bin 728 -> 0 bytes web/static/icons/dartboat.svg | 203 +++++++++++++++++++++++++++++ web/static/icons/dartboat_128.png | Bin 0 -> 22291 bytes web/static/icons/dartboat_144.png | Bin 0 -> 26017 bytes web/static/icons/dartboat_16.png | Bin 0 -> 932 bytes web/static/icons/dartboat_192.png | Bin 0 -> 38037 bytes web/static/icons/dartboat_192_mask.png | Bin 0 -> 28441 bytes web/static/icons/dartboat_256.png | Bin 0 -> 55119 bytes web/static/icons/dartboat_32.png | Bin 0 -> 2882 bytes web/static/icons/dartboat_48.png | Bin 0 -> 5156 bytes web/static/icons/dartboat_512.png | Bin 0 -> 141754 bytes web/static/icons/dartboat_512_mask.png | Bin 0 -> 105408 bytes web/static/icons/dartboat_64.png | Bin 0 -> 7983 bytes web/static/icons/dartboat_96.png | Bin 0 -> 14567 bytes web/static/index.html | 7 +- web/static/inter-num.woff2 | Bin 2244 -> 0 bytes web/static/style.css | 12 +- web/static/sw.js | 19 +-- 32 files changed, 256 insertions(+), 52 deletions(-) create mode 100644 web/COPYING_bootstrap-icons delete mode 100644 web/COPYING_icons delete mode 100644 web/static/dartboat_128.png delete mode 100644 web/static/dartboat_16.png delete mode 100644 web/static/dartboat_192.png delete mode 100644 web/static/dartboat_256.png delete mode 100644 web/static/dartboat_32.png delete mode 100644 web/static/dartboat_512.png delete mode 100644 web/static/dartboat_64.png delete mode 100644 web/static/dartboat_96.png create mode 100644 web/static/fonts/bootstrap-icons-sub.woff2 create mode 100644 web/static/fonts/inter-num.woff2 delete mode 100644 web/static/icons.woff2 create mode 100644 web/static/icons/dartboat.svg create mode 100644 web/static/icons/dartboat_128.png create mode 100644 web/static/icons/dartboat_144.png create mode 100644 web/static/icons/dartboat_16.png create mode 100644 web/static/icons/dartboat_192.png create mode 100644 web/static/icons/dartboat_192_mask.png create mode 100644 web/static/icons/dartboat_256.png create mode 100644 web/static/icons/dartboat_32.png create mode 100644 web/static/icons/dartboat_48.png create mode 100644 web/static/icons/dartboat_512.png create mode 100644 web/static/icons/dartboat_512_mask.png create mode 100644 web/static/icons/dartboat_64.png create mode 100644 web/static/icons/dartboat_96.png delete mode 100644 web/static/inter-num.woff2 diff --git a/web/COPYING_bootstrap-icons b/web/COPYING_bootstrap-icons new file mode 100644 index 0000000..47f06b6 --- /dev/null +++ b/web/COPYING_bootstrap-icons @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2019-2021 The Bootstrap Authors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/web/COPYING_icons b/web/COPYING_icons deleted file mode 100644 index 47f06b6..0000000 --- a/web/COPYING_icons +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2019-2021 The Bootstrap Authors - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/web/Makefile b/web/Makefile index 66d88f7..07b7d78 100644 --- a/web/Makefile +++ b/web/Makefile @@ -15,7 +15,7 @@ all: $(TARGET) $(TARGET): $(SRC) mkdir $(TARGET) $(CC) $(CFLAGS) $^ -o $(TARGET)/dartboat_wasm.js - cp static/* $(TARGET)/ + cp -r static/* $(TARGET)/ clean: rm -rf $(TARGET) diff --git a/web/static/dartboat.webmanifest b/web/static/dartboat.webmanifest index 1321595..f6023bd 100644 --- a/web/static/dartboat.webmanifest +++ b/web/static/dartboat.webmanifest @@ -4,16 +4,21 @@ "start_url": "./", "display": "standalone", - "background_color": "#311d52", + "background_color": "#1a1a1a", + "theme_color": "#311d52", "icons": [ - { "src": "dartboat_16.png", "sizes": "16x16", "type": "image/png" }, - { "src": "dartboat_32.png", "sizes": "32x32", "type": "image/png" }, - { "src": "dartboat_64.png", "sizes": "64x64", "type": "image/png" }, - { "src": "dartboat_96.png", "sizes": "96x96", "type": "image/png" }, - { "src": "dartboat_128.png", "sizes": "128x128", "type": "image/png" }, - { "src": "dartboat_192.png", "sizes": "192x192", "type": "image/png" }, - { "src": "dartboat_256.png", "sizes": "256x256", "type": "image/png" }, - { "src": "dartboat_512.png", "sizes": "512x512", "type": "image/png" } + { "src": "icons/dartboat_16.png", "sizes": "16x16", "type": "image/png" }, + { "src": "icons/dartboat_32.png", "sizes": "32x32", "type": "image/png" }, + { "src": "icons/dartboat_48.png", "sizes": "48x48", "type": "image/png" }, + { "src": "icons/dartboat_64.png", "sizes": "64x64", "type": "image/png" }, + { "src": "icons/dartboat_96.png", "sizes": "96x96", "type": "image/png" }, + { "src": "icons/dartboat_128.png", "sizes": "128x128", "type": "image/png" }, + { "src": "icons/dartboat_144.png", "sizes": "144x144", "type": "image/png" }, + { "src": "icons/dartboat_192.png", "sizes": "192x192", "type": "image/png" }, + { "src": "icons/dartboat_256.png", "sizes": "256x256", "type": "image/png" }, + { "src": "icons/dartboat_512.png", "sizes": "512x512", "type": "image/png" }, + { "src": "icons/dartboat_192_mask.png", "sizes": "192x192", "type": "image/png", "purpose": "maskable" }, + { "src": "icons/dartboat_512_mask.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable" } ] } diff --git a/web/static/dartboat_128.png b/web/static/dartboat_128.png deleted file mode 100644 index 1a3cd6f..0000000 Binary files a/web/static/dartboat_128.png and /dev/null differ diff --git a/web/static/dartboat_16.png b/web/static/dartboat_16.png deleted file mode 100644 index 5eb5bf9..0000000 Binary files a/web/static/dartboat_16.png and /dev/null differ diff --git a/web/static/dartboat_192.png b/web/static/dartboat_192.png deleted file mode 100644 index 7749cd1..0000000 Binary files a/web/static/dartboat_192.png and /dev/null differ diff --git a/web/static/dartboat_256.png b/web/static/dartboat_256.png deleted file mode 100644 index 5a09884..0000000 Binary files a/web/static/dartboat_256.png and /dev/null differ diff --git a/web/static/dartboat_32.png b/web/static/dartboat_32.png deleted file mode 100644 index 195b137..0000000 Binary files a/web/static/dartboat_32.png and /dev/null differ diff --git a/web/static/dartboat_512.png b/web/static/dartboat_512.png deleted file mode 100644 index 412805e..0000000 Binary files a/web/static/dartboat_512.png and /dev/null differ diff --git a/web/static/dartboat_64.png b/web/static/dartboat_64.png deleted file mode 100644 index a079375..0000000 Binary files a/web/static/dartboat_64.png and /dev/null differ diff --git a/web/static/dartboat_96.png b/web/static/dartboat_96.png deleted file mode 100644 index 6abdd9e..0000000 Binary files a/web/static/dartboat_96.png and /dev/null differ diff --git a/web/static/fonts/bootstrap-icons-sub.woff2 b/web/static/fonts/bootstrap-icons-sub.woff2 new file mode 100644 index 0000000..3f7ef9b Binary files /dev/null and b/web/static/fonts/bootstrap-icons-sub.woff2 differ diff --git a/web/static/fonts/inter-num.woff2 b/web/static/fonts/inter-num.woff2 new file mode 100644 index 0000000..5cea7a5 Binary files /dev/null and b/web/static/fonts/inter-num.woff2 differ diff --git a/web/static/icons.woff2 b/web/static/icons.woff2 deleted file mode 100644 index 3f7ef9b..0000000 Binary files a/web/static/icons.woff2 and /dev/null differ diff --git a/web/static/icons/dartboat.svg b/web/static/icons/dartboat.svg new file mode 100644 index 0000000..bf0ae28 --- /dev/null +++ b/web/static/icons/dartboat.svg @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 20 + 1 + 18 + 4 + 13 + 6 + 10 + 15 + 2 + 17 + 3 + 19 + 7 + 16 + 8 + 11 + 14 + 9 + 12 + 5 + + diff --git a/web/static/icons/dartboat_128.png b/web/static/icons/dartboat_128.png new file mode 100644 index 0000000..1a3cd6f Binary files /dev/null and b/web/static/icons/dartboat_128.png differ diff --git a/web/static/icons/dartboat_144.png b/web/static/icons/dartboat_144.png new file mode 100644 index 0000000..2981be8 Binary files /dev/null and b/web/static/icons/dartboat_144.png differ diff --git a/web/static/icons/dartboat_16.png b/web/static/icons/dartboat_16.png new file mode 100644 index 0000000..5eb5bf9 Binary files /dev/null and b/web/static/icons/dartboat_16.png differ diff --git a/web/static/icons/dartboat_192.png b/web/static/icons/dartboat_192.png new file mode 100644 index 0000000..7749cd1 Binary files /dev/null and b/web/static/icons/dartboat_192.png differ diff --git a/web/static/icons/dartboat_192_mask.png b/web/static/icons/dartboat_192_mask.png new file mode 100644 index 0000000..c1bc8cd Binary files /dev/null and b/web/static/icons/dartboat_192_mask.png differ diff --git a/web/static/icons/dartboat_256.png b/web/static/icons/dartboat_256.png new file mode 100644 index 0000000..5a09884 Binary files /dev/null and b/web/static/icons/dartboat_256.png differ diff --git a/web/static/icons/dartboat_32.png b/web/static/icons/dartboat_32.png new file mode 100644 index 0000000..195b137 Binary files /dev/null and b/web/static/icons/dartboat_32.png differ diff --git a/web/static/icons/dartboat_48.png b/web/static/icons/dartboat_48.png new file mode 100644 index 0000000..ebab3ec Binary files /dev/null and b/web/static/icons/dartboat_48.png differ diff --git a/web/static/icons/dartboat_512.png b/web/static/icons/dartboat_512.png new file mode 100644 index 0000000..412805e Binary files /dev/null and b/web/static/icons/dartboat_512.png differ diff --git a/web/static/icons/dartboat_512_mask.png b/web/static/icons/dartboat_512_mask.png new file mode 100644 index 0000000..47a7f50 Binary files /dev/null and b/web/static/icons/dartboat_512_mask.png differ diff --git a/web/static/icons/dartboat_64.png b/web/static/icons/dartboat_64.png new file mode 100644 index 0000000..a079375 Binary files /dev/null and b/web/static/icons/dartboat_64.png differ diff --git a/web/static/icons/dartboat_96.png b/web/static/icons/dartboat_96.png new file mode 100644 index 0000000..6abdd9e Binary files /dev/null and b/web/static/icons/dartboat_96.png differ diff --git a/web/static/index.html b/web/static/index.html index 82a9d29..f3dd2ae 100644 --- a/web/static/index.html +++ b/web/static/index.html @@ -4,8 +4,11 @@ dartboat™ + + + @@ -13,8 +16,8 @@
dartboat™
-
delay
-
stdev
+
+
diff --git a/web/static/inter-num.woff2 b/web/static/inter-num.woff2 deleted file mode 100644 index 5cea7a5..0000000 Binary files a/web/static/inter-num.woff2 and /dev/null differ diff --git a/web/static/style.css b/web/static/style.css index f97585e..dc76f8e 100644 --- a/web/static/style.css +++ b/web/static/style.css @@ -1,13 +1,13 @@ @import url('https://fonts.googleapis.com/css2?family=Lato:wght@400;700&family=Source+Serif+Pro:ital,wght@0,400;0,700;1,400&display=swap'); @font-face { - font-family: 'icons'; - src: url('icons.woff2') format('woff2'); + font-family: 'bootstrap-icons-sub'; + src: url('fonts/bootstrap-sub.woff2') format('woff2'); } @font-face { font-family: 'inter-num'; - src: url('inter-num.woff2') format('woff2'); + src: url('fonts/inter-num.woff2') format('woff2'); } html { @@ -59,7 +59,7 @@ body { } .icon { - font-family: icons; + font-family: 'bootstrap-icons-sub'; } /* titlebar */ @@ -91,7 +91,7 @@ body { justify-content: center; } -#titlebar span { +#titlebar label { padding: 0 0.4rem; } @@ -145,7 +145,7 @@ body { flex-direction: column; } - #titlebar span { + #titlebar label { padding: 0 0.4rem; } diff --git a/web/static/sw.js b/web/static/sw.js index 3a92eb3..7ed7a85 100644 --- a/web/static/sw.js +++ b/web/static/sw.js @@ -1,23 +1,15 @@ const CACHE_PREFIX = 'dartboat-' -const CACHE_VERSION = '1'; +const CACHE_VERSION = '2'; const CACHE_NAME = `${CACHE_PREFIX}${CACHE_VERSION}`; const FILES = [ './', + 'style.css', 'dartboat.js', 'dartboat_wasm.js', 'dartboat_wasm.wasm', - 'style.css', - 'icons.woff2', - 'inter-num.woff2', - 'dartboat_16.png', - 'dartboat_32.png', - 'dartboat_64.png', - 'dartboat_96.png', - 'dartboat_128.png', - 'dartboat_192.png', - 'dartboat_256.png', - 'dartboat_512.png' + 'fonts/bootstrap-icons-sub.woff2', + 'fonts/inter-num.woff2' ] function swlog(str) { @@ -57,7 +49,8 @@ self.addEventListener('fetch', e => { if (cached) return cached; - if (!(resp = await fetch(e.request)).ok) { + const resp = await fetch(e.request); + if (!resp.ok) { swlog(`ignore status:${resp.status} ${e.request.url}`); } else { swlog(`put ${e.request.url}`); -- cgit v1.2.3-70-g09d2