Merge branches 'epaath' and 'epaath' of gitorious@git.sugarlabs.org:karma/mainlineepaath

4 files changed, 4 insertions, 15 deletions

diff --git a/examples/adding_up_to_10/css/knavbar.css b/examples/adding_up_to_10/css/knavbar.css
index 0730078..26e3896 100644
--- a/examples/adding_up_to_10/css/knavbar.css
+++ b/examples/adding_up_to_10/css/knavbar.css
@@ -26,7 +26,7 @@ height: 63px;
 text-align: center;
 font-weight: bold;
 font-size: 110%;
-float: left;
+display: block;
 color:#000000;
 padding-left: 0.2em;
 padding-right: 0.2em;
diff --git a/examples/adding_up_to_10/exercise.html b/examples/adding_up_to_10/exercise.html
index 1e74722..1318d0c 100644
--- a/examples/adding_up_to_10/exercise.html
+++ b/examples/adding_up_to_10/exercise.html
@@ -18,13 +18,10 @@
 
 <div id="lesson">
 <nav>
-<li><a href="../../index.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back"></a></li>
-<li><a href="../../index.html"><img src="../../assets/default/images/chakra_logo.png" alt="Chakra" title="Chakra"></a></li>
+<li><a href="../../chakra/grade1mathematics.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back"></a></li>
 <li><a id="welcome" href="index_knavbar.html">Adding up to 10</a></li>
 <li><img src="../../assets/default/images/tutorial_bw.png" alt="Tutorial" title="Tutorial"></li>
 <li><a href="exercise.html" class="selected"><img src="../../assets/default/images/exercise.png" alt="Exercise" title="Exercise"></a></li>
-<li><img src="../../assets/default/images/games_bw.png" alt="Game" title="Game"></li>
-<li><a href="resources.html"><img src="../../assets/default/images/resources.png" alt="Resources" title="Resources"></a></li>
 <li><a href="#tab_help"><img src="../../assets/default/images/help.png" alt="Help" title="Help"></a></li>
 <li><a href="http://olenepal.org/" target="_blank"><img src="../../assets/default/images/olenepal_logo.gif" alt="OLE Nepal logo" title="OLE Nepal Web site"></a></li>
 </nav>
diff --git a/examples/adding_up_to_10/index_knavbar.html b/examples/adding_up_to_10/index_knavbar.html
index ab19fe3..e1e2fca 100644
--- a/examples/adding_up_to_10/index_knavbar.html
+++ b/examples/adding_up_to_10/index_knavbar.html
@@ -19,15 +19,8 @@
 <div id="lesson">
 
 <nav>
-<li><a href="../../index.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back"></a></li>
-<li><a href="../../index.html"><img src="../../assets/default/images/chakra_logo.png" alt="Chakra" title="Chakra"></a></li>
+<li><a href="../../chakra/grade1mathematics.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back"></a></li>
 <li><a id="welcome" href="index_knavbar.html" class="selected">Adding up to 10</a></li>
-<li><img src="../../assets/default/images/tutorial_bw.png" alt="Tutorial" title="Tutorial"></li>
-<li><a href="exercise.html"><img src="../../assets/default/images/exercise.png" alt="Exercise" title="Exercise"></a></li>
-<li><img src="../../assets/default/images/games_bw.png" alt="Game" title="Game"></li>
-<li><a href="resources.html"><img src="../../assets/default/images/resources.png" alt="Resources" title="Resources"></a></li>
-<li><a href="#tab_help"><img src="../../assets/default/images/help.png" alt="Help" title="Help"></a></li>
-<li><a href="http://olenepal.org/" target="_blank"><img src="../../assets/default/images/olenepal_logo.gif" alt="OLE Nepal logo" title="OLE Nepal Web site"></a></li>
 </nav>
 
 <div id="subject">Mathematics</div>
diff --git a/examples/adding_up_to_10/resources.html b/examples/adding_up_to_10/resources.html
index a6a67f0..bb4c85a 100644
--- a/examples/adding_up_to_10/resources.html
+++ b/examples/adding_up_to_10/resources.html
@@ -17,12 +17,11 @@
 
 <div id="lesson">
 <nav>
-<li><a href="../../index.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back"></a></li>
+<li><a href="../../chakra/grade1mathematics.html"><img src="../../assets/default/images/back.png" alt="Back" title="Back"></a></li>
 <li><a href="../../index.html"><img src="../../assets/default/images/chakra_logo.png" alt="Chakra" title="Chakra"></a></li>
 <li><a id="welcome" href="index_knavbar.html">Adding up to 10</a></li>
 <li><img src="../../assets/default/images/tutorial_bw.png" alt="Tutorial" title="Tutorial"></li>
 <li><a href="exercise.html"><img src="../../assets/default/images/exercise.png" alt="Exercise" title="Exercise"></a></li>
-<li><img src="../../assets/default/images/games_bw.png" alt="Game" title="Game"></li>
 <li><a href="resources.html" class="selected"><img src="../../assets/default/images/resources.png" alt="Resources" title="Resources"></a></li>
 <li><a href="#tab_help"><img src="../../assets/default/images/help.png" alt="Help" title="Help"></a></li>
 <li><a href="http://olenepal.org/" target="_blank"><img src="../../assets/default/images/olenepal_logo.gif" alt="OLE Nepal logo" title="OLE Nepal Web site"></a></li>