From 01f9eef0a5b397c12f3eee9c801167f851d77251 Mon Sep 17 00:00:00 2001 From: rstular Date: Wed, 20 May 2020 11:14:52 +0200 Subject: CSS fixes --- assets/css/styles.css | 14 +++- assets/js/lib/themes.js | 8 +- assets/js/meals.js | 8 +- assets/js/messaging.js | 8 +- assets/pages-src/meals.bvr | 112 ++++++++++++++-------------- assets/pages-src/messaging.bvr | 10 +-- assets/pages-src/misc/msg-compose-modal.bvr | 2 - assets/pages-src/settings.bvr | 14 ++-- dist/css/styles.css | 14 +++- dist/js/lib/themes.js | 8 +- dist/js/meals.js | 8 +- dist/js/messaging.js | 8 +- dist/pages/about.html | 2 +- dist/pages/meals.html | 112 ++++++++++++++-------------- dist/pages/messaging.html | 11 ++- dist/pages/settings.html | 14 ++-- dist/sw.js | 4 +- 17 files changed, 195 insertions(+), 162 deletions(-) diff --git a/assets/css/styles.css b/assets/css/styles.css index 9ff84bf..2706ce4 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -14,6 +14,7 @@ --color-header-span: rgba(255, 255, 255, 1); --color-text: rgba(0, 0, 0, 1); + --color-text-light: rgba(97, 97, 97, 1); --color-label-text: rgba(158, 158, 158, 1); --color-table-hover: rgba(242, 242, 242, 0.5); @@ -24,7 +25,6 @@ --color-btn-flat: rgba(52, 52, 52, 1); --color-btn-flat-disabled: rgba(178, 178, 178, 1); - } body { @@ -355,7 +355,7 @@ h5.subheader { color: var(--color-btn-flat) !important; } -.modal-close.btn-flat:disabled { +.modal-close.btn-flat[disabled] { color: var(--color-btn-flat-disabled) !important; } @@ -363,10 +363,18 @@ h5.subheader { color: var(--color-text) !important; } +.light-text { + color: var(--color-text-light) !important; +} + .dropdown-content { background: var(--background-accent-1) !important; } p { - color: var(--color-text) !important; + color: var(--color-text) !important; } + +.select-dropdown { + color: var(--color-text) !important; +} \ No newline at end of file diff --git a/assets/js/lib/themes.js b/assets/js/lib/themes.js index 8917aaa..14ef436 100644 --- a/assets/js/lib/themes.js +++ b/assets/js/lib/themes.js @@ -15,6 +15,7 @@ const THEME_COLOR_SCHEMES = { "color-header-span": "rgba(255, 255, 255, 1)", "color-text": "rgba(0, 0, 0, 1)", + "color-text-light": "rgba(97, 97, 97, 1)", "color-label-text": "rgba(158, 158, 158, 1)", "color-table-hover": "rgba(242, 242, 242, 0.5)", @@ -42,13 +43,14 @@ const THEME_COLOR_SCHEMES = { "color-header-bold": "rgba(255, 255, 255, 1)", "color-header-span": "rgba(255, 255, 255, 1)", - "color-text": "rgba(255, 255, 255, 1)", + "color-text": "rgba(189, 189, 189, 1)", + "color-text-light": "rgba(160, 160, 160, 1)", "color-label-text": "rgba(158, 158, 158, 1)", "color-table-hover": "rgba(70, 70, 70, 0.5)", "color-sidenav-background": "rgba(31, 31, 31, 1)", - "color-sidenav-text": "rgba(255, 255, 255, 1)", - "color-sidenav-header": "rgba(255, 255, 255, 0.54)", + "color-sidenav-text": "rgba(189, 189, 189, 1)", + "color-sidenav-header": "rgba(189, 189, 189, 0.54)", "color-divider": "rgba(80, 80, 80, 1)", "color-btn-flat": "rgba(178, 178, 178, 1)", diff --git a/assets/js/meals.js b/assets/js/meals.js index e9b3af8..78de032 100644 --- a/assets/js/meals.js +++ b/assets/js/meals.js @@ -4,10 +4,10 @@ async function checkLogin() { localforage.getItem("logged_in_lopolis").then((value) => { if (value != true) { $("#meals-container").hide(); - $("#meals-login").show(); + $("#meals-login-container").show(); } else { $("#meals-container").show(); - $("#meals-login").hide(); + $("#meals-login-container").hide(); loadMeals(); } }).catch((err) => { @@ -240,8 +240,8 @@ function lopolisLogout() { async function lopolisLogin() { setLoading(true); - var usernameEl = $("#meals_username"); - var passwordEl = $("#meals_password"); + var usernameEl = $("#meals-username"); + var passwordEl = $("#meals-password"); $.ajax({ url: API_ENDPOINT+"gettoken", crossDomain: true, diff --git a/assets/js/messaging.js b/assets/js/messaging.js index 5426c7b..f829cd5 100644 --- a/assets/js/messaging.js +++ b/assets/js/messaging.js @@ -93,7 +93,11 @@ function populateAutocomplete() { $(document).ready(function () { if (window.location.hash.length > 1 && !window.location.hash.substring(1).startsWith("beziapp")) { - $("#full-name").val(decodeURIComponent(window.location.hash.substring(1))); + var hashValue = decodeURIComponent(window.location.hash.substring(1)); + $("#full-name").val(hashValue); + if (hashValue in directory) { + $("#msg-send").removeAttr("disabled"); + } $("#beziapp-new-message").modal(); $("#beziapp-new-message").modal("open"); } @@ -346,7 +350,7 @@ function displayData(messageType) {

-

+
delete diff --git a/assets/pages-src/meals.bvr b/assets/pages-src/meals.bvr index 408e22a..0621766 100644 --- a/assets/pages-src/meals.bvr +++ b/assets/pages-src/meals.bvr @@ -49,67 +49,67 @@ <@?i navigation@>
- +
+
+ diff --git a/assets/pages-src/messaging.bvr b/assets/pages-src/messaging.bvr index 3bc2fd7..6d07b40 100644 --- a/assets/pages-src/messaging.bvr +++ b/assets/pages-src/messaging.bvr @@ -53,7 +53,7 @@

-
+
messageStorageUsed: 0/120 messages
@@ -62,7 +62,7 @@
-
+
maxMessagesNote
@@ -74,9 +74,9 @@

-

loadingMessages

-

loadingMessages

-

loadingMessages

+

loadingMessages

+

loadingMessages

+

loadingMessages

diff --git a/assets/pages-src/misc/msg-compose-modal.bvr b/assets/pages-src/misc/msg-compose-modal.bvr index 9ccd9d0..16d1b9c 100644 --- a/assets/pages-src/misc/msg-compose-modal.bvr +++ b/assets/pages-src/misc/msg-compose-modal.bvr @@ -13,8 +13,6 @@
-# sorry, ampak display: flex še nisem pogruntu 100% -
subject diff --git a/assets/pages-src/settings.bvr b/assets/pages-src/settings.bvr index 6145311..f1913f1 100644 --- a/assets/pages-src/settings.bvr +++ b/assets/pages-src/settings.bvr @@ -51,14 +51,16 @@

BežiApp

-

settings

+

settings

-
language
+
+
language
+
translate - @@ -67,10 +69,12 @@
-
theme
+
+
theme
+
palette - diff --git a/dist/css/styles.css b/dist/css/styles.css index 9ff84bf..2706ce4 100644 --- a/dist/css/styles.css +++ b/dist/css/styles.css @@ -14,6 +14,7 @@ --color-header-span: rgba(255, 255, 255, 1); --color-text: rgba(0, 0, 0, 1); + --color-text-light: rgba(97, 97, 97, 1); --color-label-text: rgba(158, 158, 158, 1); --color-table-hover: rgba(242, 242, 242, 0.5); @@ -24,7 +25,6 @@ --color-btn-flat: rgba(52, 52, 52, 1); --color-btn-flat-disabled: rgba(178, 178, 178, 1); - } body { @@ -355,7 +355,7 @@ h5.subheader { color: var(--color-btn-flat) !important; } -.modal-close.btn-flat:disabled { +.modal-close.btn-flat[disabled] { color: var(--color-btn-flat-disabled) !important; } @@ -363,10 +363,18 @@ h5.subheader { color: var(--color-text) !important; } +.light-text { + color: var(--color-text-light) !important; +} + .dropdown-content { background: var(--background-accent-1) !important; } p { - color: var(--color-text) !important; + color: var(--color-text) !important; } + +.select-dropdown { + color: var(--color-text) !important; +} \ No newline at end of file diff --git a/dist/js/lib/themes.js b/dist/js/lib/themes.js index 8917aaa..14ef436 100644 --- a/dist/js/lib/themes.js +++ b/dist/js/lib/themes.js @@ -15,6 +15,7 @@ const THEME_COLOR_SCHEMES = { "color-header-span": "rgba(255, 255, 255, 1)", "color-text": "rgba(0, 0, 0, 1)", + "color-text-light": "rgba(97, 97, 97, 1)", "color-label-text": "rgba(158, 158, 158, 1)", "color-table-hover": "rgba(242, 242, 242, 0.5)", @@ -42,13 +43,14 @@ const THEME_COLOR_SCHEMES = { "color-header-bold": "rgba(255, 255, 255, 1)", "color-header-span": "rgba(255, 255, 255, 1)", - "color-text": "rgba(255, 255, 255, 1)", + "color-text": "rgba(189, 189, 189, 1)", + "color-text-light": "rgba(160, 160, 160, 1)", "color-label-text": "rgba(158, 158, 158, 1)", "color-table-hover": "rgba(70, 70, 70, 0.5)", "color-sidenav-background": "rgba(31, 31, 31, 1)", - "color-sidenav-text": "rgba(255, 255, 255, 1)", - "color-sidenav-header": "rgba(255, 255, 255, 0.54)", + "color-sidenav-text": "rgba(189, 189, 189, 1)", + "color-sidenav-header": "rgba(189, 189, 189, 0.54)", "color-divider": "rgba(80, 80, 80, 1)", "color-btn-flat": "rgba(178, 178, 178, 1)", diff --git a/dist/js/meals.js b/dist/js/meals.js index e9b3af8..78de032 100644 --- a/dist/js/meals.js +++ b/dist/js/meals.js @@ -4,10 +4,10 @@ async function checkLogin() { localforage.getItem("logged_in_lopolis").then((value) => { if (value != true) { $("#meals-container").hide(); - $("#meals-login").show(); + $("#meals-login-container").show(); } else { $("#meals-container").show(); - $("#meals-login").hide(); + $("#meals-login-container").hide(); loadMeals(); } }).catch((err) => { @@ -240,8 +240,8 @@ function lopolisLogout() { async function lopolisLogin() { setLoading(true); - var usernameEl = $("#meals_username"); - var passwordEl = $("#meals_password"); + var usernameEl = $("#meals-username"); + var passwordEl = $("#meals-password"); $.ajax({ url: API_ENDPOINT+"gettoken", crossDomain: true, diff --git a/dist/js/messaging.js b/dist/js/messaging.js index 5426c7b..f829cd5 100644 --- a/dist/js/messaging.js +++ b/dist/js/messaging.js @@ -93,7 +93,11 @@ function populateAutocomplete() { $(document).ready(function () { if (window.location.hash.length > 1 && !window.location.hash.substring(1).startsWith("beziapp")) { - $("#full-name").val(decodeURIComponent(window.location.hash.substring(1))); + var hashValue = decodeURIComponent(window.location.hash.substring(1)); + $("#full-name").val(hashValue); + if (hashValue in directory) { + $("#msg-send").removeAttr("disabled"); + } $("#beziapp-new-message").modal(); $("#beziapp-new-message").modal("open"); } @@ -346,7 +350,7 @@ function displayData(messageType) {

-
+
delete diff --git a/dist/pages/about.html b/dist/pages/about.html index 4087085..b83300c 100644 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,7 @@

- ^HEAD 70555eff18936f28b2952ca05337124489db7dca + ^HEAD 44fe5313019bbce17cce0d49ce6d49b1b4ebc35f

diff --git a/dist/pages/meals.html b/dist/pages/meals.html index b1179eb..590e761 100644 --- a/dist/pages/meals.html +++ b/dist/pages/meals.html @@ -69,67 +69,67 @@
- +
+
+
diff --git a/dist/pages/messaging.html b/dist/pages/messaging.html index 8e912c6..3c65e51 100644 --- a/dist/pages/messaging.html +++ b/dist/pages/messaging.html @@ -73,7 +73,7 @@

-
+
messageStorageUsed: 0/120 messages
@@ -82,7 +82,7 @@
-
+
maxMessagesNote
@@ -94,9 +94,9 @@

-

loadingMessages

-

loadingMessages

-

loadingMessages

+

loadingMessages

+

loadingMessages

+

loadingMessages

@@ -121,7 +121,6 @@
-
subject diff --git a/dist/pages/settings.html b/dist/pages/settings.html index 28d4df7..b0e70ae 100644 --- a/dist/pages/settings.html +++ b/dist/pages/settings.html @@ -71,14 +71,16 @@

BežiApp

-

settings

+

settings

-
language
+
+
language
+
translate - @@ -87,10 +89,12 @@
-
theme
+
+
theme
+
palette - diff --git a/dist/sw.js b/dist/sw.js index 686267d..640fe95 100644 --- 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-70555ef"; -// latest commit is 70555eff18936f28b2952ca05337124489db7dca +const static_cache_name = "site-static-1.0.13-beta-44fe531"; +// latest commit is 44fe5313019bbce17cce0d49ce6d49b1b4ebc35f // 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