4 files changed, 70 insertions, 68 deletions

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 @@
     </nav>
 		<@?i navigation@>
     <br>
-    <div class="container login" hidden="hidden" id="meals-login">
-	<h4 class="general-text"><x-su>loginToLopolis</x-su></h4>
-	<p class="general-text">
-		<x-du>loginToLopolisNote</x-du>
-	</p>
-	  <div class="row">
-	    <div class="col s12">
-	      <div class="row">
-	        <div class="input-field col s12">
-	          <input id="meals_username" type="text" value="" required="required" name="meals_password" class="validate">
-	          <label for="meals_username">Lopolis <x-su>username</x-su></label>
-	        </div>
-	      </div>
-	      <div class="row">
-	        <div class="input-field col s12">
-	          <input autocomplete="new-password" id="meals_password" type="password" value="" required="required" name="meals_password" class="validate">
-	          <label for="meals_password">Lopolis <x-su>password</x-su></label>
-	        </div>
-	      </div>
-	      <div class="row">
-	        <div class="input-field col s12">
-	          <button id="meals-login" type="button" class="waves-effect waves-light btn">
+    <div class="container login" hidden="hidden" id="meals-login-container">
+		<h4 class="general-text"><x-su>loginToLopolis</x-su></h4>
+		<p class="general-text">
+			<x-du>loginToLopolisNote</x-du>
+		</p>
+	  	<div class="row">
+	    	<div class="col s12">
+	      		<div class="row">
+	        		<div class="input-field col s12">
+	          			<input id="meals-username" type="text" value="" required="required" name="meals_password" class="validate">
+	          			<label for="meals-username">Lopolis <x-su>username</x-su></label>
+	        		</div>
+	      		</div>
+	      		<div class="row">
+	        		<div class="input-field col s12">
+	          			<input autocomplete="new-password" id="meals-password" type="password" value="" required="required" name="meals_password" class="validate">
+	          			<label for="meals-password">Lopolis <x-su>password</x-su></label>
+	        		</div>
+	      		</div>
+	      		<div class="row">
+	        		<div class="input-field col s12">
+	          			<button id="meals-login" type="button" class="waves-effect waves-light btn">
 							<x-su>loginToLopolis</x-su>
 							<i class="material-icons right">arrow_right_alt</i>
-		  			</button>
-	        </div>
-	      </div>
-	    </div>
-	  </div>
+		  				</button>
+	        		</div>
+	      		</div>
+	    	</div>
+	  	</div>
     </div>
     <div class="meals-container container" hidden="hidden" id="meals-container">
-	<h4>Meals
-		<button id="meals-logout" type="button" class="waves-effect waves-light btn" style="float: right">
-			<x-su>logOutFromLopolis</x-su>
-			<i class="material-icons right">exit_to_app</i>
-		</button>
-	</h4>
-	<ul id="meals-collapsible" class="collapsible"></ul>
-	<p>
-		<small>
-			<b>
-				<x-su>usage</x-su>:
-			</b>
-			<x-du>mealsUsageNote</x-du>
-			<br>
-			<b>
-				<x-su>note</x-su>:
-			</b>
-			<x-du>lunchesNote</x-du>
-			<br>
-			<b>
-				<x-su>note</x-su>:
-			</b>
-			<x-du>mealNotShownNote</x-du>
-			<br>
-			<b>
-				Note:
-			</b>
+		<h4>Meals
+			<button id="meals-logout" type="button" class="waves-effect waves-light btn" style="float: right">
+				<x-su>logOutFromLopolis</x-su>
+				<i class="material-icons right">exit_to_app</i>
+			</button>
+		</h4>
+		<ul id="meals-collapsible" class="collapsible"></ul>
+		<p>
+			<small>
+				<b>
+					<x-su>usage</x-su>:
+				</b>
+				<x-du>mealsUsageNote</x-du>
+				<br>
+				<b>
+					<x-su>note</x-su>:
+				</b>
+				<x-du>lunchesNote</x-du>
+				<br>
+				<b>
+					<x-su>note</x-su>:
+				</b>
+				<x-du>mealNotShownNote</x-du>
+				<br>
+				<b>
+					Note:
+				</b>
 				<x-du>mealsContributeNote</x-du>
-		</small>
-	</p>
+			</small>
+		</p>
 	</div>
 </body>
 
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 @@
         <div class="row">
 
             <br>
-            <div class="row grey-text text-darken-2" id="storage-bar">
+            <div class="row light-text" id="storage-bar">
                 <div class="col s6">
                     <x-su>messageStorageUsed</x-su>: <span id="storage-stats">0/120</span> <x-sl>messages</x-sl>
                 </div>
@@ -62,7 +62,7 @@
                 </div>
             </div>
 
-            <div class="row grey-text text-darken-2" style="text-align: center;">
+            <div class="row light-text" style="text-align: center;">
                 <x-du>maxMessagesNote</x-du>
             </div>
 
@@ -74,9 +74,9 @@
                 </ul>
             </div>
             <br>
-            <div id="beziapp-received" class="col s12"><p class="center-align grey-text text-darken-2"><x-su>loadingMessages</x-su></p></div>
-            <div id="beziapp-sent" class="col s12"><p class="center-align grey-text text-darken-2"><x-su>loadingMessages</x-su></p></div>
-            <div id="beziapp-deleted" class="col s12"><p class="center-align grey-text text-darken-2"><x-su>loadingMessages</x-su></p></div>
+            <div id="beziapp-received" class="col s12"><p class="center-align light-text"><x-su>loadingMessages</x-su></p></div>
+            <div id="beziapp-sent" class="col s12"><p class="center-align light-text"><x-su>loadingMessages</x-su></p></div>
+            <div id="beziapp-deleted" class="col s12"><p class="center-align light-text"><x-su>loadingMessages</x-su></p></div>
         </div>
     </div>
 
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 @@
 
             <div class="row" >
 
-# sorry, ampak display: flex še nisem pogruntu 100%
-
                 <div class="col s9 m10">
                     <div class="input-field">
                         <i class="material-icons prefix">subject</i>
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 @@
             <div class="col s12">
                 <h3><b class="title-secondary">Beži</b><span class="title-primary">App</span>
                 </h3>
-                <h4 class="subheader"><x-su>settings</x-su></h4>
+                <h4 class="subheader general-text"><x-su>settings</x-su></h4>
             </div>
         </div>
         <div class="row">
-            <h5><x-su>language</x-su></h5>
+            <div class="col s12">
+                <h5 class="general-text"><x-su>language</x-su></h5>
+            </div>
             <div class="input-field col s12">
                 <i class="material-icons prefix">translate</i>
-                <select class="lang-select icons" id="select-language">
+                <select class="lang-select icons input-select" id="select-language">
                     <option value="sl" id="option-sl" data-icon="/img/flags/sl.svg" selected>Slovenščina</option>
                     <option value="en" id="option-en" data-icon="/img/flags/en.svg">English</option>
                 </select>
@@ -67,10 +69,12 @@
         </div>
 
         <div class="row">
-            <h5><x-su>theme</x-su></h5>
+            <div class="col s12">
+                <h5 class="general-text"><x-su>theme</x-su></h5>
+            </div>
             <div class="input-field col s12">
                 <i class="material-icons prefix">palette</i>
-                <select class="theme-select" id="select-theme">
+                <select class="theme-select input-select" id="select-theme">
                     <option value="light" id="option-light" data-theme="light" selected>Light</option>
                     <option value="dark" id="option-dark" data-theme="dark">Dark</option>
                 </select>