Bug 1172582 - Remove usage of win-classic and win-aero. r=philipp
authorRichard Marti <richard.marti@gmail.com>
Tue, 21 Apr 2015 13:03:58 +0200
changeset 18099 7769a3035556be27425b99bc052372efd2bc9b51
parent 18098 89e2a4ab8cd9b9eb4192a00c1aff5058e3acf01a
child 18100 572e71f97c22469ec5a5de783c92105b8dbb9491
push id11122
push usermozilla@kewis.ch
push dateThu, 16 Jul 2015 12:16:38 +0000
treeherdercomm-central@572e71f97c22 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp
bugs1172582
Bug 1172582 - Remove usage of win-classic and win-aero. r=philipp
calendar/base/content/dialogs/calendar-occurrence-prompt.xul
calendar/base/jar.mn
calendar/base/themes/common/calendar-occurrence-prompt.css
calendar/base/themes/windows/calendar-task-view.css
calendar/base/themes/windows/calendar-unifinder.css
calendar/base/themes/windows/calendar-views.css
calendar/base/themes/windows/today-pane.css
calendar/base/themes/windows/win-aero/calendar-event-dialog.css
calendar/base/themes/windows/win-aero/calendar.css
calendar/base/themes/windows/win-aero/lightning-toolbar.css
calendar/base/themes/windows/win-aero/lightning.css
calendar/base/themes/windows/win-classic/calendar-event-dialog.css
calendar/base/themes/windows/win-classic/calendar.css
calendar/base/themes/windows/win-classic/lightning-toolbar.css
calendar/base/themes/windows/win-classic/lightning.css
calendar/lightning/themes/windows/lightning.css
--- a/calendar/base/content/dialogs/calendar-occurrence-prompt.xul
+++ b/calendar/base/content/dialogs/calendar-occurrence-prompt.xul
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/calendar-occurrence-prompt.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar-common/skin/calendar-occurrence-prompt.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://calendar/locale/calendar-occurrence-prompt.dtd">
 
 <dialog id="calendar-occurrence-prompt"
         buttons="accept,cancel"
         windowtype="Calendar:OccurrencePrompt"
         ondialogcancel="return exitOccurrenceDialog(0)"
         ondialogaccept="exitOccurrenceDialog(1)"
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -102,18 +102,16 @@ calendar.jar:
     content/calendar/calApplicationUtils.js                (src/calApplicationUtils.js)
     content/calendar/calUtils.js                           (src/calUtils.js)
     content/calendar/calFilter.js                          (src/calFilter.js)
     content/calendar/WindowsNTToZoneInfoTZId.properties    (src/WindowsNTToZoneInfoTZId.properties)
 % skin calendar classic/1.0 chrome/skin/linux/calendar/
 % skin calendar classic/1.0 chrome/skin/osx/calendar/ os=Darwin
 % skin calendar classic/1.0 chrome/skin/windows/calendar/ os=WINNT
 % skin calendar-common classic/1.0 chrome/skin/common/
-% skin calendar-windows classic/1.0 chrome/skin/windows/calendar/win-classic/ os=WINNT osversion<6
-% skin calendar-windows classic/1.0 chrome/skin/windows/calendar/win-aero/ os=WINNT osversion>=6
 % style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar-task-view.css
 % style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar-event-dialog.css
 % style chrome://calendar/content/calendar-event-dialog.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css
 % style chrome://calendar/content/calendar-event-dialog-attendees.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css
     ../skin/common/alarm-flashing.png                 (themes/common/images/alarm-flashing.png)
     ../skin/common/alarm-icons.png                    (themes/common/images/alarm-icons.png)
     ../skin/common/attendee-icons.png                 (themes/common/images/attendee-icons.png)
     ../skin/common/calendar-overlay.png               (themes/common/images/calendar-overlay.png)
@@ -131,32 +129,32 @@ calendar.jar:
     ../skin/common/widgets/nav-arrow.svg              (themes/common/widgets/images/nav-arrow.svg)
     ../skin/common/widgets/nav-today.svg              (themes/common/widgets/images/nav-today.svg)
     ../skin/common/widgets/nav-today-hov.svg          (themes/common/widgets/images/nav-today-hov.svg)
     ../skin/common/widgets/view-navigation.svg        (themes/common/widgets/images/view-navigation.svg)
     ../skin/common/widgets/view-navigation-hov.svg    (themes/common/widgets/images/view-navigation-hov.svg)
     ../skin/common/widgets/drag-center.svg            (themes/common/widgets/images/drag-center.svg)
     ../skin/common/calendar-daypicker.css             (themes/common/calendar-daypicker.css)
     ../skin/common/calendar-management.css            (themes/common/calendar-management.css)
+    ../skin/common/calendar-occurrence-prompt.css     (themes/common/calendar-occurrence-prompt.css)
     ../skin/common/calendar-task-tree.css             (themes/common/calendar-task-tree.css)
     ../skin/common/calendar-task-view.css             (themes/common/calendar-task-view.css)
     ../skin/common/calendar-toolbar.svg               (themes/common/calendar-toolbar.svg)
     ../skin/common/calendar-unifinder.css             (themes/common/calendar-unifinder.css)
     ../skin/common/calendar-views.css                 (themes/common/calendar-views.css)
     ../skin/common/today-pane.css                     (themes/common/today-pane.css)
     ../skin/common/dialogs/calendar-alarm-dialog.css  (themes/common/dialogs/calendar-alarm-dialog.css)
     ../skin/common/dialogs/calendar-event-dialog.css  (themes/common/dialogs/calendar-event-dialog.css)
     ../skin/common/widgets/calendar-widgets.css       (themes/common/widgets/calendar-widgets.css)
     ../skin/common/widgets/minimonth.css              (themes/common/widgets/minimonth.css)
 
 # Linux theme files
     ../skin/linux/calendar/calendar-alarms.css                            (themes/common/calendar-alarms.css)
     ../skin/linux/calendar/calendar-attendees.css                         (themes/common/calendar-attendees.css)
     ../skin/linux/calendar/calendar-creation-wizard.css                   (themes/common/calendar-creation-wizard.css)
-    ../skin/linux/calendar/calendar-occurrence-prompt.css                 (themes/common/calendar-occurrence-prompt.css)
     ../skin/linux/calendar/calendar-timezone-highlighter.css              (themes/common/dialogs/calendar-timezone-highlighter.css)
     ../skin/linux/calendar/calendar-properties-dialog.css                 (themes/common/dialogs/calendar-properties-dialog.css)
     ../skin/linux/calendar/calendar-subscriptions-dialog.css              (themes/common/dialogs/calendar-subscriptions-dialog.css)
     ../skin/linux/calendar/calendar-providerUninstall-dialog.css          (themes/common/calendar-providerUninstall-dialog.css)
     ../skin/linux/calendar/calendar-printing.css                          (themes/common/calendar-printing.css)
     ../skin/linux/calendar/cal-icon32.png                                 (themes/linux/images/cal-icon32.png)
     ../skin/linux/calendar/cal-icon24.png                                 (themes/linux/images/cal-icon24.png)
     ../skin/linux/calendar/calendar-alarm-dialog.css                      (themes/linux/dialogs/calendar-alarm-dialog.css)
@@ -177,17 +175,16 @@ calendar.jar:
     ../skin/linux/calendar/widgets/calendar-widgets.css                   (themes/linux/widgets/calendar-widgets.css)
     ../skin/linux/calendar/widgets/minimonth.css                          (themes/linux/widgets/minimonth.css)
     ../skin/linux/calendar/calendar-occurrence-prompt.png                 (themes/linux/images/calendar-occurrence-prompt.png)
 
 # OS X theme files
     ../skin/osx/calendar/calendar-alarms.css                            (themes/common/calendar-alarms.css)
     ../skin/osx/calendar/calendar-attendees.css                         (themes/common/calendar-attendees.css)
     ../skin/osx/calendar/calendar-creation-wizard.css                   (themes/common/calendar-creation-wizard.css)
-    ../skin/osx/calendar/calendar-occurrence-prompt.css                 (themes/common/calendar-occurrence-prompt.css)
     ../skin/osx/calendar/calendar-timezone-highlighter.css              (themes/common/dialogs/calendar-timezone-highlighter.css)
     ../skin/osx/calendar/calendar-properties-dialog.css                 (themes/common/dialogs/calendar-properties-dialog.css)
     ../skin/osx/calendar/calendar-subscriptions-dialog.css              (themes/common/dialogs/calendar-subscriptions-dialog.css)
     ../skin/osx/calendar/calendar-providerUninstall-dialog.css          (themes/common/calendar-providerUninstall-dialog.css)
     ../skin/osx/calendar/calendar-printing.css                          (themes/common/calendar-printing.css)
     ../skin/osx/calendar/cal-icon32.png                                 (themes/osx/images/cal-icon32.png)
     ../skin/osx/calendar/cal-icon24.png                                 (themes/osx/images/cal-icon24.png)
     ../skin/osx/calendar/calendar-alarm-dialog.css                      (themes/osx/dialogs/calendar-alarm-dialog.css)
@@ -207,24 +204,19 @@ calendar.jar:
     ../skin/osx/calendar/today-pane.css                                 (themes/osx/today-pane.css)
     ../skin/osx/calendar/widgets/calendar-widgets.css                   (themes/osx/widgets/calendar-widgets.css)
     ../skin/osx/calendar/widgets/minimonth.css                          (themes/osx/widgets/minimonth.css)
     ../skin/osx/calendar/calendar-occurrence-prompt.png                 (themes/osx/images/calendar-occurrence-prompt.png)
     ../skin/osx/calendar/checkbox-images-graphite.png                   (themes/osx/images/checkbox-images-graphite.png)
     ../skin/osx/calendar/sidebar-item.png                               (themes/osx/images/sidebar-item.png)
 
 # Windows theme files
-% style chrome://global/content/customizeToolbar.xul chrome://calendar-windows/skin/calendar-event-dialog.css os=WINNT
-% style chrome://calendar/content/calendar-event-dialog.xul chrome://calendar-windows/skin/calendar-event-dialog.css os=WINNT
-% style chrome://calendar/content/calendar-event-dialog-attendees.xul chrome://calendar-windows/skin/calendar-event-dialog.css os=WINNT
-% style chrome://calendar/content/calendar-occurrence-prompt.xul chrome://calendar-windows/skin/calendar.css os=WINNT osversion>=6
     ../skin/windows/calendar/calendar-alarms.css                            (themes/common/calendar-alarms.css)
     ../skin/windows/calendar/calendar-attendees.css                         (themes/common/calendar-attendees.css)
     ../skin/windows/calendar/calendar-creation-wizard.css                   (themes/common/calendar-creation-wizard.css)
-    ../skin/windows/calendar/calendar-occurrence-prompt.css                 (themes/common/calendar-occurrence-prompt.css)
     ../skin/windows/calendar/calendar-timezone-highlighter.css              (themes/common/dialogs/calendar-timezone-highlighter.css)
     ../skin/windows/calendar/calendar-properties-dialog.css                 (themes/common/dialogs/calendar-properties-dialog.css)
     ../skin/windows/calendar/calendar-subscriptions-dialog.css              (themes/common/dialogs/calendar-subscriptions-dialog.css)
     ../skin/windows/calendar/calendar-providerUninstall-dialog.css          (themes/common/calendar-providerUninstall-dialog.css)
     ../skin/windows/calendar/calendar-printing.css                          (themes/common/calendar-printing.css)
     ../skin/windows/calendar/cal-icon32.png                                 (themes/windows/images/cal-icon32.png)
     ../skin/windows/calendar/cal-icon24.png                                 (themes/windows/images/cal-icon24.png)
     ../skin/windows/calendar/calendar-alarm-dialog.css                      (themes/windows/dialogs/calendar-alarm-dialog.css)
@@ -245,17 +237,9 @@ calendar.jar:
     ../skin/windows/calendar/widgets/calendar-widgets.css                   (themes/windows/widgets/calendar-widgets.css)
     ../skin/windows/calendar/widgets/minimonth.css                          (themes/windows/widgets/minimonth.css)
     ../skin/windows/calendar/calendar-event-dialog-toolbar.png              (themes/windows/dialogs/images/calendar-event-dialog-toolbar.png)
     ../skin/windows/calendar/calendar-event-dialog-toolbar-small.png        (themes/windows/dialogs/images/calendar-event-dialog-toolbar-small.png)
     ../skin/windows/calendar/calendar-occurrence-prompt.png                 (themes/windows/images/calendar-occurrence-prompt.png)
     ../skin/windows/calendar/tasks-actions.png                              (themes/windows/images/tasks-actions.png)
     ../skin/windows/calendar/toolbar-large.png                              (themes/windows/images/toolbar-large.png)
     ../skin/windows/calendar/toolbar-small.png                              (themes/windows/images/toolbar-small.png)
-    ../skin/windows/calendar/win-classic/calendar.css                       (themes/windows/win-classic/calendar.css)
-    ../skin/windows/calendar/win-classic/calendar-event-dialog.css          (themes/windows/win-classic/calendar-event-dialog.css)
-    ../skin/windows/calendar/win-classic/lightning.css                      (themes/windows/win-classic/lightning.css)
-    ../skin/windows/calendar/win-classic/lightning-toolbar.css              (themes/windows/win-classic/lightning-toolbar.css)
-    ../skin/windows/calendar/win-aero/calendar.css                          (themes/windows/win-aero/calendar.css)
-    ../skin/windows/calendar/win-aero/calendar-event-dialog.css             (themes/windows/win-aero/calendar-event-dialog.css)
-    ../skin/windows/calendar/win-aero/lightning.css                         (themes/windows/win-aero/lightning.css)
-    ../skin/windows/calendar/win-aero/lightning-toolbar.css                 (themes/windows/win-aero/lightning-toolbar.css)
     ../skin/windows/calendar/calendar-occurrence-prompt-aero.png            (themes/windows/images/calendar-occurrence-prompt-aero.png)
--- a/calendar/base/themes/common/calendar-occurrence-prompt.css
+++ b/calendar/base/themes/common/calendar-occurrence-prompt.css
@@ -56,8 +56,14 @@
 
 #accept-buttons-box[action="delete"] > #accept-parent-button {
   -moz-image-region: rect(0 100px 20px 80px);
 }
 
 #accept-buttons-box[action="delete"] > #accept-allfollowing-button {
   -moz-image-region: rect(0 120px 20px 100px);
 }
+
+@media not all and (-moz-os-version: windows-xp) {
+  .occurrence-accept-buttons {
+    list-style-image: url(chrome://calendar/skin/calendar-occurrence-prompt-aero.png);
+  }
+}
--- a/calendar/base/themes/windows/calendar-task-view.css
+++ b/calendar/base/themes/windows/calendar-task-view.css
@@ -123,9 +123,92 @@
   #calendar-add-task-button {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#newtask);
     -moz-image-region: rect(0 18px 18px 0);
   }
 
   #calendar-add-task-button[disabled="true"] > .toolbarbutton-icon {
     opacity: 0.4;
   }
+
+  #view-task-edit-field,
+  #task-text-filter-field {
+    -moz-appearance: none;
+    background-clip: padding-box;
+    border: 1px solid ThreeDDarkShadow;
+  }
+
+  #view-task-edit-field,
+  #task-text-filter-field {
+    width: 15em;
+  }
+
+  #calendar-task-box #calendar-task-view-splitter {
+    border: none;
+    border-bottom: 1px solid #A9B7C9;
+    min-height: 0;
+    height: 5px;
+    background-color: transparent;
+    margin-top: -5px;
+    position: relative;
+    z-index: 10;
+  }
+
+  #calendar-nav-control {
+    border-top-width: 0;
+  }
+
+  #calendar-task-details-container {
+    border-top-width: 0;
+    padding-top: 0;
+  }
+
+  @media (-moz-windows-default-theme) {
+    #task-addition-box {
+      background-color: #f8f8f8;
+    }
+  }
 }
+
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+  #view-task-edit-field,
+  #task-text-filter-field {
+    border-radius: 2px;
+    border-color: hsla(210, 54%, 20%, .25) hsla(210, 54%, 20%, .27)
+                  hsla(210, 54%, 20%, .3);
+    box-shadow: 0 1px hsla(0, 0%, 0%, .01) inset,
+                0 1px hsla(0, 0%, 100%, .1);
+  }
+
+  #view-task-edit-field:not([focused]):hover,
+  #task-text-filter-field:not([focused]):hover {
+    border-color: hsla(210, 54%, 20%, .35) hsla(210, 54%, 20%, .37)
+                  hsla(210, 54%, 20%, .4);
+  }
+
+  #view-task-edit-field[focused],
+  #task-text-filter-field[focused] {
+    border-color: hsla(206, 100%, 60%, .65) hsla(206, 100%, 55%, .65)
+                  hsla(206, 100%, 50%, .65);
+  }
+}
+
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+  #view-task-edit-field:not(:-moz-lwtheme),
+  #task-text-filter-field:not(:-moz-lwtheme) {
+    background-color: hsla(0, 0%, 100%, .9);
+    border: 1px solid transparent;
+    border-color: hsla(210, 54%, 20%, .25) hsla(210, 54%, 20%, .27)
+                  hsla(210, 54%, 20%, .3);
+    box-shadow: 0 1px 0 hsla(0, 0%, 0%, .01) inset,
+                0 1px 0 hsla(0, 0%, 100%, .1);
+    transition-property: border-color, background-color;
+    transition-duration: 200ms;
+  }
+
+  #view-task-edit-field:not(:-moz-lwtheme)[focused],
+  #task-text-filter-field:not(:-moz-lwtheme)[focused] {
+    background-color: hsla(0, 0%, 100%, 1);
+    border-color: #4595e5;
+  }
+}
--- a/calendar/base/themes/windows/calendar-unifinder.css
+++ b/calendar/base/themes/windows/calendar-unifinder.css
@@ -1,21 +1,82 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url(chrome://calendar-common/skin/calendar-unifinder.css);
 
-/* added for new id ..... search box ..... */
-#unifinder-searchBox {
-    background-color: transparent;
-}
-
 #bottom-events-box {
     -moz-border-start: 1px solid ThreeDShadow;
 }
 
 .unifinder-closebutton {
     -moz-appearance: none;
     border: none;
     padding: 2px;
     background: transparent;
 }
+
+@media (-moz-os-version: windows-xp) {
+  #unifinder-searchBox {
+      background-color: transparent;
+  }
+}
+
+@media not all and (-moz-os-version: windows-xp) {
+  #unifinder-search-field,
+  #unifinder-task-edit-field {
+    -moz-appearance: none;
+    background-clip: padding-box;
+    border: 1px solid ThreeDDarkShadow;
+  }
+
+  @media (-moz-windows-default-theme) {
+    #unifinder-searchBox {
+      background-color: #f8f8f8;
+    }
+  }
+}
+
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+  #unifinder-search-field,
+  #unifinder-task-edit-field {
+    border-radius: 2px;
+    border-color: hsla(210, 54%, 20%, .25) hsla(210, 54%, 20%, .27)
+                  hsla(210, 54%, 20%, .3);
+    box-shadow: 0 1px hsla(0, 0%, 0%, .01) inset,
+                0 1px hsla(0, 0%, 100%, .1);
+  }
+
+  #unifinder-search-field:not([focused]):hover,
+  #unifinder-task-edit-field:not([focused]):hover {
+    border-color: hsla(210, 54%, 20%, .35) hsla(210, 54%, 20%, .37)
+                  hsla(210, 54%, 20%, .4);
+  }
+
+  #unifinder-search-field[focused],
+  #unifinder-task-edit-field[focused] {
+    border-color: hsla(206, 100%, 60%, .65) hsla(206, 100%, 55%, .65)
+                  hsla(206, 100%, 50%, .65);
+  }
+}
+
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+  #unifinder-search-field:not(:-moz-lwtheme),
+  #unifinder-task-edit-field:not(:-moz-lwtheme) {
+    background-color: hsla(0, 0%, 100%, .9);
+    border: 1px solid transparent;
+    border-color: hsla(210, 54%, 20%, .25) hsla(210, 54%, 20%, .27)
+                  hsla(210, 54%, 20%, .3);
+    box-shadow: 0 1px 0 hsla(0, 0%, 0%, .01) inset,
+                0 1px 0 hsla(0, 0%, 100%, .1);
+    transition-property: border-color, background-color;
+    transition-duration: 200ms;
+  }
+
+  #unifinder-search-field:not(:-moz-lwtheme)[focused],
+  #unifinder-task-edit-field:not(:-moz-lwtheme)[focused] {
+    background-color: hsla(0, 0%, 100%, 1);
+    border-color: #4595e5;
+  }
+}
--- a/calendar/base/themes/windows/calendar-views.css
+++ b/calendar/base/themes/windows/calendar-views.css
@@ -26,17 +26,17 @@ tab[calview] {
 }
 
 tab[calview][selected="true"],
 tab[calview][selected="true"]:hover {
     background-color: -moz-Field;
 }
 
 tab[calview]:hover {
-    background-color: ButtonHighlight;    
+    background-color: ButtonHighlight;
 }
 
 #calendarWeek {
     margin-top: 4px;
     margin-bottom: 0px;
 }
 
 .navigation-inner-box {
@@ -55,8 +55,21 @@ tab[calview]:hover {
 .view-navigation-button {
     -moz-margin-start: 2px;
     -moz-margin-end: 2px;
 }
 
 .today-navigation-button {
     padding-top: 0px !important; /* a workaround to center the label vertically on Windows */
 }
+
+@media not all and (-moz-os-version: windows-xp) {
+  #calendar-view-box #calendar-view-splitter {
+    border: none;
+    border-bottom: 1px solid #A9B7C9;
+    min-height: 0;
+    height: 5px;
+    background-color: transparent;
+    margin-top: -5px;
+    position: relative;
+    z-index: 10;
+  }
+}
--- a/calendar/base/themes/windows/today-pane.css
+++ b/calendar/base/themes/windows/today-pane.css
@@ -1,18 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 @import url(chrome://calendar-common/skin/today-pane.css);
 
-#today-pane-panel {
-  border-left: 1px solid ThreeDShadow;
-}
-
 #today-pane-panel:-moz-lwtheme > sidebarheader {
   background-image: linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0) 19px);
 }
 
 .miniday-nav-buttons {
   list-style-image: url("chrome://calendar-common/skin/widgets/nav-arrow.svg");
 }
 
@@ -32,16 +28,20 @@
   padding: 2px;
 }
 
 .today-closebutton > .toolbarbutton-icon {
   -moz-margin-end: 0px; /* override toolkit's default value */
 }
 
 @media (-moz-os-version: windows-xp) {
+  #today-pane-panel {
+    border-left: 1px solid ThreeDShadow;
+  }
+
   #todaypane-new-event-button {
     list-style-image: url("chrome://calendar/skin/toolbar-small.png");
     -moz-image-region: rect(0px 16px 16px 0px);
   }
   #todaypane-new-event-button[disabled="true"] {
     -moz-image-region: rect(32px 16px 48px 0px);
   }
 }
@@ -55,9 +55,41 @@
     opacity: 0.4;
   }
 
   #todaypane-new-event-button > .toolbarbutton-icon {
     width: 18px;
     height: 18px;
     margin: -1px;
   }
+
+  @media (-moz-windows-default-theme) {
+    #today-pane-panel > sidebarheader {
+      -moz-appearance: none;
+      background-color: #f8f8f8;
+      border-bottom: none;
+    }
+
+    #today-pane-panel:-moz-lwtheme > sidebarheader {
+      background-color: rgba(255, 255, 255, 0.3);
+      background-image: linear-gradient(rgba(255, 255, 255, 0.5),
+                        rgba(255, 255, 255, 0) 28px);
+    }
+
+    sidebarheader > spacer {
+      min-height: 25px;
+    }
+  }
 }
+
+@media all and (-moz-windows-compositor) {
+  @media not all and (-moz-os-version: windows-win10) {
+    #messengerWindow[sizemode=normal] #today-pane-panel {
+      -moz-border-end: 1px solid rgba(10%, 10%, 10%, .4);
+      border-bottom: 1px solid rgba(10%, 10%, 10%, .4);
+      background-clip: padding-box;
+    }
+  }
+
+  #today-pane-panel .folderview-cycler {
+    margin-top: -1px;
+  }
+}
deleted file mode 100644
--- a/calendar/base/themes/windows/win-aero/calendar-event-dialog.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
deleted file mode 100644
--- a/calendar/base/themes/windows/win-aero/calendar.css
+++ /dev/null
@@ -1,209 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#unifinder-search-field,
-#view-task-edit-field,
-#task-text-filter-field,
-#unifinder-task-edit-field {
-  -moz-appearance: none;
-  background-clip: padding-box;
-  border: 1px solid ThreeDDarkShadow;
-}
-
-#view-task-edit-field,
-#task-text-filter-field {
-  width: 15em;
-}
-
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
-  #unifinder-search-field,
-  #view-task-edit-field,
-  #task-text-filter-field,
-  #unifinder-task-edit-field {
-    border-radius: 2px;
-    border-color: hsla(210, 54%, 20%, .25) hsla(210, 54%, 20%, .27)
-                  hsla(210, 54%, 20%, .3);
-    box-shadow: 0 1px hsla(0, 0%, 0%, .01) inset,
-                0 1px hsla(0, 0%, 100%, .1);
-  }
-
-  #unifinder-search-field:not([focused]):hover,
-  #view-task-edit-field:not([focused]):hover,
-  #task-text-filter-field:not([focused]):hover,
-  #unifinder-task-edit-field:not([focused]):hover {
-    border-color: hsla(210, 54%, 20%, .35) hsla(210, 54%, 20%, .37)
-                  hsla(210, 54%, 20%, .4);
-  }
-
-  #unifinder-search-field[focused],
-  #view-task-edit-field[focused],
-  #task-text-filter-field[focused],
-  #unifinder-task-edit-field[focused] {
-    border-color: hsla(206, 100%, 60%, .65) hsla(206, 100%, 55%, .65)
-                  hsla(206, 100%, 50%, .65);
-  }
-}
-
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
-  #unifinder-search-field:not(:-moz-lwtheme),
-  #view-task-edit-field:not(:-moz-lwtheme),
-  #task-text-filter-field:not(:-moz-lwtheme),
-  #unifinder-task-edit-field:not(:-moz-lwtheme) {
-    background-color: hsla(0, 0%, 100%, .9);
-    border: 1px solid transparent;
-    border-color: hsla(210, 54%, 20%, .25) hsla(210, 54%, 20%, .27)
-                  hsla(210, 54%, 20%, .3);
-    box-shadow: 0 1px 0 hsla(0, 0%, 0%, .01) inset,
-                0 1px 0 hsla(0, 0%, 100%, .1);
-    transition-property: border-color, background-color;
-    transition-duration: 200ms;
-  }
-
-  #unifinder-search-field:not(:-moz-lwtheme)[focused],
-  #view-task-edit-field:not(:-moz-lwtheme)[focused],
-  #task-text-filter-field:not(:-moz-lwtheme)[focused],
-  #unifinder-task-edit-field:not(:-moz-lwtheme)[focused] {
-    background-color: hsla(0, 0%, 100%, 1);
-    border-color: #4595e5;
-  }
-}
-
-@media (-moz-windows-default-theme) {
-  #bottom-events-box > #unifinder-searchBox,
-  #task-addition-box {
-    background-color: #f8f8f8;
-  }
-
-  #today-pane-panel > sidebarheader {
-    -moz-appearance: none;
-    background-color: #f8f8f8;
-    border-bottom: none;
-  }
-
-  #today-pane-panel:-moz-lwtheme > sidebarheader {
-    background-color: rgba(255, 255, 255, 0.3);
-    background-image: linear-gradient(rgba(255, 255, 255, 0.5),
-                      rgba(255, 255, 255, 0) 28px);
-  }
-
-  sidebarheader > spacer {
-    min-height: 25px;
-  }
-}
-
-#calsidebar_splitter.calendar-sidebar-splitter {
-  border: none;
-  border-left: 1px solid #A9B7C9;
-  min-width: 0;
-  width: 5px;
-  background-color: transparent;
-  margin-top: 0;
-  -moz-margin-end: -5px;
-  position: relative;
-  z-index: 10;
-  transition: border-width .3s ease-in;
-}
-
-#today-splitter.calendar-sidebar-splitter {
-  border: none;
-  border-right: 1px solid #A9B7C9;
-  min-width: 0;
-  width: 5px;
-  background-color: transparent;
-  margin-top: 0;
-  -moz-margin-start: -5px;
-  position: relative;
-  z-index: 10;
-  transition: border-width .3s ease-in;
-}
-
-/* Until Bug 621351 is fixed we need border-right and border-left in
- * combination with -moz-locale-dir instead of -moz-border-end and
- * -moz-border-start for transition
- */
-
-#calsidebar_splitter:-moz-locale-dir(rtl) {
-  border-right: 1px solid #A9B7C9;
-  border-left-width: 0;
-}
-
-#today-splitter:-moz-locale-dir(rtl) {
-  border-left: 1px solid #A9B7C9;
-  border-right-width: 0;
-}
-
-#today-splitter[state="collapsed"]:-moz-locale-dir(ltr) {
-  border-right: 1px solid transparent;
-}
-
-#calsidebar_splitter[state="collapsed"]:hover:-moz-locale-dir(rtl),
-#today-splitter[state="collapsed"]:hover:-moz-locale-dir(ltr) {
-  border-right: 4px solid highlight;
-}
-
-#today-splitter[state="collapsed"]:-moz-locale-dir(rtl) {
-  border-left: 1px solid transparent;
-}
-
-#calsidebar_splitter[state="collapsed"]:hover:-moz-locale-dir(ltr),
-#today-splitter[state="collapsed"]:hover:-moz-locale-dir(rtl) {
-  border-left: 4px solid highlight;
-}
-
-#today-splitter.calendar-sidebar-splitter:-moz-lwtheme {
-  background-image: none;
-}
-
-#today-splitter > grippy {
-  display: none;
-}
-
-#today-pane-splitter,
-#calendar-view-box #calendar-view-splitter,
-#calendar-task-box #calendar-task-view-splitter {
-  border: none;
-  border-bottom: 1px solid #A9B7C9;
-  min-height: 0;
-  height: 5px;
-  background-color: transparent;
-  margin-top: -5px;
-  position: relative;
-  z-index: 10;
-}
-
-#today-pane-splitter {
-  border-bottom: 3px double #A9B7C9;
-  margin-top: -3px;
-}
-
-#calendar-nav-control {
-  border-top-width: 0 !important;
-}
-
-#calendar-task-details-container {
-  border-top-width: 0 !important;
-  padding-top: 0px;
-}
-
-#today-pane-panel {
-  -moz-border-start-width: 0 !important;
-}
-
-@media all and (-moz-windows-compositor) {
-  #messengerWindow[sizemode=normal] #today-pane-panel {
-    -moz-border-end: 1px solid rgba(10%, 10%, 10%, .4);
-    border-bottom: 1px solid rgba(10%, 10%, 10%, .4);
-    background-clip: padding-box;
-  }
-
-  #today-pane-panel .folderview-cycler {
-    margin-top: -1px;
-  }
-}
-
-.occurrence-accept-buttons {
-  list-style-image: url(chrome://calendar/skin/calendar-occurrence-prompt-aero.png);
-}
deleted file mode 100644
--- a/calendar/base/themes/windows/win-aero/lightning-toolbar.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
deleted file mode 100644
--- a/calendar/base/themes/windows/win-aero/lightning.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
deleted file mode 100644
--- a/calendar/base/themes/windows/win-classic/calendar-event-dialog.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
deleted file mode 100644
deleted file mode 100644
--- a/calendar/base/themes/windows/win-classic/lightning-toolbar.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-/* Lightning "Calendar" Toolbarbutton */
deleted file mode 100644
--- a/calendar/base/themes/windows/win-classic/lightning.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
--- a/calendar/lightning/themes/windows/lightning.css
+++ b/calendar/lightning/themes/windows/lightning.css
@@ -5,30 +5,16 @@
 @import url(chrome://lightning-common/skin/lightning.css);
 @import url(chrome://calendar-windows/skin/lightning.css);
 
 #calendarContent {
     color: -moz-DialogText;
     background-color: -moz-Dialog;
 }
 
-#calsidebar_splitter {
-    border-right: none;
-}
-
-#today-splitter {
-    border-right: none;
-}
-
-#today-splitter:-moz-lwtheme {
-    background-image: linear-gradient(rgba(255, 255, 255, 0.5),
-                      rgba(255, 255, 255, 0) 19px, rgba(255, 255, 255, 0) 25px,
-                      ThreeDDarkShadow 25px, -moz-Dialog 26px);
-}
-
 /* Calendar list rules */
 #calendar-panel {
     padding-bottom: 5px;
 }
 
 /* Lightning preferences icon */
 radio[pane=paneLightning] {
     list-style-image: url(chrome://calendar/skin/cal-icon32.png);
@@ -73,16 +59,30 @@ radio[pane=paneLightning] {
   margin: 0 0 1px !important;
 }
 
 #calMinimonthBox {
     margin-top: 3px;
 }
 
 @media (-moz-os-version: windows-xp) {
+  #calsidebar_splitter {
+      border-right: none;
+  }
+
+  #today-splitter {
+      border-right: none;
+  }
+
+  #today-splitter:-moz-lwtheme {
+      background-image: linear-gradient(rgba(255, 255, 255, 0.5),
+                        rgba(255, 255, 255, 0) 19px, rgba(255, 255, 255, 0) 25px,
+                        ThreeDDarkShadow 25px, -moz-Dialog 26px);
+  }
+
   #newMsgButton-mail-menuitem {
     list-style-image: url(chrome://messenger/skin/icons/mail-toolbar-small.png);
     -moz-image-region: rect(0 32px 16px 16px);
   }
 
   #newMsgButton-calendar-menuitem {
     list-style-image: url(chrome://calendar/skin/toolbar-small.png);
     -moz-image-region: rect(0 16px 16px 0);
@@ -273,9 +273,62 @@ radio[pane=paneLightning] {
 
   #newMsgButton-mail-menuitem > .menu-iconic-left > .menu-iconic-icon,
   #newMsgButton-calendar-menuitem > .menu-iconic-left > .menu-iconic-icon,
   #newMsgButton-task-menuitem > .menu-iconic-left > .menu-iconic-icon {
     width: 18px;
     height: 18px;
     margin: -1px;
   }
+
+  #calsidebar_splitter {
+    border: none;
+    -moz-border-start: 1px solid #a9b7c9;
+    min-width: 0;
+    width: 5px;
+    background-color: transparent;
+    margin-top: 0;
+    -moz-margin-end: -5px;
+    position: relative;
+    z-index: 10;
+    transition: border-width .3s ease-in;
+  }
+
+  #calsidebar_splitter[state="collapsed"] {
+    -moz-border-start: 1px solid transparent;
+  }
+
+  #calsidebar_splitter[state="collapsed"]:hover {
+    -moz-border-start: 4px solid highlight;
+  }
+
+  #today-splitter {
+    border: none;
+    -moz-border-end: 1px solid #a9b7c9;
+    min-width: 0;
+    width: 5px;
+    background-color: transparent;
+    margin-top: 0;
+    -moz-margin-start: -5px;
+    position: relative;
+    z-index: 10;
+    transition: border-width .3s ease-in;
+  }
+
+  #today-splitter.calendar-sidebar-splitter:-moz-lwtheme {
+    background-image: none;
+  }
+
+  #today-splitter > grippy {
+    display: none;
+  }
+
+  #today-pane-splitter {
+    border: none;
+    border-bottom: 3px double #a9b7c9;
+    min-height: 0;
+    height: 5px;
+    background-color: transparent;
+    margin-top: -3px;
+    position: relative;
+    z-index: 10;
+  }
 }