diff --git a/mozilla/calendar/resources/content/multiweekView.xul b/mozilla/calendar/resources/content/multiweekView.xul
index 6be79afd82e..f02dd415f9f 100644
--- a/mozilla/calendar/resources/content/multiweekView.xul
+++ b/mozilla/calendar/resources/content/multiweekView.xul
@@ -70,15 +70,10 @@
-
+
-
-
-
-
-
-
-
+
+
@@ -92,28 +87,28 @@
@@ -336,8 +331,9 @@
+
-
+
@@ -356,8 +352,7 @@
-
-
+
diff --git a/mozilla/calendar/resources/jar.mn b/mozilla/calendar/resources/jar.mn
index 1dc2e856c78..ed0bb848aa5 100644
--- a/mozilla/calendar/resources/jar.mn
+++ b/mozilla/calendar/resources/jar.mn
@@ -109,7 +109,7 @@ calendar.jar:
skin/classic/calendar/dot_selected.png (skin/classic/dot_selected.png)
skin/classic/calendar/eventDialog.css (skin/classic/eventDialog.css)
skin/classic/calendar/overlay.css (skin/classic/overlay.css)
- skin/classic/calendar/pageupdown.gif (skin/classic/pageupdown.gif)
+ skin/classic/calendar/pageupdown.png (skin/classic/pageupdown.png)
skin/classic/calendar/prevnextarrow.png (skin/classic/prevnextarrow.png)
skin/classic/calendar/selectAddresses.css (skin/classic/selectAddresses.css)
skin/classic/calendar/synch_animated.gif (skin/classic/synch_animated.gif)
diff --git a/mozilla/calendar/resources/skin/classic/calendar.css b/mozilla/calendar/resources/skin/classic/calendar.css
index fd5752f91da..626a12ec7b0 100644
--- a/mozilla/calendar/resources/skin/classic/calendar.css
+++ b/mozilla/calendar/resources/skin/classic/calendar.css
@@ -23,8 +23,8 @@
* Karl Guertin
* Colin Phillips
* ArentJan Banck
- * Eric Belhaire
- * Mark Swaffer
+ * Eric Belhaire
+ * Mark Swaffer
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -63,7 +63,7 @@
*-------------------------------------------------------------------*/
.toolbarbutton-1 {
- list-style-image: url("chrome://calendar/skin/btn1.gif");
+ list-style-image: url("chrome://calendar/skin/btn1.png");
}
@@ -288,9 +288,25 @@
*****************************
*/
#multiweek-grid{
- border-right: 1px solid #3f7d91;
+ border: 1px solid #3f7d91;
}
+#multiweek-grid-box{
+ border: 1px solid #3f7d91;
+ padding: 2px;
+ margin: 10px 2px 15px 10px;
+ background-color: #E7EEEC;
+ background-position: 50% 50%;
+ background-repeat: no-repeat;
+}
+
+
+/*Right column*/
+.multiweek-rightcol-class{
+ margin: 10px 2px 15px 2px;
+}
+
+
#multiweek-view-box{
-moz-box-align: center;
-moz-box-pack: center;
@@ -307,15 +323,28 @@
padding:0px;
}
+.multiweek-header-class{
+ border-left: 1px solid #3f7d91;
+ -moz-box-align: center;
+ font-size: 1.3em;
+ font-family: Arial, Helvetica;
+ color: #3f7d91;
+ background-color: #FFFFFF;
+ font-weight:bold;
+}
+.multiweek-header-left-class{
+ -moz-box-align: center;
+ font-size: 1.3em;
+ font-family: Arial, Helvetica;
+ color: #3f7d91;
+ font-weight:bold;
+}
+
.multiweek-leftcol-box-class{
display : -moz-stack;
background-color : #E7EEEC;
}
-/*Right column*/
-.multiweek-rightcol-class{
- background-color : #E7EEEC;
-}
/*Previous/Next Buttons*/
.updownbuttons{
list-style-image: url("chrome://calendar/skin/pageupdown.gif");
@@ -1293,6 +1322,12 @@ treechildren:-moz-tree-cell-text(selected) {
list-style-image : url( "chrome://calendar/skin/synch_animated.gif" );
}
+listitem[selected="true"] > .calendar-list-item-class
+{
+ background-color : White;
+ color : Black;
+}
+
.todo-due-image-class
{
list-style-image : url( "chrome://calendar/skin/unifinder/priority_header.png" )
diff --git a/mozilla/calendar/resources/skin/classic/pageupdown.png b/mozilla/calendar/resources/skin/classic/pageupdown.png
new file mode 100644
index 00000000000..bdf53c12bdd
Binary files /dev/null and b/mozilla/calendar/resources/skin/classic/pageupdown.png differ
diff --git a/mozilla/calendar/resources/skin/modern/calendar.css b/mozilla/calendar/resources/skin/modern/calendar.css
index eb4218b600f..fc1dff965fd 100644
--- a/mozilla/calendar/resources/skin/modern/calendar.css
+++ b/mozilla/calendar/resources/skin/modern/calendar.css
@@ -23,8 +23,8 @@
* Karl Guertin
* Colin Phillips
* ArentJan Banck
- * Mark Swaffer
- * Eric Belhaire
+ * Mark Swaffer
+ * Eric Belhaire
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -68,7 +68,7 @@
*-------------------------------------------------------------------*/
.toolbarbutton-1 {
- list-style-image: url("chrome://calendar/skin/btn1.gif");
+ list-style-image: url("chrome://calendar/skin/btn1.png");
}
@@ -295,7 +295,22 @@
*****************************
*/
#multiweek-grid{
- border-right: 1px solid #3f7d91;
+ border: 1px solid #3f7d91;
+}
+
+#multiweek-grid-box{
+ border: 1px solid #3f7d91;
+ padding: 2px;
+ margin: 10px 2px 15px 10px;
+ background-color: #E7EEEC;
+ background-position: 50% 50%;
+ background-repeat: no-repeat;
+}
+
+
+/*Right column*/
+.multiweek-rightcol-class{
+ margin: 10px 2px 15px 2px;
}
#multiweek-view-box{
@@ -314,14 +329,28 @@
padding:0px;
}
+.multiweek-header-class{
+ border-left: 1px solid #3f7d91;
+ -moz-box-align: center;
+ font-size: 1.3em;
+ font-family: Arial, Helvetica;
+ color: #3f7d91;
+ background-color: #FFFFFF;
+ font-weight:bold;
+}
+.multiweek-header-left-class{
+ -moz-box-align: center;
+ font-size: 1.3em;
+ font-family: Arial, Helvetica;
+ color: #3f7d91;
+ font-weight:bold;
+}
+
.multiweek-leftcol-box-class{
display : -moz-stack;
background-color : #E7EEEC;
}
-/*Right column*/
-.multiweek-rightcol-class{
- background-color : #E7EEEC;
-}
+
/*Previous/Next Buttons*/
.updownbuttons{
list-style-image: url("chrome://calendar/skin/pageupdown.gif");
@@ -1312,6 +1341,12 @@ treechildren:-moz-tree-cell-text(selected) {
list-style-image : url( "chrome://calendar/skin/synch_animated.gif" );
}
+listitem[selected="true"] > .calendar-list-item-class
+{
+ background-color : White;
+ color : Black;
+}
+
.todo-due-image-class
{
list-style-image : url( "chrome://calendar/skin/unifinder/priority_header.png" )