WIP on new main screen layout.

12 files changed, 44 insertions, 39 deletions

diff --git a/lessons/en_US/MAKELESSONS b/lessons/en_US/MAKELESSONS
index 29575cc..bcdf899 100755
--- a/lessons/en_US/MAKELESSONS
+++ b/lessons/en_US/MAKELESSONS
@@ -32,9 +32,9 @@
 # Generate the introductory lesson.
 ../../lessonbuilder --intro-lesson \
     --title="Welcome" \
-    --desc="Click here to begin your typing adventure." \
+    --desc="Click Start Lesson to begin your typing adventure." \
     --bronze-wpm=0 --silver-wpm=0 --gold-wpm=0 \
-    --bronze-accuracy=25 --silver-accuracy=50 --gold-accuracy=100 \
+    --bronze-acc=25 --silver-acc=50 --gold-acc=100 \
     --order=0 \
     --output=intro.lesson
 
diff --git a/lessons/en_US/bottomrow.lesson b/lessons/en_US/bottomrow.lesson
index 0dd489e..e94ffba 100644
--- a/lessons/en_US/bottomrow.lesson
+++ b/lessons/en_US/bottomrow.lesson
@@ -4,19 +4,19 @@
         {
             "accuracy": 70, 
             "name": "bronze", 
-            "score": 4000, 
+            "score": 3000, 
             "wpm": 15
         }, 
         {
             "accuracy": 80, 
             "name": "silver", 
-            "score": 6000, 
+            "score": 4500, 
             "wpm": 20
         }, 
         {
             "accuracy": 90, 
             "name": "gold", 
-            "score": 10000, 
+            "score": 6000, 
             "wpm": 25
         }
     ], 
diff --git a/lessons/en_US/bottomrowgame.lesson b/lessons/en_US/bottomrowgame.lesson
index 40984c3..e26086f 100644
--- a/lessons/en_US/bottomrowgame.lesson
+++ b/lessons/en_US/bottomrowgame.lesson
@@ -1,22 +1,23 @@
 {
     "description": "Practice the bottom row keys in this exciting game!\nDon't let any balloons get by!", 
+    "length": 60, 
     "medals": [
         {
             "accuracy": 70, 
             "name": "bronze", 
-            "score": 4000, 
+            "score": 3000, 
             "wpm": 15
         }, 
         {
             "accuracy": 80, 
             "name": "silver", 
-            "score": 6000, 
+            "score": 4500, 
             "wpm": 20
         }, 
         {
             "accuracy": 90, 
             "name": "gold", 
-            "score": 10000, 
+            "score": 6000, 
             "wpm": 25
         }
     ], 
diff --git a/lessons/en_US/homerow.lesson b/lessons/en_US/homerow.lesson
index 4001302..656aff0 100644
--- a/lessons/en_US/homerow.lesson
+++ b/lessons/en_US/homerow.lesson
@@ -4,19 +4,19 @@
         {
             "accuracy": 70, 
             "name": "bronze", 
-            "score": 4000, 
+            "score": 3000, 
             "wpm": 15
         }, 
         {
             "accuracy": 80, 
             "name": "silver", 
-            "score": 6000, 
+            "score": 4500, 
             "wpm": 20
         }, 
         {
             "accuracy": 90, 
             "name": "gold", 
-            "score": 10000, 
+            "score": 6000, 
             "wpm": 25
         }
     ], 
diff --git a/lessons/en_US/homerowgame.lesson b/lessons/en_US/homerowgame.lesson
index 2dee888..e978ba2 100644
--- a/lessons/en_US/homerowgame.lesson
+++ b/lessons/en_US/homerowgame.lesson
@@ -1,22 +1,23 @@
 {
     "description": "Practice the home row keys in this exciting game!\nDon't let any balloons get by!", 
+    "length": 60, 
     "medals": [
         {
             "accuracy": 70, 
             "name": "bronze", 
-            "score": 4000, 
+            "score": 3000, 
             "wpm": 15
         }, 
         {
             "accuracy": 80, 
             "name": "silver", 
-            "score": 6000, 
+            "score": 4500, 
             "wpm": 20
         }, 
         {
             "accuracy": 90, 
             "name": "gold", 
-            "score": 10000, 
+            "score": 6000, 
             "wpm": 25
         }
     ], 
diff --git a/lessons/en_US/intro.lesson b/lessons/en_US/intro.lesson
index 10e6dbf..8a00ec6 100644
--- a/lessons/en_US/intro.lesson
+++ b/lessons/en_US/intro.lesson
@@ -1,22 +1,22 @@
 {
-    "description": "Click here to begin your typing adventure.", 
+    "description": "Click Start Lesson to begin your typing adventure.", 
     "medals": [
         {
-            "accuracy": 70, 
+            "accuracy": 25, 
             "name": "bronze", 
-            "score": 4000, 
+            "score": 3000, 
             "wpm": 0
         }, 
         {
-            "accuracy": 80, 
+            "accuracy": 50, 
             "name": "silver", 
-            "score": 6000, 
+            "score": 4500, 
             "wpm": 0
         }, 
         {
-            "accuracy": 90, 
+            "accuracy": 100, 
             "name": "gold", 
-            "score": 10000, 
+            "score": 6000, 
             "wpm": 0
         }
     ], 
diff --git a/lessons/en_US/leftcapital.lesson b/lessons/en_US/leftcapital.lesson
index eed7334..dc4991c 100644
--- a/lessons/en_US/leftcapital.lesson
+++ b/lessons/en_US/leftcapital.lesson
@@ -4,19 +4,19 @@
         {
             "accuracy": 70, 
             "name": "bronze", 
-            "score": 4000, 
+            "score": 3000, 
             "wpm": 15
         }, 
         {
             "accuracy": 80, 
             "name": "silver", 
-            "score": 6000, 
+            "score": 4500, 
             "wpm": 20
         }, 
         {
             "accuracy": 90, 
             "name": "gold", 
-            "score": 10000, 
+            "score": 6000, 
             "wpm": 25
         }
     ], 
diff --git a/lessons/en_US/leftcapitalgame.lesson b/lessons/en_US/leftcapitalgame.lesson
index 47c8d94..a4a2848 100644
--- a/lessons/en_US/leftcapitalgame.lesson
+++ b/lessons/en_US/leftcapitalgame.lesson
@@ -1,22 +1,23 @@
 {
     "description": "Practice the left hand CAPITAL letters!\nDon't let any balloons get by!", 
+    "length": 60, 
     "medals": [
         {
             "accuracy": 70, 
             "name": "bronze", 
-            "score": 4000, 
+            "score": 3000, 
             "wpm": 15
         }, 
         {
             "accuracy": 80, 
             "name": "silver", 
-            "score": 6000, 
+            "score": 4500, 
             "wpm": 20
         }, 
         {
             "accuracy": 90, 
             "name": "gold", 
-            "score": 10000, 
+            "score": 6000, 
             "wpm": 25
         }
     ], 
diff --git a/lessons/en_US/rightcapital.lesson b/lessons/en_US/rightcapital.lesson
index c098bc0..0ede55e 100644
--- a/lessons/en_US/rightcapital.lesson
+++ b/lessons/en_US/rightcapital.lesson
@@ -4,19 +4,19 @@
         {
             "accuracy": 70, 
             "name": "bronze", 
-            "score": 4000, 
+            "score": 3000, 
             "wpm": 15
         }, 
         {
             "accuracy": 80, 
             "name": "silver", 
-            "score": 6000, 
+            "score": 4500, 
             "wpm": 20
         }, 
         {
             "accuracy": 90, 
             "name": "gold", 
-            "score": 10000, 
+            "score": 6000, 
             "wpm": 25
         }
     ], 
diff --git a/lessons/en_US/rightcapitalgame.lesson b/lessons/en_US/rightcapitalgame.lesson
index 3db35f1..20c8336 100644
--- a/lessons/en_US/rightcapitalgame.lesson
+++ b/lessons/en_US/rightcapitalgame.lesson
@@ -1,22 +1,23 @@
 {
     "description": "Practice the right hand CAPITAL letters!\nDon't let any balloons get by!", 
+    "length": 60, 
     "medals": [
         {
             "accuracy": 70, 
             "name": "bronze", 
-            "score": 4000, 
+            "score": 3000, 
             "wpm": 15
         }, 
         {
             "accuracy": 80, 
             "name": "silver", 
-            "score": 6000, 
+            "score": 4500, 
             "wpm": 20
         }, 
         {
             "accuracy": 90, 
             "name": "gold", 
-            "score": 10000, 
+            "score": 6000, 
             "wpm": 25
         }
     ], 
diff --git a/lessons/en_US/toprow.lesson b/lessons/en_US/toprow.lesson
index f6742a2..73f42f7 100644
--- a/lessons/en_US/toprow.lesson
+++ b/lessons/en_US/toprow.lesson
@@ -4,19 +4,19 @@
         {
             "accuracy": 70, 
             "name": "bronze", 
-            "score": 4000, 
+            "score": 3000, 
             "wpm": 15
         }, 
         {
             "accuracy": 80, 
             "name": "silver", 
-            "score": 6000, 
+            "score": 4500, 
             "wpm": 20
         }, 
         {
             "accuracy": 90, 
             "name": "gold", 
-            "score": 10000, 
+            "score": 6000, 
             "wpm": 25
         }
     ], 
diff --git a/lessons/en_US/toprowgame.lesson b/lessons/en_US/toprowgame.lesson
index ce6f444..77024cd 100644
--- a/lessons/en_US/toprowgame.lesson
+++ b/lessons/en_US/toprowgame.lesson
@@ -1,22 +1,23 @@
 {
     "description": "Practice the top row keys in this exciting game!\nDon't let any balloons get by!", 
+    "length": 60, 
     "medals": [
         {
             "accuracy": 70, 
             "name": "bronze", 
-            "score": 4000, 
+            "score": 3000, 
             "wpm": 15
         }, 
         {
             "accuracy": 80, 
             "name": "silver", 
-            "score": 6000, 
+            "score": 4500, 
             "wpm": 20
         }, 
         {
             "accuracy": 90, 
             "name": "gold", 
-            "score": 10000, 
+            "score": 6000, 
             "wpm": 25
         }
     ],