From c24763aa507e9bbb092319b556705f3d77c4af8c Mon Sep 17 00:00:00 2001 From: christophd@sugarlabs.org Date: Fri, 25 Sep 2009 08:34:11 +0000 Subject: changed layout from 1 x 4 to 2 x 2, moved subject curriculum link to the very top, modified months / weeks design a bit; a warning though the css isn't all too pretty --- diff --git a/chakra/grade1mathematics.html b/chakra/grade1mathematics.html index 58884b4..8590c7d 100644 --- a/chakra/grade1mathematics.html +++ b/chakra/grade1mathematics.html @@ -22,28 +22,24 @@ -
- Link to subject curriculum. -
Months
- -
+ + + + + + + + + + +
@@ -51,86 +47,160 @@
Weeks
-
    -
    • -
    • -
    • -
    • -
+ + + + -
+
+
Quadrilaterals
- Quadrilaterals + Quadrilaterals +
+
Adding up to 10
Adding up to 10 +
+
Everyday expressions
- Everyday expressions + Everyday expressions +
+
Can and can't
- Can and can't + Can and can't +
-
+
+
Adding up to 10
Adding up to 10 +
+
+
Everyday expressions
+ Everyday expressions +
+
+
Can and can't
+ Can and can't +
+
+
Quadrilaterals
+ Quadrilaterals +
-
+
+
+
Can and can't
+ Can and can't +
+
+
Quadrilaterals
+ Quadrilaterals +
+
+
Adding up to 10
+ Adding up to 10 +
+
Everyday expressions
Everyday expressions +
-
+
+
+
Quadrilaterals
+ Quadrilaterals +
+
+
Adding up to 10
+ Adding up to 10 +
+
+
Everyday expressions
+ Everyday expressions +
+
Can and can't
Can and can't +
Weeks
-
    -
    • -
    • -
    • -
    • -
+ + + + -
-
Week 1 Lessons
+
+
+
Quadrilaterals
+ Quadrilaterals +
+
+
Adding up to 10
+ Adding up to 10 +
+
+
Everyday expressions
+ Everyday expressions +
+
+
Can and can't
+ Can and can't +
-
+
Week 2 Lessons
-
+
Week 3 Lessons
-
+
Week 4 Lessons
Weeks
-
    -
    • -
    • -
    • -
    • -
+ + + + -
-
Week 1 Lessons
+
+
+
Quadrilaterals
+ Quadrilaterals +
+
+
Adding up to 10
+ Adding up to 10 +
+
+
Everyday expressions
+ Everyday expressions +
+
+
Can and can't
+ Can and can't +
-
+
Week 2 Lessons
-
+
Week 3 Lessons
-
+
Week 4 Lessons
diff --git a/css/chakra.css b/css/chakra.css index 71b1ca9..d09c585 100644 --- a/css/chakra.css +++ b/css/chakra.css @@ -58,9 +58,18 @@ header, footer, aside, nav, article, section { #monthSelect header { text-align: left; - font-size: 1.4em; + font-size: 1.0em; margin: 5px 0 5px 0; padding-bottom: 2px; + font-weight: bold; +} + +#curriculum +{ + padding: 5px; + background: #ccc; + margin: 10px; + display: inline; } .topNav { @@ -91,9 +100,10 @@ header, footer, aside, nav, article, section { #middle header { text-align: center; - font-size: 1.4em; + font-size: 1.0em; margin: 5px 0 5px 0; padding-bottom: 2px; + font-weight: bold; } .middleRow ul { @@ -167,14 +177,6 @@ header, footer, aside, nav, article, section { /* ====================================== */ /* ====== INDIVIDUAL GRADE SECTION ====== */ -#curriculum -{ - text-align: right; - padding: 3px; - background: #ccc; - margin: 0px 0 5px 0; -} - #weekSelectInput { text-align: center; border-bottom: 1px solid #666; @@ -186,10 +188,11 @@ header, footer, aside, nav, article, section { text-align: center; } -.lesson { +.lessonList { border-top: 1px solid #666; padding: 1em; margin: 5px 0 5px 0; + height: 500px; } .lessonName { @@ -199,13 +202,23 @@ header, footer, aside, nav, article, section { font-size: 1.1em; margin-bottom: 1em; } - .lesson img { + .lessonList img { display: block; margin: 0 auto; padding: 5px; border: 1px solid #aaa; background: #ddd; } + +.lesson { + width: 300px; + height: 250px; + float: left; +} + +.preview{ + width: 250px; +} .menuSelectType { margin: 0; -- cgit v0.9.1