From: urs_hunkler <urs_hunkler>
Date: Mon, 21 Jul 2008 07:41:36 +0000 (+0000)
Subject: I cleaned up the worst issues with these 1.9 themes under 2.0 and added missing images.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a3dfd2ff219cd937a0c5b3b857f18eb55c21fb89;p=moodle.git

I cleaned up the worst issues with these 1.9 themes under 2.0 and added missing images.
---

diff --git a/theme/colors/colors.css b/theme/colors/colors.css
index a3a2e4a6da..93a4f822a9 100755
--- a/theme/colors/colors.css
+++ b/theme/colors/colors.css
@@ -1,4 +1,4 @@
-/* @override http://ubuntu.userver.lan/moodle_19_test/theme/colors/colors.css */
+/* @override http://ubuntu.userver.lan/moodle_20/theme/colors/colors.css */
 /* @group core */
 body {
   background-color: #b9baa3;
@@ -458,9 +458,6 @@ link
 #theme-index.course-1 div#content {
   margin: 0;
 }
-.admin #layout-table #middle-column {
-  /*padding-top: 10px;*/
-}
 .admin h2.main {
   margin: 0 0 10px;
   height: 20px;
@@ -598,7 +595,7 @@ link
   margin-bottom: 0;
   padding-bottom: 0;
   border-style: none;
-  width: 220px;
+  /*width: 220px;*/
 }
 .sideblock .header,
 .sideblock .header h2 {
@@ -683,45 +680,50 @@ div.loginbox.twocolumns div.loginpanel {
 }
 /* @end */
 /* @group content */
-div#content {
+#content {
   clear: both;
 }
-#site-index div#content,
-#course-view div#content,
-.haslayouttable div#content {
+#site-index #content,
+#course-view #content,
+.haslayouttable #content {
   margin: 0;
 }
 #site-index .subscribelink,
 #course-view .subscribelink {
   padding: 0 5px;
 }
-#layout-table {
+.weeks-format #left-column, 
+.weeks-format #right-column, 
+.topics-format #left-column, 
+.topics-format #right-column {
+	width: 15.5em;
+}
+.weeks-format,
+.topics-format {
   width: 960px;
-  border-collapse: collapse;
   margin: 0;
 }
-#layout-table #left-column {
-  width: 220px !important;
+.topics-format #left-column {
   background-color: #f68933;
 }
-#layout-table #middle-column {
+.topics-format #middle-column {
   padding: 0;
   background-color: #fff;
+  margin: 0 16.5em;
 }
-#layout-table #right-column {
-  width: 220px !important;
+.topics-format #right-column {
   background-color: #1d6fcf;
 }
-div.headingblock {
+.headingblock {
   border-style: none;
 }
-div#content div.section {
+#content .section {
   border-style: none;
 }
-div.section {
+.section {
   border-style: none;
 }
-.onlymiddlecolumn div#content {
+.onlymiddlecolumn #content {
   margin: 10px;
 }
 /* @end */
@@ -750,6 +752,28 @@ div.categorybox {
   padding-top: 180px;
   margin-top: 10px;
 }*/
+/* @group My Group */
+.admin #layout-table #middle-column {
+  /*padding-top: 10px;*/
+}
+#layout-table {
+  width: 960px;
+  border-collapse: collapse;
+  margin: 0;
+}
+#layout-table #left-column {
+  width: 220px !important;
+  background-color: #f68933;
+}
+#layout-table #middle-column {
+  padding: 0;
+  background-color: #fff;
+}
+#layout-table #right-column {
+  width: 220px !important;
+  background-color: #1d6fcf;
+}
+/* @end */
 /* @end */
 /* @group course */
 #course-view .section td.side {
diff --git a/theme/lines/lines.css b/theme/lines/lines.css
index 214d63ac38..4165981561 100755
--- a/theme/lines/lines.css
+++ b/theme/lines/lines.css
@@ -1,4 +1,4 @@
-/* @override http://ubuntu.userver.lan/moodle_19_test/theme/lines/lines.css */
+/* @override http://ubuntu.userver.lan/moodle_20/theme/lines/lines.css */
 /* @group core */
 body {
   background-color: #eaebd3;
@@ -646,16 +646,24 @@ link
 .haslayouttable div#content {
   margin: 0;
 }
-#layout-table {
-  border-collapse: collapse;
-  margin-top: 0;
+.weeks-format #left-column, 
+.weeks-format #right-column, 
+.topics-format #left-column, 
+.topics-format #right-column {
+	width: 15.5em;
 }
-#layout-table #left-column,
-#layout-table #right-column {
+.weeks-format,
+.topics-format {
+  width: 960px;
+  margin: 0;
+}
+.topics-format #left-column,
+.topics-format #right-column {
   padding: 10px 0 0;
   background: #f8f9ef url(pix/sideblock_grad.png) repeat-x left top;
 }
-#layout-table #middle-column {
+.topics-format #middle-column {
+  margin: 0 16.5em;
   padding: 0 14px;
   background: url(pix/content_bottom_right.png) no-repeat right bottom;
 }
@@ -697,9 +705,35 @@ link
   padding-top: 180px;
   margin-top: 10px;
 }*/
+/* @group 2.0 layout-table hacks */
+#layout-table {
+  border-collapse: collapse;
+  margin-top: 0;
+}
+#layout-table #left-column,
+#layout-table #right-column {
+  padding: 10px 0 0;
+  background: #f8f9ef url(pix/sideblock_grad.png) repeat-x left top;
+}
+#layout-table #middle-column {
+  padding: 0 14px;
+  background: url(pix/content_bottom_right.png) no-repeat right bottom;
+}
+/* @end */
 /* @end */
 /* @group course */
-#course-view .section td.side {
+#course-view .weeks .section,
+#course-view .topics .section {
+  border-style: none;
+  margin-bottom: 2em;
+}
+#course-view .weeks .content ,
+#course-view .topics .content, 
+#course-view .weeks .section,
+#course-view .topics .section {
+  background-color: #FFF;
+}
+#course-view .section .side {
   border-top: 5px #EEE;
   border-style: solid none dotted;
 }
@@ -712,13 +746,12 @@ link
 #course-view .current .right {
   background-color: #FFC;
 }
-#course-view .section td.content {
+#course-view .weeks .section .content,
+#course-view .topics .section .content {
   padding-top: 0;
-  border-top: 5px #EEE;
-  border-style: solid none dotted;
-}
-#course-view .section .spacer {
-  height: 3em;
+  border-style: none;
+  border-top: 5px #EEE solid;
+  border-bottom: 1px #EEE solid;
 }
 .section .summary {
   color: #444;
diff --git a/theme/lines/pix/content_bottom_right.png b/theme/lines/pix/content_bottom_right.png
new file mode 100644
index 0000000000..021ed13100
Binary files /dev/null and b/theme/lines/pix/content_bottom_right.png differ
diff --git a/theme/lines/pix/footer_grad.png b/theme/lines/pix/footer_grad.png
new file mode 100644
index 0000000000..ad61f5137c
Binary files /dev/null and b/theme/lines/pix/footer_grad.png differ
diff --git a/theme/lines/pix/sideblock_grad.png b/theme/lines/pix/sideblock_grad.png
new file mode 100644
index 0000000000..9d23d3c349
Binary files /dev/null and b/theme/lines/pix/sideblock_grad.png differ