From f1f6ded557060861f364e1e9ca029a00b9c11901 Mon Sep 17 00:00:00 2001 From: Pavel Mocan Date: Mon, 21 Sep 2009 06:46:26 +0000 Subject: Updating existing files (*.html & *.css) to HTML5 and CSS3: replacing old tags, rewriting CSS file. --- diff --git a/chakra/grade1.html b/chakra/grade1.html index 043d004..d061a73 100644 --- a/chakra/grade1.html +++ b/chakra/grade1.html @@ -20,12 +20,10 @@ @@ -45,7 +43,7 @@
  • History

    History

  • Health

    Health

    • - + diff --git a/chakra/grade1english.html b/chakra/grade1english.html index f9b6f54..2f062ec 100644 --- a/chakra/grade1english.html +++ b/chakra/grade1english.html @@ -1,189 +1,107 @@ - - + + Chakra (Alpha) - - - - - + + + + + - - - - - - diff --git a/chakra/grade1mathematics.html b/chakra/grade1mathematics.html index b6a1215..70d7de1 100644 --- a/chakra/grade1mathematics.html +++ b/chakra/grade1mathematics.html @@ -1,104 +1,120 @@ - - - + + Chakra (Alpha) - - - - - + + + + - - - - - - - - - - diff --git a/css/chakra.css b/css/chakra.css index 35ad961..f9a6304 100644 --- a/css/chakra.css +++ b/css/chakra.css @@ -32,7 +32,7 @@ span { } /* ====================================== */ /* ========== HTML 5 ELEMENTS =========== */ -header, footer, aside, nav, article { +header, footer, aside, nav, article, section { display: block; } @@ -51,12 +51,6 @@ header, footer, aside, nav, article { width: 640px; margin: 0 auto; } - #knavbarLeft { - display: table-cell; - } - #knavbar aside { - display: table-cell; - } .topNav { width: 30px; @@ -65,12 +59,12 @@ header, footer, aside, nav, article { .floatLeft { float: left; - margin-left: 3px; + margin-left: 5px; } .floatRight { float: right; - margin-right: 3px; + margin-right: 5px; } /* ====================================== */ @@ -81,6 +75,14 @@ header, footer, aside, nav, article { padding: .5em 0 .5em 0; background: #BDBDBD; } + +#middle header { + text-align: center; + font-size: 1.4em; + margin: 5px 0 5px 0; + padding-bottom: 2px; +} + .middleRow ul { display: table; margin: 0 auto; @@ -106,7 +108,7 @@ header, footer, aside, nav, article { .middleRow ul li:hover { text-decoration: underline; border: 3px solid #424242; - } + } /* ====================================== */ /* ============ ADMIN SECTION =========== */ @@ -150,251 +152,54 @@ header, footer, aside, nav, article { width: auto; } - /* ====================================== */ -/* ============ =========== */ - - -#month -{ - vertical-align: middle; - float: right; -} - -#subjects -{ - width: 640px; - margin: 0 auto; -} - -#subjects ul -{ - list-style: none; - padding: 0; - margin: 0; - background: #BDBDBD; - float: left; - width: auto; -} - -#subjects ul li -{ - float: left; -} - -#subjects ul li a -{ - line-height: 2em; - width: 160px; - text-decoration: none; - text-align: center; - font-weight: bold; - float: left; - color: #000000; - height: 9.5em; - margin-bottom: 0.2em; - margin-top: 0.2em; -} - -#subjects ul li img -{ - border: none; - width: 120px; -} - -#subjects a:hover { - text-decoration: underline; - outline-width:3px; - outline-style:solid; - outline-color: #424242; -} - -#week_select -{ - list-style: none; - display: inline; -} - -#week_select li -{ - float: left; - font-weight: bold; - line-height: 2em; -} - -#week_select li a -{ - text-decoration: none; - text-align: center; - float: left; - color: #000000; -} - -#week_select a:hover -{ - text-decoration: underline; - background: #BDBDBD; -} - -#week_select a.selected +/* ====== INDIVIDUAL GRADE SECTION ====== */ +#curriculum { - text-decoration: underline; - background: #BDBDBD; + text-align: right; + padding: 3px; + background: #ccc; + margin: 0px 0 5px 0; } -#lessonname -{ - text-decoration: none; +#weekSelectInput { text-align: center; - font-weight: bold; -} - -#weeks -{ - list-style: none; - background:#BDBDBD; - float: left; - width: 100%; - font-weight: bold; -} - -.preview -{ - width: 250px; + border-bottom: 1px solid #666; + padding: 5px 0 5px 0; } -#weeks li -{ - float:left; -} + #weekSelect { + list-style: none; + text-align: center; + } -.icon -{ - width: 40px +.lesson { + border-top: 1px solid #666; + padding: 1em; + margin: 5px 0 5px 0; } + .lessonName { + text-decoration: none; + text-align: center; + font-weight: bold; + font-size: 1.1em; + margin-bottom: 1em; + } + .lesson img { + display: block; + margin: 0 auto; + padding: 5px; + border: 1px solid #aaa; + background: #ddd; + } -#weeks li a -{ - text-decoration: none; +.menuSelectType { + margin: 0; + padding: 0; text-align: center; - font-weight: bold; - float: left; - color: #000000; - padding-top: 0.2em; - padding-right: 0.2em; - padding-left: 0.2em; -} - -#weeks a:hover { - text-decoration: underline; - background: #BDBDBD; -} - -#weeks a.selected { - text-decoration: underline; - background: #BDBDBD; } - -.weeklist -{ - background:#6E6E6E; - width: 100%; -} - -.lessonlist a -{ - width: 280px; - height: 220px; - margin-top: 1em; -} - -.lessonlist a:hover { - text-decoration: underline; - outline-width:3px; - outline-style: solid; - outline-color: #424242; -} - -#admin { - display: block; - background: #4080c0; - width: 100%; - margin: 0 auto; -} - -#admin ul { - display: table; +.menuSelectType li { list-style: none; - margin: 0 auto; - padding: .5em 0 .5em 0; -} - -#admin ul li { - display: table-cell; - text-align: center; - padding: 0.2em 2em 0.2em 2em; -} - -#admin ul li a -{ - display: block; - text-decoration: none; - font-weight: bold; - color: #000000; -} -#admin ul li a:hover { - text-decoration: underline; -} -#admin p { - line-height: 0; -} - -#admin img -{ - height: 50px; - width: auto; -} - -#curriculum -{ -width: auto; -text-align: center; -float:right; -background:#BDBDBD; -padding: 3; -} - -#grade-menu -{ -list-style: none; -padding: 0; -margin: 0; -background: #585858; -float:left; -width:100%; -} - -#grade-menu li -{ -float: left; -} - -#grade-menu li a -{ -height: 7%; -width: 7em; -text-decoration: none; -text-align: center; -font-weight: bold; -float: left; -color:#000000; -} - -#grade-menu a:hover { -text-decoration: underline; -} - -#grade-menu a.selected { -text-decoration: underline; + display: inline; } diff --git a/index.html b/index.html index ffbfa10..37fe6d2 100644 --- a/index.html +++ b/index.html @@ -8,33 +8,21 @@ - - - + + + - + - - @@ -55,7 +43,7 @@
  • Grade 8

    Grade 8

    • - +
    - -- cgit v0.9.1