added previously forgotten b/w images, continued work on stage 3

7 files changed, 20 insertions, 23 deletions

diff --git a/assets/default/images/exercise_bw.png b/assets/default/images/exercise_bw.png
new file mode 100644
index 0000000..e2cf4f7
--- /dev/null
+++ b/assets/default/images/exercise_bw.png
diff --git a/assets/default/images/games_bw.png b/assets/default/images/games_bw.png
new file mode 100644
index 0000000..fd3c3cb
--- /dev/null
+++ b/assets/default/images/games_bw.png
diff --git a/assets/default/images/resources_bw.png b/assets/default/images/resources_bw.png
new file mode 100644
index 0000000..4a1c27d
--- /dev/null
+++ b/assets/default/images/resources_bw.png
diff --git a/assets/default/images/tutorial_bw.png b/assets/default/images/tutorial_bw.png
new file mode 100644
index 0000000..b25328b
--- /dev/null
+++ b/assets/default/images/tutorial_bw.png
diff --git a/chakra/grade1mathematics.html b/chakra/grade1mathematics.html
index a4f6a73..96f7ff0 100644
--- a/chakra/grade1mathematics.html
+++ b/chakra/grade1mathematics.html
@@ -22,9 +22,12 @@
 <div id="navigation">
 <a href="../index.html"><img src="../assets/default/images/chakra_logo.png" alt="Home" title="Home"></a>
 <a href="grade1.html"><img src="../assets/default/images/grade1.png" alt="Grade 1" title="Grade 1"></a>
-<img src="../assets/default/images/karma_logo.png" alt="English" title="Grade 1 - English">
+<img src="../assets/default/images/mathematics.png" alt="English" title="Grade 1 - English">
 
-Months:
+<img id="nav_right" src="../assets/default/images/help.png" alt="Help" title="Help">
+<img id="nav_right" src="../assets/default/images/karma_logo.png" alt="Karma icon" title="About Karma">
+
+Weeks: 
 <ul id="week_select">
 <li><a href="#weeksA" class="selected">A</a></li>
 <li><a href="#weeksB">B</a></li>
@@ -38,12 +41,7 @@ Months:
 <li><a href="#weeksJ">J</a></li>
 </ul>
 
-<img id="nav_right" src="../assets/default/images/help.png" alt="Help" title="Help">
-<img id="nav_right" src="../assets/default/images/about.png" alt="Karma icon" title="About Karma">
-</div>
 
-<div id="curriculum">
-Link to subject curriculum
 </div>
 
 <div id="weeks">
diff --git a/css/chakra.css b/css/chakra.css
index d0a4f6f..9cf2bb7 100644
--- a/css/chakra.css
+++ b/css/chakra.css
@@ -9,8 +9,8 @@ padding:0;
 {
 background: #6E6E6E;
 font-weight: bold;
-padding-bottom: 0.2em;
-padding-top: 0.2em;
+padding-bottom: 0.1em;
+padding-top: 0.1em;
 }
 
 #navigation img
@@ -141,8 +141,6 @@ outline-color: #424242;
 list-style: none;
 padding: 0;
 margin: 0;
-background:#BDBDBD;
-float:left;
 }
 
 #week_select li
@@ -152,16 +150,15 @@ float: left;
 
 #week_select li a
 {
-line-height: 1.5em;
 text-decoration: none;
 text-align: center;
 font-weight: bold;
 float: left;
 color:#000000;
-margin-bottom: 0.2em;
-margin-top: 0.2em;
-margin-left: 0.2em;
-margin-right: 0.2em;
+padding-top: 0.5em;
+padding-bottom: 0.5em;
+padding-right: 0.7em;
+padding-left: 0.7em;
 }
 
 #week_select a:hover {
@@ -170,6 +167,7 @@ text-decoration: underline;
 
 #week_select a.selected {
 text-decoration: underline;
+background:#BDBDBD;
 }
 
 #lessonname
@@ -198,10 +196,8 @@ line-height: 1.5em;
 #weeks
 {
 list-style: none;
-padding: 0;
-margin: 0;
-background:#BDBDBD;
-float:left;
+background:#6E6E6E;
+float: left;
 width: 100%;
 }
 
@@ -229,8 +225,10 @@ text-align: center;
 font-weight: bold;
 float: left;
 color:#000000;
-width: 2em;
-padding: 3;
+padding-top: 0.5em;
+padding-bottom: 0.5em;
+padding-right: 0.7em;
+padding-left: 0.7em;
 }
 
 #weeks a:hover {
@@ -239,6 +237,7 @@ padding: 3;
 
 #weeks a.selected {
 text-decoration: underline;
+background:#BDBDBD;
 }
 
 #admin ul
diff --git a/index.html b/index.html
index 3d5647c..999da7e 100755
--- a/index.html
+++ b/index.html
@@ -39,7 +39,7 @@
 <ul>
 <li id="profile"><a href="#tab_profile"><img src="assets/default/images/profile.png" alt="Student Profile" title="My profile"><br />Student Profile</a></li>
 <li id="mystuff"><a href="#tab_mystuff"><img src="assets/default/images/mystuff.png" alt="My Stuff" title="My stuff"><br />My Stuff</a></li>
-<li id="about"><a href="#tab_about"><img src="assets/default/images/about.png" width="80px" alt="About Karma" title="about"><br />About Karma</a></li>
+<li id="about"><a href="#tab_about"><img src="assets/default/images/karma_logo.png" width="80px" alt="About Karma" title="about"><br />About Karma</a></li>
 </ul>
 </div>
 </div>