From 21f22aec32a40cba0c085ca82808dd32f68cdaac Mon Sep 17 00:00:00 2001
From: rstular <rok@stular.eu>
Date: Sun, 17 May 2020 23:11:41 +0200
Subject: Styling bug fixes

---
 assets/css/styles.css                       | 28 +++++++++++++++++++++++++---
 assets/pages-src/changelog.bvr              |  2 +-
 assets/pages-src/meals.bvr                  |  4 ++--
 assets/pages-src/misc/msg-compose-modal.bvr |  2 +-
 assets/pages-src/privacypolicy.bvr          | 16 ++++++++--------
 5 files changed, 37 insertions(+), 15 deletions(-)

(limited to 'assets')

diff --git a/assets/css/styles.css b/assets/css/styles.css
index 0d64ea7..065457f 100644
--- a/assets/css/styles.css
+++ b/assets/css/styles.css
@@ -64,6 +64,7 @@ nav {
     position: absolute;
     right: 10px;
     font-style: italic;
+    color: var(--color-text);
 }
 
 .collapsible-header-root {
@@ -117,7 +118,11 @@ a.collection-item {
 }
 
 .fc-unthemed td.fc-today {
-    background: var(--color-primary-light);
+    background: var(--color-primary);
+}
+
+.fc-icon {
+    color: var(--color-text);
 }
 
 .no-select {
@@ -130,11 +135,15 @@ a.collection-item {
     -webkit-tap-highlight-color: transparent;
 }
 
-/* label focus color */
+input.datepicker {
+    color: var(--color-text);
+}
+
 .input-field > input {
     color: var(--color-text);
 }
 
+/* label focus color */
 .input-field input[type=text]:focus+label {
     color: var(--color-text);
 }
@@ -196,6 +205,18 @@ i.material-icons.prefix {
 	z-index: 60;
 }
 
+.month-prev > svg {
+    fill: var(--color-text);
+}
+
+.month-next > svg {
+    fill: var(--color-text);
+}
+
+.selects-container > div > input {
+    color: var(--color-text);
+}
+
 /* Tabs */
 .tab a {
     color: var(--color-secondary) !important;
@@ -283,6 +304,7 @@ table.highlight > tbody > tr:hover {
 
 .collapsible-header {
     background-color: var(--background-color);
+    color: var(--color-text);
 }
 
 h2 {
@@ -335,7 +357,7 @@ h5.subheader {
     color: var(--color-btn-flat-disabled) !important;
 }
 
-.modal-text-header {
+.general-text {
     color: var(--color-text);
 }
 
diff --git a/assets/pages-src/changelog.bvr b/assets/pages-src/changelog.bvr
index c62e6d0..f3c8b49 100644
--- a/assets/pages-src/changelog.bvr
+++ b/assets/pages-src/changelog.bvr
@@ -47,7 +47,7 @@
 
     <div class="container">
         <div class="row">
-            <h3><x-su>changelog</x-su></h3>
+            <h3 class="general-text"><x-su>changelog</x-su></h3>
             <ul class="collapsible">
                 <li>
                     <div class="collapsible-header">Version 1.0.14-beta</div>
diff --git a/assets/pages-src/meals.bvr b/assets/pages-src/meals.bvr
index a089fbf..408e22a 100644
--- a/assets/pages-src/meals.bvr
+++ b/assets/pages-src/meals.bvr
@@ -50,8 +50,8 @@
 		<@?i navigation@>
     <br>
     <div class="container login" hidden="hidden" id="meals-login">
-	<h4><x-su>loginToLopolis</x-su></h4>
-	<p>
+	<h4 class="general-text"><x-su>loginToLopolis</x-su></h4>
+	<p class="general-text">
 		<x-du>loginToLopolisNote</x-du>
 	</p>
 	  <div class="row">
diff --git a/assets/pages-src/misc/msg-compose-modal.bvr b/assets/pages-src/misc/msg-compose-modal.bvr
index 38332f0..9ccd9d0 100644
--- a/assets/pages-src/misc/msg-compose-modal.bvr
+++ b/assets/pages-src/misc/msg-compose-modal.bvr
@@ -3,7 +3,7 @@
 
         <div class="modal-content">
 
-            <h4 class="modal-text-header"><x-su>sendAMessage</x-su></h4>
+            <h4 class="general-text"><x-su>sendAMessage</x-su></h4>
             <br>
             <div class="input-field">
                 <i class="material-icons prefix">account_circle</i>
diff --git a/assets/pages-src/privacypolicy.bvr b/assets/pages-src/privacypolicy.bvr
index c6730ca..a45297b 100644
--- a/assets/pages-src/privacypolicy.bvr
+++ b/assets/pages-src/privacypolicy.bvr
@@ -42,15 +42,15 @@
     </nav>
     <div class="container">
         <h2><x-su>thePrivacyPolicy</x-su></h2>
-        <p class="flow-text"><x-du>privacyImportant</x-du></p>
-        <p class="flow-text"><x-du>privacyOnlyAskedWhen</x-du></p>
-        <p class="flow-text"><x-du>privacyDataCollection</x-du></p>
-        <p class="flow-text"><x-du>privacySharingData</x-du></p>
-        <p class="flow-text"><x-du>privacyExternalSites</x-du></p>
-        <p class="flow-text"><x-du>privacyRefuse</x-du></p>
-        <p class="flow-text"><x-du>privacyAcceptWithUse</x-du></p>
+        <p class="flow-text general-text"><x-du>privacyImportant</x-du></p>
+        <p class="flow-text general-text"><x-du>privacyOnlyAskedWhen</x-du></p>
+        <p class="flow-text general-text"><x-du>privacyDataCollection</x-du></p>
+        <p class="flow-text general-text"><x-du>privacySharingData</x-du></p>
+        <p class="flow-text general-text"><x-du>privacyExternalSites</x-du></p>
+        <p class="flow-text general-text"><x-du>privacyRefuse</x-du></p>
+        <p class="flow-text general-text"><x-du>privacyAcceptWithUse</x-du></p>
         <hr>
-        <p class="flow-text"><x-su>privacyEffectiveAsOf</x-su> 29 January 2020.</p>
+        <p class="flow-text general-text"><x-su>privacyEffectiveAsOf</x-su> 29 January 2020.</p>
     </div>
 </body>
 </html>
-- 
cgit v1.2.3


From ea1ff86ecd12b698fe776801f87138221d01a9ce Mon Sep 17 00:00:00 2001
From: rstular <rok@stular.eu>
Date: Sun, 17 May 2020 23:16:38 +0200
Subject: Styling fix, lopolis fix

---
 assets/css/styles.css | 1 +
 assets/js/meals.js    | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'assets')

diff --git a/assets/css/styles.css b/assets/css/styles.css
index 065457f..10e4e87 100644
--- a/assets/css/styles.css
+++ b/assets/css/styles.css
@@ -305,6 +305,7 @@ table.highlight > tbody > tr:hover {
 .collapsible-header {
     background-color: var(--background-color);
     color: var(--color-text);
+    border-bottom-color: var(--color-divider);
 }
 
 h2 {
diff --git a/assets/js/meals.js b/assets/js/meals.js
index e9b3af8..0f4230e 100644
--- a/assets/js/meals.js
+++ b/assets/js/meals.js
@@ -278,8 +278,10 @@ async function lopolisLogin() {
             }
         },
 
-        error: () => {
-            UIAlert( D("loginError"), "lopolisLogin(): ajax.error");
+        error: (xhr) => {
+            if (xhr.status !== 401) {
+                UIAlert( D("loginError"), "lopolisLogin(): ajax.error");
+            }
             setLoading(false);
         }
     });
-- 
cgit v1.2.3


From b0d7eb0101a6c8a26c97a1c7069e4496706225ec Mon Sep 17 00:00:00 2001
From: rstular <rok@stular.eu>
Date: Sun, 17 May 2020 23:21:15 +0200
Subject: Revert "Styling fix, lopolis fix"

This reverts commit ea1ff86ecd12b698fe776801f87138221d01a9ce.
---
 assets/js/meals.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'assets')

diff --git a/assets/js/meals.js b/assets/js/meals.js
index 0f4230e..e9b3af8 100644
--- a/assets/js/meals.js
+++ b/assets/js/meals.js
@@ -278,10 +278,8 @@ async function lopolisLogin() {
             }
         },
 
-        error: (xhr) => {
-            if (xhr.status !== 401) {
-                UIAlert( D("loginError"), "lopolisLogin(): ajax.error");
-            }
+        error: () => {
+            UIAlert( D("loginError"), "lopolisLogin(): ajax.error");
             setLoading(false);
         }
     });
-- 
cgit v1.2.3