Issue ONEPLUS-206

Rearranged the menu items Updated the colour of the menu items and the respective page headers as requested.
praekeltfoundation · Mar 13, 2015 · ee4804f · ee4804f
1 parent 1e6cb56
commit ee4804f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/oneplus/templates/com/blog.html b/oneplus/templates/com/blog.html
@@ -6,7 +6,7 @@
 <div class="menu">
     <a href="/blog"><div class="text heading purple-back darkgrey-front"><li class="icon blog"></li><p>Blog</p></div></a>
 </div>
-    <div class="text heading darkgrey-back"><p>What we have to tell you</p></div>
+    <div class="text heading purple-back"><p>What we have to tell you</p></div>
 
     <div class="content narrow white-back">
         {% if post.big_image %}

diff --git a/oneplus/templates/com/chat.html b/oneplus/templates/com/chat.html
@@ -5,7 +5,7 @@
 {% block content %}
     {% load humanize %}
 <div class="menu">
-    <a href="/chat"><div class="text heading blue-back darkgrey-front"><li class="icon chat"></li><p>Chat Groups</p></div></a>
+    <a href="/chat"><div class="text heading cyan-back darkgrey-front"><li class="icon chat"></li><p>Chat Groups</p></div></a>
 </div>
     <div class="text heading darkgrey-back"><p>{{ group.name }}</p></div>
 

diff --git a/oneplus/templates/com/chatgroup.html b/oneplus/templates/com/chatgroup.html
@@ -5,7 +5,7 @@
 {% block content %}
     {% load humanize %}
 <div class="menu">
-    <a href="/menu"><div class="text heading blue-back darkgrey-front"><li class="icon chat"></li><p>Chat Groups</p></div></a>
+    <a href="/menu"><div class="text heading cyan-back darkgrey-front"><li class="icon chat"></li><p>Chat Groups</p></div></a>
 <div class="menu">
     <div class="text heading darkgrey-back"><p>Connect with others</p></div>
 

diff --git a/oneplus/templates/core/menu.html b/oneplus/templates/core/menu.html
@@ -1,17 +1,17 @@
 {% extends "core/main.html" %}
 
 {% block content %}
-<div class="menu">
-            <a href="/welcome"><div class="item text green-back darkgrey-front"><li class="icon welcome"></li><p>Welcome</p></div></a>
-            <a href="/ontrack"><div class="item text green-back darkgrey-front"><li class="icon ontrack"></li><p>On Track</p></div></a>
-            <a href="/badges"><div class="item text cyan-back darkgrey-front"><li class="icon badges"></li><p>Badges</p></div></a>
-            <a href="/chat"><div class="item text blue-back darkgrey-front"><li class="icon chat"></li><p>Chat Groups</p></div></a>
-            <a href="/blog"><div class="item text purple-back darkgrey-front"><li class="icon blog"></li><p>Blog</p></div></a>
-            <a href="/leader"><div class="item text red-back darkgrey-front"><li class="icon leaderboard"></li><p>Leaderboard</p></div></a>
-            <a href="/points"><div class="item text orange-back darkgrey-front"><li class="icon points"></li><p>Points</p></div></a>
-            <a href="/inbox"><div class="item text yellow-back darkgrey-front"><li class="icon inbox"></li><p>Inbox</p></div></a>
-            <a href="/faq"><div class="item text yellow-back darkgrey-front"><li class="icon faq"></li><p>FAQ</p></div></a>
-            <a href="/home"><div class="item text grey-back white-front"><li class="icon home"></li><p>Home</p></div></a>
-            <a href="/signout"><div class="item text grey-back white-front"><li class="icon user"></li><p>Logout</p></div></a>
-        </div>
+    <div class="menu">
+        <a href="/welcome"><div class="item text green-back darkgrey-front"><li class="icon welcome"></li><p>Welcome</p></div></a>
+        <a href="/ontrack"><div class="item text green-back darkgrey-front"><li class="icon ontrack"></li><p>On Track</p></div></a>
+        <a href="/chat"><div class="item text cyan-back darkgrey-front"><li class="icon chat"></li><p>Chat Groups</p></div></a>
+        <a href="/faq"><div class="item text blue-back darkgrey-front"><li class="icon faq"></li><p>FAQ</p></div></a>
+        <a href="/blog"><div class="item text purple-back darkgrey-front"><li class="icon blog"></li><p>Blog</p></div></a>
+        <a href="/badges"><div class="item text red-back darkgrey-front"><li class="icon badges"></li><p>Badges</p></div></a>
+        <a href="/leader"><div class="item text orange-back darkgrey-front"><li class="icon leaderboard"></li><p>Leaderboard</p></div></a>
+        <a href="/points"><div class="item text orange-back darkgrey-front"><li class="icon points"></li><p>Points</p></div></a>
+        <a href="/inbox"><div class="item text yellow-back darkgrey-front"><li class="icon inbox"></li><p>Inbox</p></div></a>
+        <a href="/home"><div class="item text yellow-back darkgrey-front"><li class="icon home"></li><p>Home</p></div></a>
+        <a href="/signout"><div class="item text grey-back white-front"><li class="icon user"></li><p>Logout</p></div></a>
+    </div>
 {% endblock %}
diff --git a/oneplus/templates/misc/faq.html b/oneplus/templates/misc/faq.html
@@ -4,7 +4,7 @@
 
 {% block content %}
         <div class="content">
-        <h1 class="green-front xlarge-font center-font">FAQ</h1>
+        <h1 class="blue-front xlarge-font center-font">FAQ</h1>
         <p class="center-font"></p>
     </div>
 {% endblock %}
diff --git a/oneplus/templates/prog/badges.html b/oneplus/templates/prog/badges.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 <div class="menu">
-    <a href="/menu"><div class="text heading cyan-back darkgrey-front"><li class="icon badges"></li><p>Badges</p></div></a>
+    <a href="/menu"><div class="text heading red-back darkgrey-front"><li class="icon badges"></li><p>Badges</p></div></a>
 </div>
     <div class="text heading darkgrey-back"><p>The badges you've earned</p></div>
 

diff --git a/oneplus/templates/prog/leader.html b/oneplus/templates/prog/leader.html
@@ -5,7 +5,7 @@
 {% block content %}
     {% load humanize %}
 <div class="menu">
-    <a href="/menu"><div class="text heading red-back darkgrey-front"><li class="icon leaderboard"></li><p>Leaderboard</p></div></a>
+    <a href="/menu"><div class="text heading orange-back darkgrey-front"><li class="icon leaderboard"></li><p>Leaderboard</p></div></a>
 </div>
     <div class="text heading darkgrey-back">{% if state.leader_place > 0 %}
         <p>Well done, you're in <span class="red-front">{{ state.leader_place|ordinal }} Place</span>