summaryrefslogtreecommitdiffstats
path: root/dist/pages
diff options
context:
space:
mode:
Diffstat (limited to 'dist/pages')
-rw-r--r--dist/pages/about.html4
-rw-r--r--dist/pages/changelog.html2
-rw-r--r--dist/pages/meals.html4
-rw-r--r--dist/pages/messaging.html2
-rw-r--r--dist/pages/privacypolicy.html16
5 files changed, 16 insertions, 12 deletions
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>