13 files changed, 90 insertions, 35 deletions

diff --git a/.gitignore b/.gitignore
index 9a4c435..9262a48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 **/.commit
-dist/sw.js
-dist/pages/about.html
+/dist/sw.js
+/dist/pages/about.html
diff --git a/assets/css/styles.css b/assets/css/styles.css
index 6371a0f..818f25a 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,8 @@ table.highlight > tbody > tr:hover {
 
 .collapsible-header {
     background-color: var(--background-color);
+    color: var(--color-text);
+    border-bottom-color: var(--color-divider);
 }
 
 h2 {
@@ -335,14 +358,14 @@ h5.subheader {
     color: var(--color-btn-flat-disabled) !important;
 }
 
-.modal-text-header {
-    color: var(--color-text);
+.general-text {
+    color: var(--color-text) !important;
 }
 
 .dropdown-content {
     background: var(--background-accent-1) !important;
 }
 
-p {
-		color: var(--color-text);
+.p {
+		color: var(--color-text) !important;
 }
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>
diff --git a/dist/css/styles.css b/dist/css/styles.css
index 0d64ea7..10e4e87 100644
--- a/dist/css/styles.css
+++ b/dist/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,8 @@ table.highlight > tbody > tr:hover {
 
 .collapsible-header {
     background-color: var(--background-color);
+    color: var(--color-text);
+    border-bottom-color: var(--color-divider);
 }
 
 h2 {
@@ -335,7 +358,7 @@ h5.subheader {
     color: var(--color-btn-flat-disabled) !important;
 }
 
-.modal-text-header {
+.general-text {
     color: var(--color-text);
 }
 
diff --git a/dist/pages/about.html b/dist/pages/about.html
index 562692d..bb04c16 100644
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -142,7 +142,11 @@
 				<div class="row">
 					<p>
 						<small>
+<<<<<<< HEAD
 							^HEAD fa9467811859cd9c2d595f5a79819ce3aca91e26
+=======
+							^HEAD b8d872d3487cbe1b6ce510bb08da799b31bd5567
+>>>>>>> b0d7eb0101a6c8a26c97a1c7069e4496706225ec
                         </small>
 					</p>
 				</div>
diff --git a/dist/pages/changelog.html b/dist/pages/changelog.html
index 4a6284a..320be98 100644
--- a/dist/pages/changelog.html
+++ b/dist/pages/changelog.html
@@ -50,7 +50,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/dist/pages/meals.html b/dist/pages/meals.html
index ce061f1..b1179eb 100644
--- a/dist/pages/meals.html
+++ b/dist/pages/meals.html
@@ -70,8 +70,8 @@
 
     <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/dist/pages/messaging.html b/dist/pages/messaging.html
index 83d6ae6..8e912c6 100644
--- a/dist/pages/messaging.html
+++ b/dist/pages/messaging.html
@@ -111,7 +111,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/dist/pages/privacypolicy.html b/dist/pages/privacypolicy.html
index 233978d..4876d6b 100644
--- a/dist/pages/privacypolicy.html
+++ b/dist/pages/privacypolicy.html
@@ -45,15 +45,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>
diff --git a/dist/sw.js b/dist/sw.js
index 174fe60..bd3a453 100644
--- a/dist/sw.js
+++ b/dist/sw.js
@@ -3,8 +3,13 @@
 
 
 // Change version to cause cache refresh
+<<<<<<< HEAD
 const static_cache_name = "site-static-1.0.13-beta-fa94678";
 // latest commit is fa9467811859cd9c2d595f5a79819ce3aca91e26
+=======
+const static_cache_name = "site-static-1.0.13-beta-b8d872d";
+// latest commit is b8d872d3487cbe1b6ce510bb08da799b31bd5567
+>>>>>>> b0d7eb0101a6c8a26c97a1c7069e4496706225ec
 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js
 // sw.js NE SME BITI CACHAN, ker vsebuje verzijo!