Upgrade with more intelligent CSS rules.

I tried very hard not to undo any of Andrea's changes. Took a couple of
guesses along the way. Sorry if I guessed wrong!

diff --git a/theme/formal_white/styles.php b/theme/formal_white/styles.php
index 34f234d6786ebe1e0b2ef1b5fa33870f335cefa3..51ca10c9b7fb7dc4d8a513775aa1713370eb32c4 100644 (file)
--- a/theme/formal_white/styles.php
+++ b/theme/formal_white/styles.php
@@ -7,23 +7,23 @@
     }\r
 \r
     $nomoodlecookie = true;\r
-    require_once("../../config.php"); \r
+    require_once("../../config.php");\r
     $themeurl = style_sheet_setup(filemtime("styles.php"), 300, $themename);\r
 \r
-/// From here on it's nearly a normal stylesheet. \r
-/// First are some CSS definitions for normal tags, \r
+/// From here on it's nearly a normal stylesheet.\r
+/// First are some CSS definitions for normal tags,\r
 /// then custom tags follow.\r
 ///\r
 /// New classes always get added to the end of the file.\r
-/// \r
+///\r
 /// Note that a group of standard colours are all\r
 /// defined in config.php in this directory.  The\r
 /// reason for this is because Moodle uses the same\r
 /// colours to provide oldstyle formatting for\r
 /// browsers without CSS.\r
-/// \r
+///\r
 /// You can hardcode colours in this file if you\r
-/// don't care about this. \r
+/// don't care about this.\r
 \r
 ?>\r
 \r
@@ -39,7 +39,7 @@ td, th {
        font-size : 13px;}\r
 \r
 th {\r
-    font-weight: bold; \r
+    font-weight: bold;\r
     background-color: <?PHP echo $THEME->cellheading?>;\r
 }\r
 \r
@@ -49,27 +49,27 @@ ul {
 }\r
 \r
 a:link {\r
-    text-decoration: none; \r
+    text-decoration: none;\r
     color: #0033CC;\r
 }\r
 \r
 a:visited {\r
-    text-decoration: none; \r
+    text-decoration: none;\r
     color:#0033CC;\r
 }\r
 \r
 a:hover {\r
-    text-decoration: underline; \r
+    text-decoration: underline;\r
     color: #990000;\r
 }\r
 \r
-form { \r
+form {\r
     margin-bottom: 0;\r
 }\r
 \r
 input {\r
        background : transparent;\r
-       \r
+\r
 }\r
 \r
 h2 {\r
@@ -236,7 +236,7 @@ h4 {
 }\r
 \r
 .weeklydatetext {\r
-       font-weight: bold; \r
+       font-weight: bold;\r
 }\r
 \r
 .topicsoutline {\r
@@ -336,7 +336,7 @@ h4 {
 }\r
 \r
 a.dimmed:link {\r
-    text-decoration: none; \r
+    text-decoration: none;\r
     color: #AAAAAA;\r
 }\r
 \r
@@ -559,11 +559,7 @@ TABLE.calendarmonth {
     -moz-border-radius: 10px;\r
 }\r
 \r
-.calendarweekend {\r
-    color: red;\r
-}\r
-\r
-.cal_day_mini {\r
+TABLE.calendarmini TBODY TD {\r
     text-align: center;\r
     vertical-align: center;\r
     width: 14%;\r
@@ -573,43 +569,48 @@ TABLE.calendarmonth {
     -moz-border-radius: 4px;\r
 }\r
 \r
-.calendardaymonth {\r
+TABLE.calendarmonth TBODY TD {\r
     width: 14%;\r
     border-width: 1px;\r
     border-color: <?PHP echo $THEME->cellcontent2?>;\r
     border-style: solid;\r
     vertical-align: top;\r
-       background-color: <?PHP echo $THEME->body?>;\r
+    background-color: <?PHP echo $THEME->body?>;\r
 }\r
 \r
-.calendardaymonth TABLE {\r
+TABLE.calendarmonth TBODY TD TABLE {\r
        margin-top: 0px;\r
        margin-left: 0px;\r
        font-size : 10px;\r
        line-height: 1.2em;\r
 }\r
 \r
-.calendardaymonth DIV {\r
+TABLE.calendarmonth TBODY TD TABLE TD {
+    border: none;\r
+    background: none;
+}
+\r
+TABLE.calendarmonth TBODY TD DIV {\r
        margin-top: 0px;\r
        margin-left: 0px;\r
        font-size: 10px;\r
        line-height: 1.2em;\r
 }\r
 \r
-.calendarmini .calendarheader {\r
+TABLE.calendarmini THEAD TD {\r
     font-size: 10px;\r
        font-weight: bold;\r
     text-align: center;\r
     vertical-align: center;\r
 }\r
 \r
-.calendarmonth .calendarheader {\r
+TABLE.calendarmonth THEAD TD {\r
        text-align: center;\r
     vertical-align: center;\r
        font-weight: bold;\r
     padding-bottom: 3px;\r
     border-bottom: 2px <?PHP echo $THEME->borders?> solid;\r
-       background-color: <?PHP echo $THEME->body?>;\r
+    background-color: <?PHP echo $THEME->body?>;\r
 }\r
 \r
 .sideblockmain .cal_event {\r
@@ -620,43 +621,51 @@ TABLE.calendarmonth {
 }\r
 \r
 .cal_event_global {\r
-       background-color: #99cc99;\r
-       border: 2px #99cc99 solid;\r
+       background-color: #99cc99 !important;\r
+       border: 2px #99cc99 solid !important;\r
 }\r
 \r
 .cal_event_course {\r
-       background-color: #ff9966;\r
-       border: 2px #ff9966 solid;\r
+       background-color: #ff9966 !important;\r
+       border: 2px #ff9966 solid !important;\r
 }\r
 \r
 .cal_event_group {\r
-       background-color: orange;\r
-       border: 2px orange solid;\r
+       background-color: orange !important;\r
+       border: 2px orange solid !important;\r
 }\r
 \r
 .cal_event_user {\r
-       background-color: #ffcc99;\r
-       border: 2px #ffcc99 solid;\r
+       background-color: #ffcc99 !important;\r
+       border: 2px #ffcc99 solid !important;\r
 }\r
 \r
 .cal_duration_global {\r
-       border-top: 2px #99cc99 solid;\r
-       border-bottom: 2px #99cc99 solid;\r
+       border-top: 2px #99cc99 solid !important;\r
+       border-bottom: 2px #99cc99 solid !important;\r
 }\r
 \r
 .cal_duration_course {\r
-       border-top: 2px #ff9966 solid;\r
-       border-bottom: 2px #ff9966 solid;\r
+       border-top: 2px #ff9966 solid !important;\r
+       border-bottom: 2px #ff9966 solid !important;\r
 }\r
 \r
 .cal_duration_user {\r
-       border-top: 2px #ffcc99 solid;\r
-       border-bottom: 2px #ffcc99 solid;\r
+       border-top: 2px #ffcc99 solid !important;\r
+       border-bottom: 2px #ffcc99 solid !important;\r
 }\r
 \r
 .cal_duration_group {\r
-       border-top: 2px orange solid;\r
-       border-bottom: 2px orange solid;\r
+       border-top: 2px orange solid !important;\r
+       border-bottom: 2px orange solid !important;\r
+}\r
+\r
+.cal_weekend {\r
+    color: red;\r
+}\r
+\r
+.cal_today {\r
+       border: 2px black solid !important;\r
 }\r
 \r
 .mycalendar {\r
@@ -721,10 +730,6 @@ TABLE.calendarmonth {
        margin-bottom: 4px;\r
 }\r
 \r
-.cal_today {\r
-       border: 2px black solid;\r
-}\r
-\r
 .calendarexpired {\r
        color: red;\r
        font-weight: bold;\r