Fix bug 698760 - Calendar Views UI freshening. r=paenglab,a=philipp
authorPhilipp Kewisch <mozilla@kewis.ch>
Wed, 02 Nov 2011 23:39:51 +0100
changeset 9330 3aca88ef7883d7798c256c26bc0727d035d99448
parent 9329 f2486981acc2ec88f03481440f200c4143d5a97c
child 9331 99fef5dc1a0e8436b6056183b34f3c9124d35c92
push id230
push userbugzilla@standard8.plus.com
push dateTue, 08 Nov 2011 22:55:24 +0000
treeherdercomm-beta@63dad5648415 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspaenglab, philipp
bugs698760
Fix bug 698760 - Calendar Views UI freshening. r=paenglab,a=philipp
calendar/base/content/calendar-month-view.xml
calendar/base/content/calendar-multiday-view.xml
calendar/base/content/calendar-view-core.xml
calendar/base/jar.mn
calendar/base/themes/common/images/calendar-day-label-back.png
calendar/base/themes/common/images/category-overlay.png
calendar/base/themes/common/images/gradient-overlay.png
calendar/base/themes/gnomestripe/calendar-views.css
calendar/base/themes/gnomestripe/today-pane.css
calendar/base/themes/pinstripe/calendar-task-view.css
calendar/base/themes/pinstripe/calendar-views.css
calendar/base/themes/pinstripe/today-pane.css
calendar/base/themes/winstripe/calendar-views.css
calendar/base/themes/winstripe/today-pane.css
calendar/locales/en-US/chrome/calendar/calendar.properties
--- a/calendar/base/content/calendar-month-view.xml
+++ b/calendar/base/content/calendar-month-view.xml
@@ -96,20 +96,16 @@
                     <xul:calendar-category-box anonid="category-box" xbl:inherits="categories" pack="end"/>
                     <xul:hbox anonid="alarm-icons-box"
                               class="alarm-icons-box"
                               align="center"
                               pack="end"
                               xbl:inherits="flashing"/>
                   </xul:stack>
                 </xul:hbox>
-                <xul:image anonid="gradient"
-                           class="calendar-event-box-gradient"
-                           height="1px"
-                           mousethrough="always"/>
               </xul:stack>
             </xul:box>
           </xul:box>
         </xul:hbox>
       </xul:vbox>
     </content>
     <implementation>
       <property name="occurrence">
--- a/calendar/base/content/calendar-multiday-view.xml
+++ b/calendar/base/content/calendar-multiday-view.xml
@@ -263,19 +263,19 @@
   </binding>
 
   <!--
      - A column for displaying event boxes in.  One column per
      - day; it manages the layout of the events given via add/deleteEvent.
     -->
   <binding id="calendar-event-column">
     <content>
-      <xul:stack anonid="boxstack" flex="1" style="min-width: 1px; min-height: 1px">
-        <xul:box anonid="bgbox" flex="1" style="min-width: 1px; min-height: 1px"/>
-        <xul:box xbl:inherits="context" anonid="topbox" flex="1" equalsize="always" style="min-width: 1px; min-height: 1px" mousethrough="always"/>
+      <xul:stack anonid="boxstack" flex="1" class="multiday-column-box-stack" style="min-width: 1px; min-height: 1px">
+        <xul:box anonid="bgbox" flex="1" class="multiday-column-bg-box" style="min-width: 1px; min-height: 1px"/>
+        <xul:box xbl:inherits="context" anonid="topbox" flex="1" equalsize="always" class="multiday-column-top-box" style="min-width: 1px; min-height: 1px" mousethrough="always"/>
         <xul:box anonid="fgbox" flex="1" class="fgdragcontainer" style="min-width: 1px; min-height: 1px; overflow:hidden;">
           <xul:box anonid="fgdragspacer" style="display: inherit; overflow: hidden;">
             <xul:spacer flex="1"/>
             <xul:label anonid="fgdragbox-startlabel" class="fgdragbox-label"/>
           </xul:box>
           <xul:box anonid="fgdragbox" class="fgdragbox" />
           <xul:label anonid="fgdragbox-endlabel" class="fgdragbox-label"/>
         </xul:box>
@@ -2162,17 +2162,16 @@
                    xbl:inherits="orient,readonly,flashing,alarm,allday,priority,progress,status,calendar,categories,calendar-uri,calendar-id"
                    flex="1">
             <xul:box class="calendar-event-selection" orient="horizontal" flex="1">
               <xul:stack anonid="eventbox"
                          align="stretch"
                          class="calendar-event-box-container"
                          flex="1"
                          xbl:inherits="context,parentorient=orient,readonly,flashing,alarm,allday,priority,progress,status,calendar,categories">
-                <xul:image flex="1" class="calendar-event-box-gradient"/>
                 <xul:hbox class="calendar-event-details"
                           anonid="calendar-event-details"
                           align="start">
                   <xul:image anonid="item-icon"
                              class="calendar-item-image"
                              xbl:inherits="progress,allday,itemType"/>
                   <xul:description anonid="event-name" class="calendar-event-details-core" flex="1"/>
                   <xul:textbox anonid="event-name-textbox"
@@ -2392,38 +2391,36 @@
             onMouseOverItem(event);
         }
       ]]></handler>
     </handlers>
   </binding>
 
   <binding id="calendar-multiday-view" extends="chrome://calendar/content/calendar-base-view.xml#calendar-base-view">
     <content flex="1" orient="vertical" xbl:inherits="context,item-context">
-      <xul:box anonid="mainbox" flex="1">
+      <xul:box anonid="mainbox" class="multiday-view-main-box" flex="1">
         <!-- these boxes are tricky: width or height in CSS depend on orient -->
-        <xul:box anonid="labelbox">
-          <xul:box anonid="labeltimespacer"/>
+        <xul:box anonid="labelbox" class="multiday-view-label-box">
+          <xul:box anonid="labeltimespacer" class="multiday-view-label-time-spacer"/>
           <xul:box anonid="labeldaybox"
-                   class="calendar-label-day-box"
+                   class="multiday-view-label-day-box"
                    flex="1"
                    chromedir="&locale.dir;"
                    equalsize="always"/>
           <xul:box anonid="labelscrollbarspacer"/>
         </xul:box>
-        <xul:box anonid="headerbox">
-          <xul:box anonid="headertimespacer"
-                   class="calendar-header-time-spacer"/>
-          <xul:box anonid="headerdaybox" class="calendar-header-day-box"
-                   flex="1" equalsize="always" />
+        <xul:box anonid="headerbox" class="multiday-view-header-box">
+          <xul:box anonid="headertimespacer" class="multiday-view-header-time-spacer"/>
+          <xul:box anonid="headerdaybox" class="multiday-view-header-day-box" flex="1" equalsize="always" />
           <xul:box anonid="headerscrollbarspacer"/>
         </xul:box>
         <xul:scrollbox anonid="scrollbox" flex="1">
           <!-- the orient of the calendar-time-bar needs to be the opposite of the parent -->
           <xul:calendar-time-bar xbl:inherits="orient" anonid="timebar"/>
-          <xul:box anonid="daybox" class="calendar-day-box" flex="1"
+          <xul:box anonid="daybox" class="multiday-view-day-box" flex="1"
                    equalsize="always"/>
         </xul:scrollbox>
       </xul:box>
     </content>
 
     <implementation implements="calICalendarView">
       <constructor><![CDATA[
         // get day start/end hour from prefs and set on the view
--- a/calendar/base/content/calendar-view-core.xml
+++ b/calendar/base/content/calendar-view-core.xml
@@ -84,20 +84,16 @@
                                                xbl:inherits="categories"
                                                pack="end"/>
                     <xul:hbox anonid="alarm-icons-box"
                               class="alarm-icons-box"
                               align="center"
                               xbl:inherits="flashing"/>
                   </xul:stack>
                 </xul:hbox>
-                <xul:image anonid="gradient"
-                           class="calendar-event-box-gradient"
-                           height="1px"
-                           mousethrough="always"/>
               </xul:stack>
             </xul:box>
           </xul:box>
         </xul:hbox>
       </xul:vbox>
     </content>
 
     <implementation>
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -103,36 +103,33 @@ calendar.jar:
 % skin calendar classic/1.0 %skin/calendar/
 % style chrome://calendar/content/calendar-event-dialog.xul chrome://global/skin/toolbar.css
 % style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar-task-view.css
     skin/calendar/abcard.png                               (themes/common/images/abcard.png)
     skin/calendar/alarm-flashing.png                       (themes/common/images/alarm-flashing.png)
     skin/calendar/alarm-icons.png                          (themes/common/images/alarm-icons.png)
     skin/calendar/calendar-alarms.css                      (themes/common/calendar-alarms.css)
     skin/calendar/calendar-creation-wizard.css             (themes/common/calendar-creation-wizard.css)
-    skin/calendar/calendar-day-label-back.png              (themes/common/images/calendar-day-label-back.png)
     skin/calendar/calendar-invitations-dialog.css          (themes/common/dialogs/calendar-invitations-dialog.css)
     skin/calendar/calendar-occurrence-prompt.css           (themes/common/calendar-occurrence-prompt.css)
     skin/calendar/calendar-timezone-highlighter.css        (themes/common/dialogs/calendar-timezone-highlighter.css)
     skin/calendar/calendar-properties-dialog.css           (themes/common/dialogs/calendar-properties-dialog.css)
     skin/calendar/calendar-subscriptions-dialog.css        (themes/common/dialogs/calendar-subscriptions-dialog.css)
     skin/calendar/calendar-providerUninstall-dialog.css    (themes/common/calendar-providerUninstall-dialog.css)
     skin/calendar/calendar-overlay.png                     (themes/common/images/calendar-overlay.png)
-    skin/calendar/category-overlay.png                     (themes/common/images/category-overlay.png)
     skin/calendar/calendar-printing.css                    (themes/common/calendar-printing.css)
     skin/calendar/calendar-status.png                      (themes/common/images/calendar-status.png)
     skin/calendar/common/calendar-task-tree.css            (themes/common/calendar-task-tree.css)
     skin/calendar/daypicker-background.png                 (themes/common/images/daypicker-background.png)
     skin/calendar/day-box-item-image.png                   (themes/common/images/day-box-item-image.png)
     skin/calendar/event-dialog-keepduration-button.png     (themes/common/images/event-dialog-keepduration-button.png)
     skin/calendar/event-grippy-bottom.png                  (themes/common/images/event-grippy-bottom.png)
     skin/calendar/event-grippy-left.png                    (themes/common/images/event-grippy-left.png)
     skin/calendar/event-grippy-right.png                   (themes/common/images/event-grippy-right.png)
     skin/calendar/event-grippy-top.png                     (themes/common/images/event-grippy-top.png)
-    skin/calendar/gradient-overlay.png                     (themes/common/images/gradient-overlay.png)
     skin/calendar/task-images.png                          (themes/common/images/task-images.png)
     skin/calendar/timezone_map.png                         (themes/common/images/timezone_map.png)
     skin/calendar/timezones.png                            (themes/common/images/timezones.png)
     skin/calendar/widgets/nav-arrow.svg                    (themes/common/widgets/images/nav-arrow.svg)
     skin/calendar/widgets/nav-today.svg                    (themes/common/widgets/images/nav-today.svg)
     skin/calendar/widgets/nav-today-hov.svg                (themes/common/widgets/images/nav-today-hov.svg)
     skin/calendar/widgets/view-navigation.png              (themes/common/widgets/images/view-navigation.png)
     skin/calendar/cal-icon32.png                           (themes/@THEME@/images/cal-icon32.png)
deleted file mode 100644
index f1776418f35c9916ffa9bda337edfbde2c78a943..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d44fb602621d54a80e5a48869dad02ddeb11d66d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4275983b2b0343ea974b47d905811d1955303b7d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/calendar/base/themes/gnomestripe/calendar-views.css
+++ b/calendar/base/themes/gnomestripe/calendar-views.css
@@ -43,16 +43,22 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 /* Core */
 calendar-category-box:not([categories]) {
   display: none;
 }
 
+.calendar-category-box-gradient {
+    width: 7px;
+    background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.38), transparent) !important;
+    border-left: 1px solid rgba(255, 255, 255, 0.38);
+}
+
 .calendar-item-image {
     list-style-image: url(chrome://calendar/skin/day-box-item-image.png);
     padding-top: 2px;
     padding-bottom: 2px;
     -moz-margin-end: 4px;
     display: none;
 }
 
@@ -61,30 +67,38 @@ calendar-category-box:not([categories]) 
     display: -moz-box;
 }
 
 .calendar-item-image[itemType="todo"][progress="completed"] {
     -moz-image-region: rect(0px 22px 11px 11px);
 }
 
 /* Multiday view */
-box[anonid="daybox"] {
-    border-bottom: 1px solid #D2D2D2;
-}
 
 /* Margin that allows event creation by click and drag when the time slot is
    full of events. On the right side in normal view ... */
-stack[anonid="boxstack"] > box[anonid="topbox"][orient="horizontal"] {
+.multiday-column-box-stack > .multiday-column-top-box[orient="horizontal"] {
     -moz-margin-end: 5px;
 }
 /* ... and on bottom in rotate view. */
-stack[anonid="boxstack"] > box[anonid="topbox"][orient="vertical"] {
+.multiday-column-box-stack > .multiday-column-top-box[orient="vertical"] {
     margin-bottom: 5px;
 }
 
+/* .. and on the right side in the header container in normal view */
+calendar-header-container:not([rotated]) {
+    padding-right: 6px;
+    padding-left: 1px;
+}
+/* ... and on the bottom in rotated view. */
+calendar-header-container[rotated] {
+    padding-top: 1px;
+    padding-bottom: 5px;
+}
+
 calendar-event-column {
     background-color: #FFFFFF;
 }
 
 calendar-event-column[orient="horizontal"] {
     border-top: 1px solid #D2D2D2;
 }
 
@@ -106,61 +120,78 @@ calendar-event-column[orient="vertical"]
     position: relative;
 }
 
 calendar-header-container {
     background-color: #FFFFFF;
     border-left: 1px solid #D2D2D2;
 }
 
+calendar-header-container[rotated] {
+    max-width: 150px;
+}
+
 calendar-header-container[weekend="true"],
-.calendar-event-column-linebox[weekend="true"],
+.calendar-event-column-linebox[weekend="true"] {
+    background-color: #F7FFE3;
+}
+
 .calendar-event-column-linebox[off-time="true"] {
-    background-color: #F0F0F0;
+    background-color: #F3F3F3;
+}
+
+.calendar-event-column-linebox[off-time="true"][weekend="true"] {
+    background-color: #EAF7CA;
 }
 
 calendar-header-container[relation="today"],
 .calendar-event-column-linebox[relation="today"],
 calendar-day-label[orient][relation="today"] {
-    background-color: #dfeaf4;
+    background-color: #E1F0FD;
 }
 
 calendar-header-container[relation="today"] {
-    border-left: 1px solid #67ACD8;
-    border-right: 1px solid #67ACD8;
+    border-left: 1px solid #7FB9EE;
+    border-right: 1px solid #7FB9EE;
     -moz-margin-end: -1px;
     position: relative;
 }
 
 calendar-header-container[relation="today"][rotated="true"] {
-    border-top: 1px solid #67ACD8;
-    border-bottom: 1px solid #67ACD8 !important;
+    border-top: 1px solid #7FB9EE;
+    border-bottom: 1px solid #7FB9EE !important;
     border-right: 1px solid #D2D2D2;
     margin-top: -1px;
     position: relative;
 }
 
 calendar-header-container[selected="true"],
 .calendar-event-column-linebox[selected="true"] {
-    background-color: #FFFABC;
+    background-color: #FFFCD8;
 }
 
 calendar-header-container[weekend="true"][relation="today"],
-.calendar-event-column-linebox[weekend="true"][relation="today"],
-.calendar-event-column-linebox[off-time="true"][relation="today"] {
-    background-color: #D4DEE8;
+.calendar-event-column-linebox[weekend="true"][relation="today"] {
+    background-color: #E1F0FD;
 }
 
-.calendar-header-day-box[orient="vertical"] .calendar-event-column-header {
+.calendar-event-column-linebox[off-time="true"][relation="today"] {
+    background-color: #D7E8F8;
+}
+
+.multiday-view-header-day-box[orient="vertical"] .calendar-event-column-header {
     border-bottom: 1px solid #D2D2D2;
     min-width: 100px;
 }
 
 calendar-header-container[weekend="true"][selected="true"],
-.calendar-event-column-linebox[weekend="true"][selected="true"],
+.calendar-event-column-linebox[weekend="true"][selected="true"] {
+    background-color: #FFFCD8;
+}
+
 .calendar-event-column-linebox[off-time="true"][selected="true"] {
     background-color: #F2EDB2;
 }
 
 .calendar-event-column-linebox[orient="horizontal"] {
     border-right: 1px solid #D2D2D2;
 }
 
@@ -173,64 +204,73 @@ calendar-header-container[weekend="true"
 }
 
 .calendar-event-column-linebox[orient="vertical"][relation="today"]:last-child {
     border-bottom: 1px solid #67ACD8;
 }
 
 /* Make sure we extend the bold line separating scrollable and non-scrollable
    areas over the timebar. */
-.calendar-header-time-spacer[orient="horizontal"] {
+.multiday-view-header-time-spacer[orient="horizontal"] {
     border-bottom: 2px solid #D2D2D2;
+    border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors: #FFFFFF #D2D2D2;
 }
 
-.calendar-header-time-spacer[orient="vertical"] {
+.multiday-view-header-time-spacer[orient="vertical"] {
     border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors: #D2D2D2 #D2D2D2;
 }
 
-.calendar-header-day-box[orient="horizontal"] {
+.multiday-view-label-box[orient="horizontal"] > .multiday-view-label-time-spacer {
+    border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors: #FFFFFF #D2D2D2;
+}
+
+.multiday-view-header-day-box[orient="horizontal"] {
     border-right: 1px solid #D2D2D2;
     border-bottom: 2px solid #D2D2D2;
     overflow-x: hidden;
     overflow-y: auto;
     max-height: 120px;
 }
 
-.calendar-header-day-box[orient="horizontal"][todaylastinview="true"] {
+.multiday-view-header-day-box[orient="horizontal"][todaylastinview="true"] {
     border-right: 1px solid #67ACD8;
 }
 
 /* Make sure the box for day-labels appears to end before the scrollbar. */
-.calendar-label-day-box[orient="horizontal"] {
+.multiday-view-label-day-box[orient="horizontal"] {
     border-top: 1px solid #D2D2D2;
     border-right: 1px solid #D2D2D2;
 }
 
-.calendar-label-day-box[orient="vertical"] {
+.multiday-view-label-day-box[orient="vertical"] {
     border-top: 1px solid #D2D2D2;
 }
 
-.calendar-header-day-box[orient="vertical"] {
+.multiday-view-header-day-box[orient="vertical"] {
     border-top: 1px solid #D2D2D2;
     border-right: 2px solid #D2D2D2;
 }
 
 /* Make sure to have a border between the edge of the views and the scrollbar. */
-.calendar-day-box {
+.multiday-view-day-box {
     border-right: 1px solid #D2D2D2;
+    border-bottom: 1px solid #D2D2D2;
 }
 
 .fgdragbox {
     -moz-box-orient: inherit;
     display: none;
 }
 
 .fgdragbox[dragging="true"] {
     display: -moz-box;
-    background-color: blue;
+    background-image: -moz-linear-gradient(top, #fe4b22, #feb822);
     border: 5px #ffffff;
     opacity: 0.5;
 }
 
 .fgdragcontainer {
     -moz-box-orient: inherit;
     display: none;
 }
@@ -272,129 +312,136 @@ calendar-header-container[weekend="true"
 }
 
 .calendar-event-name-textbox {
     background: transparent !important;
     color: inherit;
 }
 
 calendar-event-box {
-    border-left: 1px solid transparent;
-    border-top: 1px solid transparent;
-    border-right: 1px solid transparent;
-    border-bottom: 1px solid #D0D0D0;
+    border: 1px solid transparent;
 }
 
-calendar-event-box[selected="true"] {
-    border-left: 1px solid transparent;
-    border-top: 1px solid white;
-    border-right: 1px solid transparent;
-    border-bottom: 1px solid #727272;
+calendar-month-day-box-item[selected="true"] .calendar-color-box,
+calendar-event-box[selected="true"] .calendar-color-box,
+calendar-editable-item[selected="true"] .calendar-color-box {
+    color: #000000 !important;
+    background-color: #FDF5A0 !important;
+    -moz-box-shadow: 1px 2px 5px rgba(30, 20, 0, 0.6);
 }
 
-calendar-event-box[selected="true"] .calendar-color-box {
-    color: #000000 !important;
-    background-color: #ffdb67 !important;
-}
 
-/* RTL styles for the mainbox and children */
-box[anonid="mainbox"] {
+/* RTL styles for the main box and children */
+.multiday-view-main-box {
     direction: ltr;
 }
 
-.calendar-label-day-box[chromedir="rtl"] {
+.multiday-view-label-day-box[chromedir="rtl"] {
     direction: rtl;
 }
 
 /* headers horizontal, times vertical */
-box[anonid="labelbox"][orient="horizontal"] {
+.multiday-view-label-box[orient="horizontal"] {
     height: 10px;
 }
 
-box[anonid="headerbox"][orient="horizontal"] {
-    min-height: 50px;
+.multiday-view-header-box[orient="horizontal"] {
+    min-height: 30px;
 }
 
-box[anonid="labelbox"][orient="horizontal"] > box[anonid="labeltimespacer"],
-box[anonid="headertimespacer"][orient="horizontal"],
+.multiday-view-label-box[orient="horizontal"] > .multiday-view-label-time-spacer,
+.multiday-view-header-box[orient="horizontal"] > .multiday-view-header-time-spacer,
 calendar-time-bar[orient="vertical"] {
     width: 10ex; /* space for "11:00 AM" */
 }
 
 /* headers vertical, times horizonal */
-box[anonid="labelbox"][orient="vertical"] {
+.view-label-box[orient="vertical"] {
     width: 30px;
 }
 
-box[anonid="headerbox"][orient="vertical"] {
+.view-header-box[orient="vertical"] {
     width: 40px;
 }
 
-box[anonid="labelbox"][orient="vertical"] > box[anonid="labeltimespacer"],
-box[anonid="headertimespacer"][orient="vertical"],
+.multiday-view-label-box[orient="vertical"] > .multiday-view-label-time-spacer,
+.multiday-view-header-box[orient="vertical"] > .multiday-view-header-time-spacer {
+    height: 40px;
+}
+
 calendar-time-bar[orient="horizontal"] {
     height: 40px;
 }
 
+/** Start time bar **/
+
 .calendar-time-bar-label {
     font-size: 1em;
 }
 
 .calendar-time-bar-box-odd,
 .calendar-time-bar-box-even {
     color: #6A6969;
     background-color: #FFFFFF;
     text-align: right;
     overflow: hidden;
 }
 
 .calendar-time-bar-box-odd[off-time="true"] ,
 .calendar-time-bar-box-even[off-time="true"] {
     background-color: #F0F0F0;
-    border-right: 3px double #D2D2D2;
+    border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors:  #FFFFFF #D2D2D2;
 }
 
-
 .calendar-time-bar-box-odd[orient="horizontal"],
 .calendar-time-bar-box-even[orient="horizontal"] {
     border-right: 1px solid #D2D2D2;
     border-top: 1px solid #D2D2D2;
 
 }
 
 .calendar-time-bar-box-odd[orient="vertical"],
 .calendar-time-bar-box-even[orient="vertical"] {
     border-bottom: 1px  transparent !important;
-    border-right: 3px double #D2D2D2;
+    border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors:  #FFFFFF #D2D2D2;
 }
 
+/** End time bar **/
+
 calendar-multiday-view {
     background-color: #FFFFFF;
     padding: 0px;
 }
 
 calendar-multiday-view[hidden="true"] {
     display: none;
 }
 
 calendar-day-label {
     color: #000000;
     background-color: white;
-    background-image: url("chrome://calendar/skin/calendar-day-label-back.png");
+    background-image: -moz-linear-gradient(top, #fafafa, #eeeeee);
     border-left: 1px solid #D2D2D2;
     border-bottom: 1px solid #D2D2D2;
 }
 
 calendar-day-label[selected="true"] {
     background-color: #FFFABC !important;
 }
 
 calendar-day-label[orient="vertical"] {
-    background-image: url("chrome://calendar/skin/calendar-day-label-back-vertical.png");
-    min-width: 110px;
+    background-image: none;
+    min-width: 100px;
+}
+
+calendar-day-label[orient="vertical"][relation="today"],
+calendar-day-label[orient="vertical"][relation="today1day"] {
+    background-color: #D2E3F3 !important;
 }
 
 calendar-day-label[relation="today"],
 calendar-day-label[relation="today1day"] {
     border: 1px solid #67ACD8;
     -moz-margin-end: -1px;
     margin-top: -1px;
     position: relative;
@@ -439,116 +486,106 @@ calendar-month-day-box {
 
 .calendar-month-day-box-current-month {
     background-color: #FFFFFF;
 }
 .calendar-month-day-box-current-month .calendar-month-day-box-date-label {
     background-color: #F7F7F7;
 }
 .calendar-month-day-box-day-off {
-    background-color: #EFEFEF;
+    background-color: #F7FFE3;
 }
 .calendar-month-day-box-day-off .calendar-month-day-box-date-label {
-    background-color: #E7E7E7;
+    background-color: #EAF7CA;
 }
 .calendar-month-day-box-other-month {
-    background-color: #DFDFDF;
+    background-color: #F3F3F3;
 }
 .calendar-month-day-box-other-month .calendar-month-day-box-date-label {
-    background-color: #D7D7D7;
+    background-color: #E8E8E8;
+}
+
+.calendar-month-day-box-other-month.calendar-month-day-box-day-off {
+    background-color: #E8E8E8;
+}
+
+.calendar-month-day-box-other-month.calendar-month-day-box-day-off .calendar-month-day-box-date-label {
+    background-color: #DDDDDD;
 }
 
 .calendar-month-day-box-current-month[relation="today"],
 .calendar-month-day-box-day-off[relation="today"],
 .calendar-month-day-box-other-month[relation="today"] {
-    background-color: #dfeaf4;
-    border: 1px solid #67ACD8 !important;
+    background-color: #E1F0FD;
+    border: 1px solid #7FB9EE !important;
     -moz-margin-end: -1px !important;
     margin-top: -1px !important;
     position: relative;
 }
 
 .calendar-month-day-box-date-label[relation="today"] {
-    background-color: #d7e2ec;
+    background-color: #D2E3F3;
     font-weight: bold;
 }
 
 .calendar-month-day-box-current-month[selected="true"],
 .calendar-month-day-box-day-off[selected="true"],
 .calendar-month-day-box-other-month[selected="true"] {
-    background-color: #FFFABC;
+    background-color: #FFFCD8;
 }
 
 .calendar-month-day-box-date-label[selected="true"] {
     background-color: #F2EDB2;
 }
 
 .calendar-month-day-box-date-label[relation="today"][selected="true"] {
-    background-color: #F2EDB2;
+    background-color: #D2E3F3;
 }
 
 .calendar-month-day-box-date-label {
     color: #616163;
     font-size: 0.9em;
     text-align: right;
     margin: 0px;
     padding-top: 1px;
     -moz-padding-end: 2px;
     padding-bottom: 1px;
 }
 
 calendar-month-day-box-item {
     margin: 1px;
-    padding: 0px 1px;
-}
-
-calendar-month-day-box-item[selected="true"] .calendar-color-box {
-    color: #000000 !important;
-    background-color: #ffdb67 !important;
+    padding: 1px 1px;
 }
 
 .calendar-color-box {
     /* This rule should be adopted if the alarm image size is changed */
     min-height: 13px;
+    background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.25), rgba(255, 255, 255, 0.01) 50%, rgba(0, 0, 0, 0.05))
 }
 
 .calendar-month-day-box-item-label {
     padding: 0px;
     margin: 0px;
 }
 
 .calendar-month-day-box-item-label[time="true"] {
     -moz-margin-end: 4px;
 }
 
 .labeldaybox-container {
     border-right: 1px solid #D2D2D2;
     border-top: 1px solid #D2D2D2;
 }
 
-calendar-editable-item[selected="true"] .calendar-event-selection {
-    color: #000000 !important;
-    background-color: #ffdb67 !important;
-}
-
 .dropshadow {
-    background-color: blue !important;
     height: 1.2em;
     margin: 1px;
     padding: 0px 1px;
-    opacity: 0.5;
-}
-
-.calendar-event-box-gradient {
-    list-style-image: url("chrome://calendar/skin/gradient-overlay.png");
-}
-
-.calendar-category-box-gradient {
-    list-style-image: url("chrome://calendar/skin/category-overlay.png");
-    width: 7px;
+    background-color: #FFA47D;
+    -moz-box-shadow: 1px 1px 3px rgba(68, 35, 0, 0.7) inset;
 }
 
 calendar-event-gripbar {
     -moz-box-align: center;
     -moz-box-pack: center;
     min-height: 4px;
     min-width: 4px;
     overflow: hidden;
@@ -711,17 +748,16 @@ agenda-richlist-item[status="CANCELLED"]
 #view-deck {
     background-color: white;
     border: solid ThreeDShadow;
     border-width: 0 0 0 1px;
 }
 
 tab[calview] {
     -moz-appearance: none;
-    background-image: url("chrome://calendar/skin/calendar-day-label-back-vertical.png");
     background-color: #CCCCCC;
     color: #2E4E73;
     border: 1px solid #BDBDBD;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;  
     border-bottom-left-radius: 0px;
     border-bottom-right-radius: 0px;
     font-size: 14px;
@@ -750,16 +786,21 @@ tab[calview] > .tab-middle {
     color: #2E4E73;
 }
 
 .view-header[type="end"] {
     text-align: right;
     -moz-margin-end: 6px;
 }
 
+#calendarWeek {
+    margin-top: 4px;
+    margin-bottom: 0px;
+}
+
 .navigation-inner-box {
     -moz-padding-start: 6px;
     -moz-padding-end: 6px;
     border-bottom: 1px solid #D2D2D2;
     padding-bottom: 1px;
 }
 
 .navigation-bottombox {
--- a/calendar/base/themes/gnomestripe/today-pane.css
+++ b/calendar/base/themes/gnomestripe/today-pane.css
@@ -242,18 +242,18 @@ agenda-allday-richlist-item {
 
 .agenda-container-box[selected="true"],
 .agenda-allday-container-box[selected="true"],
 .agenda-checkbox[selected="true"],
 .agenda-container-box[selected="true"][current="true"],
 .agenda-allday-container-box[selected="true"][current="true"],
 .agenda-checkbox[selected="true"][current="true"] {
   background-image: url("chrome://mozapps/skin/extensions/itemEnabledFader.png");
-  background-color: Highlight;
-  color: HighlightText;
+  background-color: #FDF5A0;
+  color: #000000;
 }
 
 .agenda-container-box[current="true"],
 .agenda-alldaycontainer-box[current="true"],
 .agenda-checkbox[current="true"],
 .agenda-container-box[selected="true"][current="true"][disabled="true"],
 .agenda-allday-container-box[selected="true"][current="true"][disabled="true"],
 .agenda-checkbox[selected="true"][current="true"][disabled="true"] {
--- a/calendar/base/themes/pinstripe/calendar-task-view.css
+++ b/calendar/base/themes/pinstripe/calendar-task-view.css
@@ -32,20 +32,16 @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #calendar-task-details-container {
-    border-top: 1px solid ThreeDShadow;
-    border-left: 1px solid ThreeDShadow;
-    border-right: 0px;
-    border-bottom: 0px;
     overflow: hidden;
 }
 
 #calendar-header-name-column,
 #calendar-task-details-attachment-row > hbox {
     -moz-padding-start: 0.1em;
 }
 
@@ -60,16 +56,17 @@
 #calendar-task-details {
     min-height: 6ex;
 }
 
 #task-addition-box {
     border-left: 1px solid ThreeDShadow;
     border-right: 0px;
     border-bottom: 1px solid ThreeDShadow;
+    background: -moz-linear-gradient(top, #eaeaea, #d1d1d1);
 }
 
 #calendar-task-details-description {
     -moz-appearance: textfield;
     border: 1px solid;
     margin: 0;
     font-family: serif;
     font-size: 16px;
--- a/calendar/base/themes/pinstripe/calendar-views.css
+++ b/calendar/base/themes/pinstripe/calendar-views.css
@@ -43,16 +43,22 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 /* Core */
 calendar-category-box:not([categories]) {
   display: none;
 }
 
+.calendar-category-box-gradient {
+    width: 7px;
+    background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.38), transparent) !important;
+    border-left: 1px solid rgba(255, 255, 255, 0.38);
+}
+
 .calendar-item-image {
     list-style-image: url(chrome://calendar/skin/day-box-item-image.png);
     padding-top: 2px;
     padding-bottom: 2px;
     -moz-margin-end: 4px;
     display: none;
 }
 
@@ -61,30 +67,38 @@ calendar-category-box:not([categories]) 
     display: -moz-box;
 }
 
 .calendar-item-image[itemType="todo"][progress="completed"] {
     -moz-image-region: rect(0px 22px 11px 11px);
 }
 
 /* Multiday view */
-box[anonid="daybox"] {
-    border-bottom: 1px solid #D2D2D2;
-}
 
 /* Margin that allows event creation by click and drag when the time slot is
    full of events. On the right side in normal view ... */
-stack[anonid="boxstack"] > box[anonid="topbox"][orient="horizontal"] {
+.multiday-column-box-stack > .multiday-column-top-box[orient="horizontal"] {
     -moz-margin-end: 5px;
 }
 /* ... and on bottom in rotate view. */
-stack[anonid="boxstack"] > box[anonid="topbox"][orient="vertical"] {
+.multiday-column-box-stack > .multiday-column-top-box[orient="vertical"] {
     margin-bottom: 5px;
 }
 
+/* .. and on the right side in the header container in normal view */
+calendar-header-container:not([rotated]) {
+    padding-right: 6px;
+    padding-left: 1px;
+}
+/* ... and on the bottom in rotated view. */
+calendar-header-container[rotated] {
+    padding-top: 1px;
+    padding-bottom: 5px;
+}
+
 calendar-event-column {
     background-color: #FFFFFF;
 }
 
 calendar-event-column[orient="horizontal"] {
     border-top: 1px solid #D2D2D2;
 }
 
@@ -106,61 +120,78 @@ calendar-event-column[orient="vertical"]
     position: relative;
 }
 
 calendar-header-container {
     background-color: #FFFFFF;
     border-left: 1px solid #D2D2D2;
 }
 
+calendar-header-container[rotated] {
+    max-width: 150px;
+}
+
 calendar-header-container[weekend="true"],
-.calendar-event-column-linebox[weekend="true"],
+.calendar-event-column-linebox[weekend="true"] {
+    background-color: #F7FFE3;
+}
+
 .calendar-event-column-linebox[off-time="true"] {
-    background-color: #F0F0F0;
+    background-color: #F3F3F3;
+}
+
+.calendar-event-column-linebox[off-time="true"][weekend="true"] {
+    background-color: #EAF7CA;
 }
 
 calendar-header-container[relation="today"],
 .calendar-event-column-linebox[relation="today"],
 calendar-day-label[orient][relation="today"] {
-    background-color: #dfeaf4;
+    background-color: #E1F0FD;
 }
 
 calendar-header-container[relation="today"] {
-    border-left: 1px solid #67ACD8;
-    border-right: 1px solid #67ACD8;
+    border-left: 1px solid #7FB9EE;
+    border-right: 1px solid #7FB9EE;
     -moz-margin-end: -1px;
     position: relative;
 }
 
 calendar-header-container[relation="today"][rotated="true"] {
-    border-top: 1px solid #67ACD8;
-    border-bottom: 1px solid #67ACD8 !important;
+    border-top: 1px solid #7FB9EE;
+    border-bottom: 1px solid #7FB9EE !important;
     border-right: 1px solid #D2D2D2;
     margin-top: -1px;
     position: relative;
 }
 
 calendar-header-container[selected="true"],
 .calendar-event-column-linebox[selected="true"] {
-    background-color: #FFFABC;
+    background-color: #FFFCD8;
 }
 
 calendar-header-container[weekend="true"][relation="today"],
-.calendar-event-column-linebox[weekend="true"][relation="today"],
-.calendar-event-column-linebox[off-time="true"][relation="today"] {
-    background-color: #D4DEE8;
+.calendar-event-column-linebox[weekend="true"][relation="today"] {
+    background-color: #E1F0FD;
 }
 
-.calendar-header-day-box[orient="vertical"] .calendar-event-column-header {
+.calendar-event-column-linebox[off-time="true"][relation="today"] {
+    background-color: #D7E8F8;
+}
+
+.multiday-view-header-day-box[orient="vertical"] .calendar-event-column-header {
     border-bottom: 1px solid #D2D2D2;
     min-width: 100px;
 }
 
 calendar-header-container[weekend="true"][selected="true"],
-.calendar-event-column-linebox[weekend="true"][selected="true"],
+.calendar-event-column-linebox[weekend="true"][selected="true"] {
+    background-color: #FFFCD8;
+}
+
 .calendar-event-column-linebox[off-time="true"][selected="true"] {
     background-color: #F2EDB2;
 }
 
 .calendar-event-column-linebox[orient="horizontal"] {
     border-right: 1px solid #D2D2D2;
 }
 
@@ -173,64 +204,73 @@ calendar-header-container[weekend="true"
 }
 
 .calendar-event-column-linebox[orient="vertical"][relation="today"]:last-child {
     border-bottom: 1px solid #67ACD8;
 }
 
 /* Make sure we extend the bold line separating scrollable and non-scrollable
    areas over the timebar. */
-.calendar-header-time-spacer[orient="horizontal"] {
+.multiday-view-header-time-spacer[orient="horizontal"] {
     border-bottom: 2px solid #D2D2D2;
+    border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors: #FFFFFF #D2D2D2;
 }
 
-.calendar-header-time-spacer[orient="vertical"] {
+.multiday-view-header-time-spacer[orient="vertical"] {
     border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors: #D2D2D2 #D2D2D2;
 }
 
-.calendar-header-day-box[orient="horizontal"] {
+.multiday-view-label-box[orient="horizontal"] > .multiday-view-label-time-spacer {
+    border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors: #FFFFFF #D2D2D2;
+}
+
+.multiday-view-header-day-box[orient="horizontal"] {
     border-right: 1px solid #D2D2D2;
     border-bottom: 2px solid #D2D2D2;
     overflow-x: hidden;
     overflow-y: auto;
     max-height: 120px;
 }
 
-.calendar-header-day-box[orient="horizontal"][todaylastinview="true"] {
+.multiday-view-header-day-box[orient="horizontal"][todaylastinview="true"] {
     border-right: 1px solid #67ACD8;
 }
 
 /* Make sure the box for day-labels appears to end before the scrollbar. */
-.calendar-label-day-box[orient="horizontal"] {
+.multiday-view-label-day-box[orient="horizontal"] {
     border-top: 1px solid #D2D2D2;
     border-right: 1px solid #D2D2D2;
 }
 
-.calendar-label-day-box[orient="vertical"] {
+.multiday-view-label-day-box[orient="vertical"] {
     border-top: 1px solid #D2D2D2;
 }
 
-.calendar-header-day-box[orient="vertical"] {
+.multiday-view-header-day-box[orient="vertical"] {
     border-top: 1px solid #D2D2D2;
     border-right: 2px solid #D2D2D2;
 }
 
 /* Make sure to have a border between the edge of the views and the scrollbar. */
-.calendar-day-box {
+.multiday-view-day-box {
     border-right: 1px solid #D2D2D2;
+    border-bottom: 1px solid #D2D2D2;
 }
 
 .fgdragbox {
     -moz-box-orient: inherit;
     display: none;
 }
 
 .fgdragbox[dragging="true"] {
     display: -moz-box;
-    background-color: blue;
+    background-image: -moz-linear-gradient(top, #fe4b22, #feb822);
     border: 5px #ffffff;
     opacity: 0.5;
 }
 
 .fgdragcontainer {
     -moz-box-orient: inherit;
     display: none;
 }
@@ -272,129 +312,137 @@ calendar-header-container[weekend="true"
 }
 
 .calendar-event-name-textbox {
     background: transparent !important;
     color: inherit;
 }
 
 calendar-event-box {
-    border-left: 1px solid transparent;
-    border-top: 1px solid transparent;
-    border-right: 1px solid transparent;
-    border-bottom: 1px solid #D0D0D0;
+    border: 1px solid transparent;
 }
 
-calendar-event-box[selected="true"] {
-    border-left: 1px solid transparent;
-    border-top: 1px solid white;
-    border-right: 1px solid transparent;
-    border-bottom: 1px solid #727272;
+calendar-month-day-box-item[selected="true"] .calendar-color-box,
+calendar-event-box[selected="true"] .calendar-color-box,
+calendar-editable-item[selected="true"] .calendar-color-box {
+    color: #000000 !important;
+    background-color: #FDF5A0 !important;
+    -moz-box-shadow: 1px 2px 5px rgba(30, 20, 0, 0.6);
 }
 
-calendar-event-box[selected="true"] .calendar-color-box {
-    color: #000000 !important;
-    background-color: #ffdb67 !important;
-}
 
-/* RTL styles for the mainbox and children */
-box[anonid="mainbox"] {
+/* RTL styles for the main box and children */
+.multiday-view-main-box {
     direction: ltr;
 }
 
-.calendar-label-day-box[chromedir="rtl"] {
+.multiday-view-label-day-box[chromedir="rtl"] {
     direction: rtl;
 }
 
 /* headers horizontal, times vertical */
-box[anonid="labelbox"][orient="horizontal"] {
+.multiday-view-label-box[orient="horizontal"] {
     height: 10px;
 }
 
-box[anonid="headerbox"][orient="horizontal"] {
-    min-height: 50px;
+.multiday-view-header-box[orient="horizontal"] {
+    min-height: 30px;
 }
 
-box[anonid="labelbox"][orient="horizontal"] > box[anonid="labeltimespacer"],
-box[anonid="headertimespacer"][orient="horizontal"],
+.multiday-view-label-box[orient="horizontal"] > .multiday-view-label-time-spacer,
+.multiday-view-header-box[orient="horizontal"] > .multiday-view-header-time-spacer,
 calendar-time-bar[orient="vertical"] {
     width: 10ex; /* space for "11:00 AM" */
 }
 
 /* headers vertical, times horizonal */
-box[anonid="labelbox"][orient="vertical"] {
+.view-label-box[orient="vertical"] {
     width: 30px;
 }
 
-box[anonid="headerbox"][orient="vertical"] {
+.view-header-box[orient="vertical"] {
     width: 40px;
 }
 
-box[anonid="labelbox"][orient="vertical"] > box[anonid="labeltimespacer"],
-box[anonid="headertimespacer"][orient="vertical"],
+.multiday-view-label-box[orient="vertical"] > .multiday-view-label-time-spacer,
+.multiday-view-header-box[orient="vertical"] > .multiday-view-header-time-spacer {
+    height: 40px;
+}
+
 calendar-time-bar[orient="horizontal"] {
     height: 40px;
 }
 
+/** Start time bar **/
+
 .calendar-time-bar-label {
     font-size: 1em;
+    margin: 2px 2px;
 }
 
 .calendar-time-bar-box-odd,
 .calendar-time-bar-box-even {
     color: #6A6969;
     background-color: #FFFFFF;
     text-align: right;
     overflow: hidden;
 }
 
 .calendar-time-bar-box-odd[off-time="true"] ,
 .calendar-time-bar-box-even[off-time="true"] {
     background-color: #F0F0F0;
-    border-right: 3px double #D2D2D2;
+    border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors:  #FFFFFF #D2D2D2;
 }
 
-
 .calendar-time-bar-box-odd[orient="horizontal"],
 .calendar-time-bar-box-even[orient="horizontal"] {
     border-right: 1px solid #D2D2D2;
     border-top: 1px solid #D2D2D2;
 
 }
 
 .calendar-time-bar-box-odd[orient="vertical"],
 .calendar-time-bar-box-even[orient="vertical"] {
     border-bottom: 1px  transparent !important;
-    border-right: 3px double #D2D2D2;
+    border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors:  #FFFFFF #D2D2D2;
 }
 
+/** End time bar **/
+
 calendar-multiday-view {
     background-color: #FFFFFF;
     padding: 0px;
 }
 
 calendar-multiday-view[hidden="true"] {
     display: none;
 }
 
 calendar-day-label {
     color: #000000;
     background-color: white;
-    background-image: url("chrome://calendar/skin/calendar-day-label-back.png");
+    background-image: -moz-linear-gradient(top, #fafafa, #eeeeee);
     border-left: 1px solid #D2D2D2;
     border-bottom: 1px solid #D2D2D2;
 }
 
 calendar-day-label[selected="true"] {
     background-color: #FFFABC !important;
 }
 
 calendar-day-label[orient="vertical"] {
-    background-color: white;
-    min-width: 110px;
+    background-image: none;
+    min-width: 100px;
+}
+
+calendar-day-label[orient="vertical"][relation="today"],
+calendar-day-label[orient="vertical"][relation="today1day"] {
+    background-color: #D2E3F3 !important;
 }
 
 calendar-day-label[relation="today"],
 calendar-day-label[relation="today1day"] {
     border: 1px solid #67ACD8;
     -moz-margin-end: -1px;
     margin-top: -1px;
     position: relative;
@@ -439,116 +487,106 @@ calendar-month-day-box {
 
 .calendar-month-day-box-current-month {
     background-color: #FFFFFF;
 }
 .calendar-month-day-box-current-month .calendar-month-day-box-date-label {
     background-color: #F7F7F7;
 }
 .calendar-month-day-box-day-off {
-    background-color: #EFEFEF;
+    background-color: #F7FFE3;
 }
 .calendar-month-day-box-day-off .calendar-month-day-box-date-label {
-    background-color: #E7E7E7;
+    background-color: #EAF7CA;
 }
 .calendar-month-day-box-other-month {
-    background-color: #DFDFDF;
+    background-color: #F3F3F3;
 }
 .calendar-month-day-box-other-month .calendar-month-day-box-date-label {
-    background-color: #D7D7D7;
+    background-color: #E8E8E8;
+}
+
+.calendar-month-day-box-other-month.calendar-month-day-box-day-off {
+    background-color: #E8E8E8;
+}
+
+.calendar-month-day-box-other-month.calendar-month-day-box-day-off .calendar-month-day-box-date-label {
+    background-color: #DDDDDD;
 }
 
 .calendar-month-day-box-current-month[relation="today"],
 .calendar-month-day-box-day-off[relation="today"],
 .calendar-month-day-box-other-month[relation="today"] {
-    background-color: #dfeaf4;
-    border: 1px solid #67ACD8 !important;
+    background-color: #E1F0FD;
+    border: 1px solid #7FB9EE !important;
     -moz-margin-end: -1px !important;
     margin-top: -1px !important;
     position: relative;
 }
 
 .calendar-month-day-box-date-label[relation="today"] {
-    background-color: #d7e2ec;
+    background-color: #D2E3F3;
     font-weight: bold;
 }
 
 .calendar-month-day-box-current-month[selected="true"],
 .calendar-month-day-box-day-off[selected="true"],
 .calendar-month-day-box-other-month[selected="true"] {
-    background-color: #FFFABC;
+    background-color: #FFFCD8;
 }
 
 .calendar-month-day-box-date-label[selected="true"] {
     background-color: #F2EDB2;
 }
 
 .calendar-month-day-box-date-label[relation="today"][selected="true"] {
-    background-color: #F2EDB2;
+    background-color: #D2E3F3;
 }
 
 .calendar-month-day-box-date-label {
     color: #616163;
     font-size: 0.9em;
     text-align: right;
     margin: 0px;
     padding-top: 1px;
     -moz-padding-end: 2px;
     padding-bottom: 1px;
 }
 
 calendar-month-day-box-item {
     margin: 1px;
-    padding: 0px 1px;
-}
-
-calendar-month-day-box-item[selected="true"] .calendar-color-box {
-    color: #000000 !important;
-    background-color: #ffdb67 !important;
+    padding: 1px 1px;
 }
 
 .calendar-color-box {
     /* This rule should be adopted if the alarm image size is changed */
     min-height: 13px;
+    background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.25), rgba(255, 255, 255, 0.01) 50%, rgba(0, 0, 0, 0.05))
 }
 
 .calendar-month-day-box-item-label {
     padding: 0px;
     margin: 0px;
 }
 
 .calendar-month-day-box-item-label[time="true"] {
     -moz-margin-end: 4px;
 }
 
 .labeldaybox-container {
     border-right: 1px solid #D2D2D2;
     border-top: 1px solid #D2D2D2;
 }
 
-calendar-editable-item[selected="true"] .calendar-event-selection {
-    color: #000000 !important;
-    background-color: #ffdb67 !important;
-}
-
 .dropshadow {
-    background-color: blue !important;
     height: 1.2em;
     margin: 1px;
     padding: 0px 1px;
-    opacity: 0.5;
-}
-
-.calendar-event-box-gradient {
-    list-style-image: url("chrome://calendar/skin/gradient-overlay.png");
-}
-
-.calendar-category-box-gradient {
-    list-style-image: url("chrome://calendar/skin/category-overlay.png");
-    width: 7px;
+    background-color: #FFA47D;
+    -moz-box-shadow: 1px 1px 3px rgba(68, 35, 0, 0.7) inset;
 }
 
 calendar-event-gripbar {
     -moz-box-align: center;
     -moz-box-pack: center;
     min-height: 4px;
     min-width: 4px;
     overflow: hidden;
@@ -703,21 +741,16 @@ agenda-richlist-item[status="CANCELLED"]
 
 /* Navigation controls for the views */
 #calendar-nav-control {
     background-color: #E8E8E8;
     border: solid ThreeDShadow;
     border-width: 1px 0 0 1px;
 }
 
-#today-view-button {
-    padding-bottom: 0;
-    margin-bottom: 0;
-}
-
 #view-deck {
     background-color: white;
     border: solid ThreeDShadow;
     border-width: 0 0 0 1px;
 }
 
 .tabs-left,
 .tabs-right {
@@ -734,17 +767,16 @@ agenda-richlist-item[status="CANCELLED"]
 
 .calview-tabs {
     margin-bottom: 0;
     padding: 0;
 }
 
 tab[calview] {
     -moz-appearance: none;
-    background-image: url("chrome://calendar/skin/calendar-day-label-back-vertical.png");
     background-color: #CCCCCC;
     color: #2E4E73;
     border: 1px solid #BDBDBD;
     border-bottom: 1px solid #D2D2D2;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;  
     margin-top: 0px;
     -moz-user-focus: normal;  
@@ -775,51 +807,58 @@ tab[calview] > .tab-middle {
     margin-top: 3px;
 }
 
 .view-header[type="end"] {
     text-align: right;
     -moz-margin-end: 6px;
 }
 
+#calendarWeek {
+    margin-top: 3px;
+    margin-bottom: 1px;
+}
+
 .navigation-inner-box {
     -moz-padding-start: 6px;
     -moz-padding-end: 6px;
     border-bottom: 1px solid #D2D2D2;
     padding-bottom: 1px;
 }
+
 .navigation-bottombox {
     min-height: 4px;
     max-height: 4px;
     background-color: white;
 }
 
 .view-navigation-button {
-    -moz-user-focus: normal;      
+    -moz-user-focus: normal;
     -moz-appearance: toolbarbutton;
     margin-top: 3px;
     -moz-margin-start: 3px;
     -moz-margin-end: 3px;
     margin-bottom: 1px;
+    min-width: 22px;
 }
 
 .today-navigation-button {
     -moz-user-focus: normal;      
     -moz-appearance: toolbarbutton;
     margin-top: 2px;
     -moz-margin-start: 2px;
     -moz-margin-end: 2px;
     margin-bottom: 0px;
     color: #2E4E73;
     font-size: 14px;
 }
 
 .view-navigation-button > .toolbarbutton-text {
-  display: none;
+    display: none;
 }
 
 .view-navigation-button > .toolbarbutton-icon {
-  margin: 1px;
+    margin: 1px;
 }
 
 .today-navigation-button > .toolbarbutton-icon {
-  display: none;
+    display: none;
 }
--- a/calendar/base/themes/pinstripe/today-pane.css
+++ b/calendar/base/themes/pinstripe/today-pane.css
@@ -220,18 +220,18 @@ agenda-allday-richlist-item {
 
 .agenda-container-box[selected="true"],
 .agenda-allday-container-box[selected="true"],
 .agenda-checkbox[selected="true"],
 .agenda-container-box[selected="true"][current="true"],
 .agenda-allday-container-box[selected="true"][current="true"],
 .agenda-checkbox[selected="true"][current="true"] {
   background-image: url("chrome://mozapps/skin/extensions/itemEnabledFader.png");
-  background-color: Highlight;
-  color: HighlightText;
+  background-color: #FDF5A0;
+  color: #000000;
 }
 
 .agenda-container-box[current="true"],
 .agenda-alldaycontainer-box[current="true"],
 .agenda-checkbox[current="true"],
 .agenda-container-box[selected="true"][current="true"][disabled="true"],
 .agenda-allday-container-box[selected="true"][current="true"][disabled="true"],
 .agenda-checkbox[selected="true"][current="true"][disabled="true"] {
--- a/calendar/base/themes/winstripe/calendar-views.css
+++ b/calendar/base/themes/winstripe/calendar-views.css
@@ -43,16 +43,22 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 /* Core */
 calendar-category-box:not([categories]) {
   display: none;
 }
 
+.calendar-category-box-gradient {
+    width: 7px;
+    background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.38), transparent) !important;
+    border-left: 1px solid rgba(255, 255, 255, 0.38);
+}
+
 .calendar-item-image {
     list-style-image: url(chrome://calendar/skin/day-box-item-image.png);
     padding-top: 2px;
     padding-bottom: 2px;
     -moz-margin-end: 4px;
     display: none;
 }
 
@@ -61,30 +67,38 @@ calendar-category-box:not([categories]) 
     display: -moz-box;
 }
 
 .calendar-item-image[itemType="todo"][progress="completed"] {
     -moz-image-region: rect(0px 22px 11px 11px);
 }
 
 /* Multiday view */
-box[anonid="daybox"] {
-    border-bottom: 1px solid #D2D2D2;
-}
 
 /* Margin that allows event creation by click and drag when the time slot is
    full of events. On the right side in normal view ... */
-stack[anonid="boxstack"] > box[anonid="topbox"][orient="horizontal"] {
+.multiday-column-box-stack > .multiday-column-top-box[orient="horizontal"] {
     -moz-margin-end: 5px;
 }
 /* ... and on bottom in rotate view. */
-stack[anonid="boxstack"] > box[anonid="topbox"][orient="vertical"] {
+.multiday-column-box-stack > .multiday-column-top-box[orient="vertical"] {
     margin-bottom: 5px;
 }
 
+/* .. and on the right side in the header container in normal view */
+calendar-header-container:not([rotated]) {
+    padding-right: 6px;
+    padding-left: 1px;
+}
+/* ... and on the bottom in rotated view. */
+calendar-header-container[rotated] {
+    padding-top: 1px;
+    padding-bottom: 5px;
+}
+
 calendar-event-column {
     background-color: #FFFFFF;
 }
 
 calendar-event-column[orient="horizontal"] {
     border-top: 1px solid #D2D2D2;
 }
 
@@ -106,61 +120,78 @@ calendar-event-column[orient="vertical"]
     position: relative;
 }
 
 calendar-header-container {
     background-color: #FFFFFF;
     border-left: 1px solid #D2D2D2;
 }
 
+calendar-header-container[rotated] {
+    max-width: 150px;
+}
+
 calendar-header-container[weekend="true"],
-.calendar-event-column-linebox[weekend="true"],
+.calendar-event-column-linebox[weekend="true"] {
+    background-color: #F7FFE3;
+}
+
 .calendar-event-column-linebox[off-time="true"] {
-    background-color: #F0F0F0;
+    background-color: #F3F3F3;
+}
+
+.calendar-event-column-linebox[off-time="true"][weekend="true"] {
+    background-color: #EAF7CA;
 }
 
 calendar-header-container[relation="today"],
 .calendar-event-column-linebox[relation="today"],
 calendar-day-label[orient][relation="today"] {
-    background-color: #dfeaf4;
+    background-color: #E1F0FD;
 }
 
 calendar-header-container[relation="today"] {
-    border-left: 1px solid #67ACD8;
-    border-right: 1px solid #67ACD8;
+    border-left: 1px solid #7FB9EE;
+    border-right: 1px solid #7FB9EE;
     -moz-margin-end: -1px;
     position: relative;
 }
 
 calendar-header-container[relation="today"][rotated="true"] {
-    border-top: 1px solid #67ACD8;
-    border-bottom: 1px solid #67ACD8 !important;
+    border-top: 1px solid #7FB9EE;
+    border-bottom: 1px solid #7FB9EE !important;
     border-right: 1px solid #D2D2D2;
     margin-top: -1px;
     position: relative;
 }
 
 calendar-header-container[selected="true"],
 .calendar-event-column-linebox[selected="true"] {
-    background-color: #FFFABC;
+    background-color: #FFFCD8;
 }
 
 calendar-header-container[weekend="true"][relation="today"],
-.calendar-event-column-linebox[weekend="true"][relation="today"],
-.calendar-event-column-linebox[off-time="true"][relation="today"] {
-    background-color: #D4DEE8;
+.calendar-event-column-linebox[weekend="true"][relation="today"] {
+    background-color: #E1F0FD;
 }
 
-.calendar-header-day-box[orient="vertical"] .calendar-event-column-header {
+.calendar-event-column-linebox[off-time="true"][relation="today"] {
+    background-color: #D7E8F8;
+}
+
+.multiday-view-header-day-box[orient="vertical"] .calendar-event-column-header {
     border-bottom: 1px solid #D2D2D2;
     min-width: 100px;
 }
 
 calendar-header-container[weekend="true"][selected="true"],
-.calendar-event-column-linebox[weekend="true"][selected="true"],
+.calendar-event-column-linebox[weekend="true"][selected="true"] {
+    background-color: #FFFCD8;
+}
+
 .calendar-event-column-linebox[off-time="true"][selected="true"] {
     background-color: #F2EDB2;
 }
 
 .calendar-event-column-linebox[orient="horizontal"] {
     border-right: 1px solid #D2D2D2;
 }
 
@@ -173,64 +204,73 @@ calendar-header-container[weekend="true"
 }
 
 .calendar-event-column-linebox[orient="vertical"][relation="today"]:last-child {
     border-bottom: 1px solid #67ACD8;
 }
 
 /* Make sure we extend the bold line separating scrollable and non-scrollable
    areas over the timebar. */
-.calendar-header-time-spacer[orient="horizontal"] {
+.multiday-view-header-time-spacer[orient="horizontal"] {
     border-bottom: 2px solid #D2D2D2;
+    border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors: #FFFFFF #D2D2D2;
 }
 
-.calendar-header-time-spacer[orient="vertical"] {
+.multiday-view-header-time-spacer[orient="vertical"] {
     border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors: #D2D2D2 #D2D2D2;
 }
 
-.calendar-header-day-box[orient="horizontal"] {
+.multiday-view-label-box[orient="horizontal"] > .multiday-view-label-time-spacer {
+    border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors: #FFFFFF #D2D2D2;
+}
+
+.multiday-view-header-day-box[orient="horizontal"] {
     border-right: 1px solid #D2D2D2;
     border-bottom: 2px solid #D2D2D2;
     overflow-x: hidden;
     overflow-y: auto;
     max-height: 120px;
 }
 
-.calendar-header-day-box[orient="horizontal"][todaylastinview="true"] {
+.multiday-view-header-day-box[orient="horizontal"][todaylastinview="true"] {
     border-right: 1px solid #67ACD8;
 }
 
 /* Make sure the box for day-labels appears to end before the scrollbar. */
-.calendar-label-day-box[orient="horizontal"] {
+.multiday-view-label-day-box[orient="horizontal"] {
     border-top: 1px solid #D2D2D2;
     border-right: 1px solid #D2D2D2;
 }
 
-.calendar-label-day-box[orient="vertical"] {
+.multiday-view-label-day-box[orient="vertical"] {
     border-top: 1px solid #D2D2D2;
 }
 
-.calendar-header-day-box[orient="vertical"] {
+.multiday-view-header-day-box[orient="vertical"] {
     border-top: 1px solid #D2D2D2;
     border-right: 2px solid #D2D2D2;
 }
 
 /* Make sure to have a border between the edge of the views and the scrollbar. */
-.calendar-day-box {
+.multiday-view-day-box {
     border-right: 1px solid #D2D2D2;
+    border-bottom: 1px solid #D2D2D2;
 }
 
 .fgdragbox {
     -moz-box-orient: inherit;
     display: none;
 }
 
 .fgdragbox[dragging="true"] {
     display: -moz-box;
-    background-color: blue;
+    background-image: -moz-linear-gradient(top, #fe4b22, #feb822);
     border: 5px #ffffff;
     opacity: 0.5;
 }
 
 .fgdragcontainer {
     -moz-box-orient: inherit;
     display: none;
 }
@@ -272,129 +312,136 @@ calendar-header-container[weekend="true"
 }
 
 .calendar-event-name-textbox {
     background: transparent !important;
     color: inherit;
 }
 
 calendar-event-box {
-    border-left: 1px solid transparent;
-    border-top: 1px solid transparent;
-    border-right: 1px solid transparent;
-    border-bottom: 1px solid #D0D0D0;
+    border: 1px solid transparent;
 }
 
-calendar-event-box[selected="true"] {
-    border-left: 1px solid transparent;
-    border-top: 1px solid white;
-    border-right: 1px solid transparent;
-    border-bottom: 1px solid #727272;
+calendar-month-day-box-item[selected="true"] .calendar-color-box,
+calendar-event-box[selected="true"] .calendar-color-box,
+calendar-editable-item[selected="true"] .calendar-color-box {
+    color: #000000 !important;
+    background-color: #FDF5A0 !important;
+    -moz-box-shadow: 1px 2px 5px rgba(30, 20, 0, 0.6);
 }
 
-calendar-event-box[selected="true"] .calendar-color-box {
-    color: #000000 !important;
-    background-color: #ffdb67 !important;
-}
 
-/* RTL styles for the mainbox and children */
-box[anonid="mainbox"] {
+/* RTL styles for the main box and children */
+.multiday-view-main-box {
     direction: ltr;
 }
 
-.calendar-label-day-box[chromedir="rtl"] {
+.multiday-view-label-day-box[chromedir="rtl"] {
     direction: rtl;
 }
 
 /* headers horizontal, times vertical */
-box[anonid="labelbox"][orient="horizontal"] {
+.multiday-view-label-box[orient="horizontal"] {
     height: 10px;
 }
 
-box[anonid="headerbox"][orient="horizontal"] {
-    min-height: 50px;
+.multiday-view-header-box[orient="horizontal"] {
+    min-height: 30px;
 }
 
-box[anonid="labelbox"][orient="horizontal"] > box[anonid="labeltimespacer"],
-box[anonid="headertimespacer"][orient="horizontal"],
+.multiday-view-label-box[orient="horizontal"] > .multiday-view-label-time-spacer,
+.multiday-view-header-box[orient="horizontal"] > .multiday-view-header-time-spacer,
 calendar-time-bar[orient="vertical"] {
     width: 10ex; /* space for "11:00 AM" */
 }
 
 /* headers vertical, times horizonal */
-box[anonid="labelbox"][orient="vertical"] {
+.view-label-box[orient="vertical"] {
     width: 30px;
 }
 
-box[anonid="headerbox"][orient="vertical"] {
+.view-header-box[orient="vertical"] {
     width: 40px;
 }
 
-box[anonid="labelbox"][orient="vertical"] > box[anonid="labeltimespacer"],
-box[anonid="headertimespacer"][orient="vertical"],
+.multiday-view-label-box[orient="vertical"] > .multiday-view-label-time-spacer,
+.multiday-view-header-box[orient="vertical"] > .multiday-view-header-time-spacer {
+    height: 40px;
+}
+
 calendar-time-bar[orient="horizontal"] {
     height: 40px;
 }
 
+/** Start time bar **/
+
 .calendar-time-bar-label {
     font-size: 1em;
 }
 
 .calendar-time-bar-box-odd,
 .calendar-time-bar-box-even {
     color: #6A6969;
     background-color: #FFFFFF;
     text-align: right;
     overflow: hidden;
 }
 
 .calendar-time-bar-box-odd[off-time="true"] ,
 .calendar-time-bar-box-even[off-time="true"] {
     background-color: #F0F0F0;
-    border-right: 3px double #D2D2D2;
+    border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors:  #FFFFFF #D2D2D2;
 }
 
-
 .calendar-time-bar-box-odd[orient="horizontal"],
 .calendar-time-bar-box-even[orient="horizontal"] {
     border-right: 1px solid #D2D2D2;
     border-top: 1px solid #D2D2D2;
 
 }
 
 .calendar-time-bar-box-odd[orient="vertical"],
 .calendar-time-bar-box-even[orient="vertical"] {
     border-bottom: 1px  transparent !important;
-    border-right: 3px double #D2D2D2;
+    border-right: 2px solid #D2D2D2;
+    -moz-border-right-colors:  #FFFFFF #D2D2D2;
 }
 
+/** End time bar **/
+
 calendar-multiday-view {
     background-color: #FFFFFF;
     padding: 0px;
 }
 
 calendar-multiday-view[hidden="true"] {
     display: none;
 }
 
 calendar-day-label {
     color: #000000;
     background-color: white;
-    background-image: url("chrome://calendar/skin/calendar-day-label-back.png");
+    background-image: -moz-linear-gradient(top, #fafafa, #eeeeee);
     border-left: 1px solid #D2D2D2;
     border-bottom: 1px solid #D2D2D2;
 }
 
 calendar-day-label[selected="true"] {
     background-color: #FFFABC !important;
 }
 
 calendar-day-label[orient="vertical"] {
-    background-image: url("chrome://calendar/skin/calendar-day-label-back-vertical.png");
-    min-width: 110px;
+    background-image: none;
+    min-width: 100px;
+}
+
+calendar-day-label[orient="vertical"][relation="today"],
+calendar-day-label[orient="vertical"][relation="today1day"] {
+    background-color: #D2E3F3 !important;
 }
 
 calendar-day-label[relation="today"],
 calendar-day-label[relation="today1day"] {
     border: 1px solid #67ACD8;
     -moz-margin-end: -1px;
     margin-top: -1px;
     position: relative;
@@ -439,116 +486,106 @@ calendar-month-day-box {
 
 .calendar-month-day-box-current-month {
     background-color: #FFFFFF;
 }
 .calendar-month-day-box-current-month .calendar-month-day-box-date-label {
     background-color: #F7F7F7;
 }
 .calendar-month-day-box-day-off {
-    background-color: #EFEFEF;
+    background-color: #F7FFE3;
 }
 .calendar-month-day-box-day-off .calendar-month-day-box-date-label {
-    background-color: #E7E7E7;
+    background-color: #EAF7CA;
 }
 .calendar-month-day-box-other-month {
-    background-color: #DFDFDF;
+    background-color: #F3F3F3;
 }
 .calendar-month-day-box-other-month .calendar-month-day-box-date-label {
-    background-color: #D7D7D7;
+    background-color: #E8E8E8;
+}
+
+.calendar-month-day-box-other-month.calendar-month-day-box-day-off {
+    background-color: #E8E8E8;
+}
+
+.calendar-month-day-box-other-month.calendar-month-day-box-day-off .calendar-month-day-box-date-label {
+    background-color: #DDDDDD;
 }
 
 .calendar-month-day-box-current-month[relation="today"],
 .calendar-month-day-box-day-off[relation="today"],
 .calendar-month-day-box-other-month[relation="today"] {
-    background-color: #dfeaf4;
-    border: 1px solid #67ACD8 !important;
+    background-color: #E1F0FD;
+    border: 1px solid #7FB9EE !important;
     -moz-margin-end: -1px !important;
     margin-top: -1px !important;
     position: relative;
 }
 
 .calendar-month-day-box-date-label[relation="today"] {
-    background-color: #d7e2ec;
+    background-color: #D2E3F3;
     font-weight: bold;
 }
 
 .calendar-month-day-box-current-month[selected="true"],
 .calendar-month-day-box-day-off[selected="true"],
 .calendar-month-day-box-other-month[selected="true"] {
-    background-color: #FFFABC;
+    background-color: #FFFCD8;
 }
 
 .calendar-month-day-box-date-label[selected="true"] {
     background-color: #F2EDB2;
 }
 
 .calendar-month-day-box-date-label[relation="today"][selected="true"] {
-    background-color: #F2EDB2;
+    background-color: #D2E3F3;
 }
 
 .calendar-month-day-box-date-label {
     color: #616163;
     font-size: 0.9em;
     text-align: right;
     margin: 0px;
     padding-top: 1px;
     -moz-padding-end: 2px;
     padding-bottom: 1px;
 }
 
 calendar-month-day-box-item {
     margin: 1px;
-    padding: 0px 1px;
-}
-
-calendar-month-day-box-item[selected="true"] .calendar-color-box {
-    color: #000000 !important;
-    background-color: #ffdb67 !important;
+    padding: 1px 1px;
 }
 
 .calendar-color-box {
     /* This rule should be adopted if the alarm image size is changed */
     min-height: 13px;
+    background-image: -moz-linear-gradient(top, rgba(255, 255, 255, 0.25), rgba(255, 255, 255, 0.01) 50%, rgba(0, 0, 0, 0.05))
 }
 
 .calendar-month-day-box-item-label {
     padding: 0px;
     margin: 0px;
 }
 
 .calendar-month-day-box-item-label[time="true"] {
     -moz-margin-end: 4px;
 }
 
 .labeldaybox-container {
     border-right: 1px solid #D2D2D2;
     border-top: 1px solid #D2D2D2;
 }
 
-calendar-editable-item[selected="true"] .calendar-event-selection {
-    color: #000000 !important;
-    background-color: #ffdb67 !important;
-}
-
 .dropshadow {
-    background-color: blue !important;
     height: 1.2em;
     margin: 1px;
     padding: 0px 1px;
-    opacity: 0.5;
-}
-
-.calendar-event-box-gradient {
-    list-style-image: url("chrome://calendar/skin/gradient-overlay.png");
-}
-
-.calendar-category-box-gradient {
-    list-style-image: url("chrome://calendar/skin/category-overlay.png");
-    width: 7px;
+    background-color: #FFA47D;
+    -moz-box-shadow: 1px 1px 3px rgba(68, 35, 0, 0.7) inset;
 }
 
 calendar-event-gripbar {
     -moz-box-align: center;
     -moz-box-pack: center;
     min-height: 4px;
     min-width: 4px;
     overflow: hidden;
@@ -712,17 +749,16 @@ agenda-richlist-item[status="CANCELLED"]
 #view-deck {
     background-color: white;
     border: solid ThreeDShadow;
     border-width: 0 0 0 1px;
 }
 
 tab[calview] {
     -moz-appearance: none;
-    background-image: url("chrome://calendar/skin/calendar-day-label-back-vertical.png");
     background-color: #CCCCCC;
     color: #2E4E73;
     border: 1px solid #BDBDBD;
     border-top-left-radius: 4px;
     border-top-right-radius: 4px;  
     border-bottom-left-radius: 0px;
     border-bottom-right-radius: 0px;
     font-size: 14px;
@@ -751,16 +787,21 @@ tab[calview] > .tab-middle {
     color: #2E4E73;
 }
 
 .view-header[type="end"] {
     text-align: right;
     -moz-margin-end: 6px;
 }
 
+#calendarWeek {
+    margin-top: 4px;
+    margin-bottom: 0px;
+}
+
 .navigation-inner-box {
     -moz-padding-start: 6px;
     -moz-padding-end: 6px;
     border-bottom: 1px solid #D2D2D2;
     padding-bottom: 1px;
 }
 
 .navigation-bottombox {
--- a/calendar/base/themes/winstripe/today-pane.css
+++ b/calendar/base/themes/winstripe/today-pane.css
@@ -223,18 +223,18 @@ agenda-allday-richlist-item {
 
 .agenda-container-box[selected="true"],
 .agenda-allday-container-box[selected="true"],
 .agenda-checkbox[selected="true"],
 .agenda-container-box[selected="true"][current="true"],
 .agenda-allday-container-box[selected="true"][current="true"],
 .agenda-checkbox[selected="true"][current="true"] {
   background-image: url("chrome://mozapps/skin/extensions/itemEnabledFader.png");
-  background-color: Highlight;
-  color: HighlightText;
+  background-color: #FDF5A0;
+  color: #000000;
 }
 
 .agenda-container-box[current="true"],
 .agenda-alldaycontainer-box[current="true"],
 .agenda-checkbox[current="true"],
 .agenda-container-box[selected="true"][current="true"][disabled="true"],
 .agenda-allday-container-box[selected="true"][current="true"][disabled="true"],
 .agenda-checkbox[selected="true"][current="true"][disabled="true"] {
--- a/calendar/locales/en-US/chrome/calendar/calendar.properties
+++ b/calendar/locales/en-US/chrome/calendar/calendar.properties
@@ -466,19 +466,19 @@ errorWriting=An error occurred when writ
 #    %1$S will be replaced with the name of a calendar
 tooltipCalendarDisabled=The calendar %1$S is momentarily not available
 
 # LOCALIZATION NOTE (tooltipCalendarReadOnly):
 # used for an message like 'The calendar Home is readonly'
 #    %1$S will be replaced with the name of a calendar
 tooltipCalendarReadOnly=The calendar %1$S is readonly
 
-taskEditInstructions=Click Here to Add a New Task
-taskEditInstructionsReadonly=Please Select a Writable Calendar
-taskEditInstructionsCapability=Please Select a Calendar that Supports Tasks
+taskEditInstructions=Click here to add a new task
+taskEditInstructionsReadonly=Please select a writable calendar
+taskEditInstructionsCapability=Please select a calendar that supports tasks
 
 eventDetailsStartDate=Start:
 eventDetailsEndDate=End:
 
 # LOCALIZATION NOTE (datetimeWithTimezone):
 # used for a display of a date-time with timezone 'Thu 2 Oct 2008 13:21', Europe/Paris
 #    %1$S will be replaced with the completion date-time
 #    %2$S will be replaced with the name of the timezone