From 6def94865615d5bccba3bae278ea54932643db9a Mon Sep 17 00:00:00 2001 From: sijanec Date: Wed, 20 May 2020 19:33:31 +0200 Subject: should be ok to merge --- assets/css/styles.css | 6 +++++- assets/js/lang/bundle.js | 2 ++ assets/js/settings.js | 3 +++ assets/js/setup-storage.js | 2 +- assets/pages-src/settings.bvr | 9 ++++----- dist/css/styles.css | 6 +++++- dist/js/app.js | 2 +- dist/js/lang/bundle.js | 2 ++ dist/js/settings.js | 3 +++ dist/js/setup-storage.js | 2 +- dist/pages/about.html | 2 +- dist/pages/settings.html | 9 ++++----- dist/sw.js | 4 ++-- 13 files changed, 34 insertions(+), 18 deletions(-) diff --git a/assets/css/styles.css b/assets/css/styles.css index e2fa509..ae21606 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -383,4 +383,8 @@ p { .select-dropdown { color: var(--color-text) !important; -} \ No newline at end of file +} + +h1, h2, h3, h4, h5, h6 { + color: var(--color-text) !important; +} diff --git a/assets/js/lang/bundle.js b/assets/js/lang/bundle.js index 7e269b0..9f0497b 100644 --- a/assets/js/lang/bundle.js +++ b/assets/js/lang/bundle.js @@ -296,6 +296,7 @@ var langstrings = { errorReporting: "error reporting", on: "on", off: "off", + selectErrorReporting: "should error reports be submitted to the developers?", // gsec gsecErrNet: "GimSIS connection error", gsecErrLogin: "GimSIS login error (bad password?), try logging out", @@ -491,6 +492,7 @@ var langstrings = { errorReporting: "pošiljanje napak", on: "vklopljeno", off: "izklopljeno", + selectErrorReporting: "ali naj so napake v aplikaciji posredovane razvijalcem?", // gsec gsecErrNet: "napaka povezave na GimSIS", gsecErrLogin: "prijava v GimSIS ni uspela (napačno geslo?), poskusite se odjaviti", diff --git a/assets/js/settings.js b/assets/js/settings.js index 7ea0b47..1dd3bfc 100644 --- a/assets/js/settings.js +++ b/assets/js/settings.js @@ -66,6 +66,9 @@ document.addEventListener("DOMContentLoaded", async () => { var elems = document.querySelectorAll(".theme-select"); M.FormSelect.init(elems, {}); + var elems = document.querySelectorAll(".errorreporting-select"); + M.FormSelect.init(elems, {}); + // Setup language select dropdown var elems = document.querySelectorAll(".lang-select"); M.FormSelect.init(elems, {}); diff --git a/assets/js/setup-storage.js b/assets/js/setup-storage.js index ce66bba..7aaa089 100644 --- a/assets/js/setup-storage.js +++ b/assets/js/setup-storage.js @@ -19,7 +19,7 @@ async function setupStorage(force = false) { localforage.setItem("directory", {}), //\\ well I could remember my own code but I didn't. localforage.setItem("meals", {}), localforage.setItem("chosenLang", "en"), - localforage.setItem("theme", "light") + localforage.setItem("theme", "light"), localforage.setItem("errorReporting", "on") ]; diff --git a/assets/pages-src/settings.bvr b/assets/pages-src/settings.bvr index 4c55da6..d460093 100644 --- a/assets/pages-src/settings.bvr +++ b/assets/pages-src/settings.bvr @@ -75,8 +75,8 @@
palette
@@ -90,13 +90,12 @@
report_problem
- diff --git a/dist/css/styles.css b/dist/css/styles.css index e2fa509..ae21606 100755 --- a/dist/css/styles.css +++ b/dist/css/styles.css @@ -383,4 +383,8 @@ p { .select-dropdown { color: var(--color-text) !important; -} \ No newline at end of file +} + +h1, h2, h3, h4, h5, h6 { + color: var(--color-text) !important; +} diff --git a/dist/js/app.js b/dist/js/app.js index 57996d3..84a4c3a 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -3,7 +3,7 @@ const app_version = "1.0.13-beta"; -const previous_commit = "bf35c28cb1089df86bdd57134f475f3abe9fb539"; +const previous_commit = "448708182490d551721767bffc34ef35375f5082"; if ("serviceWorker" in navigator) { navigator.serviceWorker.register("/sw.js") diff --git a/dist/js/lang/bundle.js b/dist/js/lang/bundle.js index 7e269b0..9f0497b 100644 --- a/dist/js/lang/bundle.js +++ b/dist/js/lang/bundle.js @@ -296,6 +296,7 @@ var langstrings = { errorReporting: "error reporting", on: "on", off: "off", + selectErrorReporting: "should error reports be submitted to the developers?", // gsec gsecErrNet: "GimSIS connection error", gsecErrLogin: "GimSIS login error (bad password?), try logging out", @@ -491,6 +492,7 @@ var langstrings = { errorReporting: "pošiljanje napak", on: "vklopljeno", off: "izklopljeno", + selectErrorReporting: "ali naj so napake v aplikaciji posredovane razvijalcem?", // gsec gsecErrNet: "napaka povezave na GimSIS", gsecErrLogin: "prijava v GimSIS ni uspela (napačno geslo?), poskusite se odjaviti", diff --git a/dist/js/settings.js b/dist/js/settings.js index 7ea0b47..1dd3bfc 100644 --- a/dist/js/settings.js +++ b/dist/js/settings.js @@ -66,6 +66,9 @@ document.addEventListener("DOMContentLoaded", async () => { var elems = document.querySelectorAll(".theme-select"); M.FormSelect.init(elems, {}); + var elems = document.querySelectorAll(".errorreporting-select"); + M.FormSelect.init(elems, {}); + // Setup language select dropdown var elems = document.querySelectorAll(".lang-select"); M.FormSelect.init(elems, {}); diff --git a/dist/js/setup-storage.js b/dist/js/setup-storage.js index ce66bba..7aaa089 100644 --- a/dist/js/setup-storage.js +++ b/dist/js/setup-storage.js @@ -19,7 +19,7 @@ async function setupStorage(force = false) { localforage.setItem("directory", {}), //\\ well I could remember my own code but I didn't. localforage.setItem("meals", {}), localforage.setItem("chosenLang", "en"), - localforage.setItem("theme", "light") + localforage.setItem("theme", "light"), localforage.setItem("errorReporting", "on") ]; diff --git a/dist/pages/about.html b/dist/pages/about.html index 0f80536..3d86337 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,7 @@

- ^HEAD bf35c28cb1089df86bdd57134f475f3abe9fb539 + ^HEAD 448708182490d551721767bffc34ef35375f5082

diff --git a/dist/pages/settings.html b/dist/pages/settings.html index 612be7d..a41dc4a 100755 --- a/dist/pages/settings.html +++ b/dist/pages/settings.html @@ -95,8 +95,8 @@
palette
@@ -110,13 +110,12 @@
report_problem
- diff --git a/dist/sw.js b/dist/sw.js index 1bbc5a4..e08b250 100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.13-beta-bf35c28"; -// latest commit is bf35c28cb1089df86bdd57134f475f3abe9fb539 +const static_cache_name = "site-static-1.0.13-beta-4487081"; +// latest commit is 448708182490d551721767bffc34ef35375f5082 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! -- cgit v1.2.3