Bug 1325924 - Remove Windows XP and Vista theme code and resources. Part 1. r=jorgk

mail/themes/windows/editor/EditorDialog.css

@@ -308,14 +308,12 @@ tree.list {
   list-style-image: url("chrome://editor/skin/icons/progress-failed.gif");
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  #AddJSEAttributeNameList > menupopup > menuseparator,
-  #AddHTMLAttributeNameInput > menupopup > menuseparator {
-    -moz-appearance: none;
-    margin-top: 3px;
-    margin-bottom: 3px;
-    padding-top: 0;
-    padding-bottom: 0;
-    border-top-color: #d7d7d7;
-  }
+#AddJSEAttributeNameList > menupopup > menuseparator,
+#AddHTMLAttributeNameInput > menupopup > menuseparator {
+  -moz-appearance: none;
+  margin-top: 3px;
+  margin-bottom: 3px;
+  padding-top: 0;
+  padding-bottom: 0;
+  border-top-color: #d7d7d7;
 }

mail/themes/windows/jar.mn

@@ -82,46 +82,30 @@ classic.jar:
   skin/classic/messenger/starContact.png                      (mail/starContact.png)
   skin/classic/messenger/activity/activity.css                (mail/activity/activity.css)
   skin/classic/messenger/activity/addItemIcon.png             (mail/activity/addItemIcon.png)
-  skin/classic/messenger/activity/addItemIcon-XP.png          (mail/activity/addItemIcon-XP.png)
   skin/classic/messenger/activity/buttons.png                 (mail/activity/buttons.png)
   skin/classic/messenger/activity/compactMailIcon.png         (mail/activity/compactMailIcon.png)
-  skin/classic/messenger/activity/compactMailIcon-XP.png      (mail/activity/compactMailIcon-XP.png)
   skin/classic/messenger/activity/copyMailIcon.png            (mail/activity/copyMailIcon.png)
-  skin/classic/messenger/activity/copyMailIcon-XP.png         (mail/activity/copyMailIcon-XP.png)
   skin/classic/messenger/activity/defaultEventIcon.png        (mail/activity/defaultEventIcon.png)
   skin/classic/messenger/activity/defaultProcessIcon.png      (mail/activity/defaultProcessIcon.png)
-  skin/classic/messenger/activity/defaultProcessIcon-XP.png   (mail/activity/defaultProcessIcon-XP.png)
-  skin/classic/messenger/activity/defaultWarningIcon-XP.png   (mail/activity/defaultWarningIcon-XP.png)
   skin/classic/messenger/activity/deleteMailIcon.png          (mail/activity/deleteMailIcon.png)
-  skin/classic/messenger/activity/deleteMailIcon-XP.png       (mail/activity/deleteMailIcon-XP.png)
   skin/classic/messenger/activity/indexMailIcon.png           (mail/activity/indexMailIcon.png)
-  skin/classic/messenger/activity/indexMailIcon-XP.png        (mail/activity/indexMailIcon-XP.png)
   skin/classic/messenger/activity/moveMailIcon.png            (mail/activity/moveMailIcon.png)
-  skin/classic/messenger/activity/moveMailIcon-XP.png         (mail/activity/moveMailIcon-XP.png)
   skin/classic/messenger/activity/removeItemIcon.png          (mail/activity/removeItemIcon.png)
-  skin/classic/messenger/activity/removeItemIcon-XP.png       (mail/activity/removeItemIcon-XP.png)
   skin/classic/messenger/activity/sendMailIcon.png            (mail/activity/sendMailIcon.png)
-  skin/classic/messenger/activity/sendMailIcon-XP.png         (mail/activity/sendMailIcon-XP.png)
   skin/classic/messenger/activity/syncMailIcon.png            (mail/activity/syncMailIcon.png)
-  skin/classic/messenger/activity/syncMailIcon-XP.png         (mail/activity/syncMailIcon-XP.png)
   skin/classic/messenger/activity/undoIcon.png                (mail/activity/undoIcon.png)
-  skin/classic/messenger/activity/undoIcon-XP.png             (mail/activity/undoIcon-XP.png)
   skin/classic/messenger/addressbook/addressbook.css          (mail/addrbook/addressbook.css)
   skin/classic/messenger/addressbook/abContactsPanel.css      (mail/addrbook/abContactsPanel.css)
   skin/classic/messenger/addressbook/cardDialog.css           (mail/addrbook/cardDialog.css)
   skin/classic/messenger/addressbook/abResultsPane.css        (mail/addrbook/abResultsPane.css)
   skin/classic/messenger/addressbook/icons/abcard.png         (mail/addrbook/abcard.png)
   skin/classic/messenger/addressbook/icons/addrbook.png       (mail/addrbook/addrbook.png)
-  skin/classic/messenger/addressbook/icons/addrbook-XP.png    (mail/addrbook/addrbook-XP.png)
   skin/classic/messenger/addressbook/icons/ablist.png         (mail/addrbook/ablist.png)
   skin/classic/messenger/addressbook/icons/contact-generic.png             (mail/addrbook/contact-generic.png)
   skin/classic/messenger/addressbook/icons/contact-generic-tiny.png        (mail/addrbook/contact-generic-tiny.png)
-  skin/classic/messenger/addressbook/icons/addressbook-toolbar.png         (mail/addrbook/addressbook-toolbar.png)
-  skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png   (mail/addrbook/addressbook-toolbar-small.png)
   skin/classic/messenger/addressbook/icons/addressbook-toolbar.svg         (../shared/mail/icons/addressbook-toolbar.svg)
   skin/classic/messenger/addressbook/icons/abcard-large.png                (mail/addrbook/abcard-large.png)
   skin/classic/messenger/addressbook/icons/remote-addrbook.png             (mail/addrbook/remote-addrbook.png)
-  skin/classic/messenger/addressbook/icons/remote-addrbook-XP.png          (mail/addrbook/remote-addrbook-XP.png)
   skin/classic/messenger/addressbook/icons/remote-addrbook-error.png       (mail/addrbook/remote-addrbook-error.png)
   skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png      (mail/addrbook/secure-remote-addrbook.png)
   skin/classic/messenger/cloudfile/addAccountDialog.css       (mail/cloudfile/addAccountDialog.css)
@@ -129,11 +113,8 @@ classic.jar:
   skin/classic/messenger/cloudfile/Hightail/fileExceedsLimit.css       (mail/cloudfile/Hightail/fileExceedsLimit.css)
   skin/classic/messenger/cloudfile/Hightail/check.png                  (mail/cloudfile/Hightail/check.png)
   skin/classic/messenger/messengercompose/messengercompose.css (mail/compose/messengercompose.css)
-  skin/classic/messenger/messengercompose/compose-toolbar.png  (mail/compose/compose-toolbar.png)
-  skin/classic/messenger/messengercompose/compose-toolbar-small.png  (mail/compose/compose-toolbar-small.png)
   skin/classic/messenger/messengercompose/compose-toolbar.svg (../shared/mail/icons/compose-toolbar.svg)
   skin/classic/messenger/messengercompose/format-buttons.png  (mail/compose/format-buttons.png)
-  skin/classic/messenger/messengercompose/format-buttons-XP.png  (mail/compose/format-buttons-XP.png)
   skin/classic/messenger/messengercompose/noise.png           (mail/compose/noise.png)
   skin/classic/messenger/downloads/aboutDownloads.css         (mail/downloads/aboutDownloads.css)
   skin/classic/messenger/downloads/download.svg               (mail/downloads/download.svg)
@@ -236,7 +217,6 @@ classic.jar:
   skin/classic/messenger/icons/unreadmail.png                 (mail/icons/unreadmail.png)
   skin/classic/messenger/icons/quick-search-icons.png         (mail/icons/quick-search-icons.png)
   skin/classic/messenger/icons/search-arrow.gif               (mail/icons/search-arrow.gif)
-  skin/classic/messenger/icons/close-button.png               (mail/icons/close-button.png)
   skin/classic/messenger/icons/remote-blocked.png             (mail/icons/remote-blocked.png)
   skin/classic/messenger/icons/phishing.png                   (mail/icons/phishing.png)
   skin/classic/messenger/icons/junk.png                       (mail/icons/junk.png)

mail/themes/windows/mail/activity/activity.css

@@ -44,17 +44,17 @@ activity-process button {
   list-style-image: url(chrome://messenger/skin/activity/buttons.png);
 }
 .cancel {
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
+  -moz-image-region: rect(0, 16px, 16px, 0);
 }
 .cancel:hover {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
+  -moz-image-region: rect(0, 32px, 16px, 16px);
 }
 .cancel:hover:active {
-  -moz-image-region: rect(0px, 48px, 16px, 32px);
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 .pause {
-  -moz-image-region: rect(48px, 16px, 64px, 0px);
+  -moz-image-region: rect(48px, 16px, 64px, 0);
 }
 .pause:hover {
   -moz-image-region: rect(48px, 32px, 64px, 16px);
@@ -63,11 +63,11 @@ activity-process button {
   -moz-image-region: rect(48px, 48px, 64px, 32px);
 }
 .pause[disabled="true"] {
-  -moz-image-region: rect(48px, 16px, 64px, 0px);
+  -moz-image-region: rect(48px, 16px, 64px, 0);
 }
 
 .resume {
-  -moz-image-region: rect(16px, 16px, 32px, 0px);
+  -moz-image-region: rect(16px, 16px, 32px, 0);
 }
 .resume:hover {
   -moz-image-region: rect(16px, 32px, 32px, 16px);
@@ -77,7 +77,7 @@ activity-process button {
 }
 
 .retry {
-  -moz-image-region: rect(32px, 16px, 48px, 0px);
+  -moz-image-region: rect(32px, 16px, 48px, 0);
   display: none;
 }
 .retry:hover {
@@ -104,7 +104,7 @@ activity-event button {
   list-style-image: url(chrome://messenger/skin/activity/buttons.png);
 }
 .undo {
-  -moz-image-region: rect(32px, 16px, 48px, 0px);
+  -moz-image-region: rect(32px, 16px, 48px, 0);
 }
 .undo:hover {
   -moz-image-region: rect(32px, 32px, 48px, 16px);
@@ -127,7 +127,7 @@ activity-warning button {
   list-style-image: url(chrome://messenger/skin/activity/buttons.png);
 }
 .recover {
-  -moz-image-region: rect(32px, 16px, 48px, 0px);
+  -moz-image-region: rect(32px, 16px, 48px, 0);
 }
 .recover:hover {
   -moz-image-region: rect(32px, 32px, 48px, 16px);
@@ -155,15 +155,6 @@ activity-warning button {
 activity-group button {
   list-style-image: url(chrome://messenger/skin/activity/buttons.png);
 }
-.retry {
-  -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-.retry:hover {
-  -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
-.retry:hover:active {
-  -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
 
 activity-group button {
   -moz-appearance: none;
@@ -203,112 +194,56 @@ activity-warning .statusText {
   list-style-image: url(chrome://messenger/skin/activity/defaultEventIcon.png);
 }
 
-@media (-moz-os-version: windows-xp) {
-  .blockedIcon {
-    list-style-image: url(chrome://global/skin/icons/Error-XP.png);
-  }
-
-  .processIconBox image {
-    list-style-image: url(chrome://messenger/skin/activity/defaultProcessIcon-XP.png);
-  }
-
-  .warningIconBox image {
-    list-style-image: url(chrome://messenger/skin/activity/defaultWarningIcon-XP.png);
-  }
-
-  image.syncMail {
-    list-style-image: url(chrome://messenger/skin/activity/syncMailIcon-XP.png);
-  }
-
-  image.sendMail {
-    list-style-image: url(chrome://messenger/skin/activity/sendMailIcon-XP.png);
-  }
-
-  image.copyMail {
-    list-style-image: url(chrome://messenger/skin/activity/copyMailIcon-XP.png);
-  }
-
-  image.moveMail {
-    list-style-image: url(chrome://messenger/skin/activity/moveMailIcon-XP.png);
-  }
-
-  image.deleteMail {
-    list-style-image: url(chrome://messenger/skin/activity/deleteMailIcon-XP.png);
-  }
-
-  image.addItem {
-    list-style-image: url(chrome://messenger/skin/activity/addItemIcon-XP.png);
-  }
-
-  image.removeItem {
-    list-style-image: url(chrome://messenger/skin/activity/removeItemIcon-XP.png);
-  }
-
-  image.undo {
-    list-style-image: url(chrome://messenger/skin/activity/undoIcon-XP.png);
-  }
-
-  image.indexMail {
-    list-style-image: url(chrome://messenger/skin/activity/indexMailIcon-XP.png);
-  }
-
-  image.compactMail {
-    list-style-image: url(chrome://messenger/skin/activity/compactMailIcon-XP.png);
-  }
+.blockedIcon {
+  list-style-image: url(chrome://global/skin/icons/Error.png);
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  .blockedIcon {
-    list-style-image: url(chrome://global/skin/icons/Error.png);
-  }
+.processIconBox image {
+  list-style-image: url(chrome://messenger/skin/activity/defaultProcessIcon.png);
+}
 
-  .processIconBox image {
-    list-style-image: url(chrome://messenger/skin/activity/defaultProcessIcon.png);
-  }
+.warningIconBox image {
+  list-style-image: url(chrome://global/skin/icons/Warning.png);
+}
 
-  .warningIconBox image {
-    list-style-image: url(chrome://global/skin/icons/Warning.png);
-  }
+image.syncMail {
+  list-style-image: url(chrome://messenger/skin/activity/syncMailIcon.png);
+}
 
-  image.syncMail {
-    list-style-image: url(chrome://messenger/skin/activity/syncMailIcon.png);
-  }
+image.sendMail {
+  list-style-image: url(chrome://messenger/skin/activity/sendMailIcon.png);
+}
 
-  image.sendMail {
-    list-style-image: url(chrome://messenger/skin/activity/sendMailIcon.png);
-  }
+image.copyMail {
+  list-style-image: url(chrome://messenger/skin/activity/copyMailIcon.png);
+}
 
-  image.copyMail {
-    list-style-image: url(chrome://messenger/skin/activity/copyMailIcon.png);
-  }
+image.moveMail {
+  list-style-image: url(chrome://messenger/skin/activity/moveMailIcon.png);
+}
 
-  image.moveMail {
-    list-style-image: url(chrome://messenger/skin/activity/moveMailIcon.png);
-  }
+image.deleteMail {
+  list-style-image: url(chrome://messenger/skin/activity/deleteMailIcon.png);
+}
 
-  image.deleteMail {
-    list-style-image: url(chrome://messenger/skin/activity/deleteMailIcon.png);
-  }
+image.addItem {
+  list-style-image: url(chrome://messenger/skin/activity/addItemIcon.png);
+}
 
-  image.addItem {
-    list-style-image: url(chrome://messenger/skin/activity/addItemIcon.png);
-  }
+image.removeItem {
+  list-style-image: url(chrome://messenger/skin/activity/removeItemIcon.png);
+}
 
-  image.removeItem {
-    list-style-image: url(chrome://messenger/skin/activity/removeItemIcon.png);
-  }
+image.undo {
+  list-style-image: url(chrome://messenger/skin/activity/undoIcon.png);
+}
 
-  image.undo {
-    list-style-image: url(chrome://messenger/skin/activity/undoIcon.png);
-  }
+image.indexMail {
+  list-style-image: url(chrome://messenger/skin/activity/indexMailIcon.png);
+}
 
-  image.indexMail {
-    list-style-image: url(chrome://messenger/skin/activity/indexMailIcon.png);
-  }
-
-  image.compactMail {
-    list-style-image: url(chrome://messenger/skin/activity/compactMailIcon.png);
-  }
+image.compactMail {
+  list-style-image: url(chrome://messenger/skin/activity/compactMailIcon.png);
 }
 
 /* prevent flickering when changing states */

mail/themes/windows/mail/addrbook/abContactsPanel.css

@@ -24,43 +24,41 @@
   background-color: transparent;
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  #abResultsTree {
-    border-inline-end: none;
-    border-bottom: 1px solid #A9B1B8;
+#abResultsTree {
+  border-inline-end: none;
+  border-bottom: 1px solid #A9B1B8;
+}
+
+@media (-moz-windows-default-theme) {
+  button,
+  #addressbookList {
+    -moz-appearance: none;
+    margin: 1px 4px;
+    padding: 1px 5px !important;
+    border: 1px solid;
   }
 
-  @media (-moz-windows-default-theme) {
-    button,
-    #addressbookList {
-      -moz-appearance: none;
-      margin: 1px 4px;
-      padding: 1px 5px !important;
-      border: 1px solid;
-    }
+  button,
+  #addressbookList {
+    background: var(--toolbarbutton-hover-background);
+    border-color: var(--toolbarbutton-hover-bordercolor);
+    box-shadow: var(--toolbarbutton-hover-boxshadow);
+    transition-property: background-color, border-color, box-shadow;
+    transition-duration: 150ms;
+  }
 
-    button,
-    #addressbookList {
-      background: var(--toolbarbutton-hover-background);
-      border-color: var(--toolbarbutton-hover-bordercolor);
-      box-shadow: var(--toolbarbutton-hover-boxshadow);
-      transition-property: background-color, border-color, box-shadow;
-      transition-duration: 150ms;
-    }
+  button:hover,
+  #addressbookList:not([open="true"]):hover {
+    background: var(--toolbarbutton-active-background);
+    border-color: var(--toolbarbutton-active-bordercolor);
+  }
 
-    button:hover,
-    #addressbookList:not([open="true"]):hover {
-      background: var(--toolbarbutton-active-background);
-      border-color: var(--toolbarbutton-active-bordercolor);
-    }
-
-    button:hover:active,
-    #addressbookList[open="true"] {
-      background: var(--toolbarbutton-active-background);
-      border-color: var(--toolbarbutton-active-bordercolor);
-      box-shadow: var(--toolbarbutton-active-boxshadow);
-      transition: none;
-    }
+  button:hover:active,
+  #addressbookList[open="true"] {
+    background: var(--toolbarbutton-active-background);
+    border-color: var(--toolbarbutton-active-bordercolor);
+    box-shadow: var(--toolbarbutton-active-boxshadow);
+    transition: none;
   }
 }
 
@@ -71,8 +69,7 @@
   }
 }
 
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) and (-moz-windows-default-theme) {
   #abContactsPanel {
     -moz-appearance: none;
     background-color: hsl(210, 75%, 92%);

mail/themes/windows/mail/addrbook/addressbook.css

@@ -21,6 +21,7 @@
   -moz-appearance:  none;
   background-color: -moz-Field;
   color: -moz-FieldText;
+  border-inline-end: 1px solid ThreeDHighlight;
 }
 
 #GeneratedName {
@@ -57,378 +58,143 @@
   min-width: 50px;
 }
 
-@media (-moz-os-version: windows-xp) {
-  /* ::::: primary toolbar buttons ::::: */
+/* :::: Toolbar :::: */
 
-  .toolbarbutton-1 {
-    min-width: 0;
-  }
+#ab-toolbox:not(:-moz-lwtheme) {
+  -moz-appearance: none;
+  background-color: -moz-Dialog;
+  border-top: none;
+  border-bottom: 1px solid ThreeDShadow;
+}
 
-  #button-newcard {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-    -moz-image-region: rect(0 24px 24px 0);
-  }
+toolbar:not(:-moz-lwtheme) {
+  -moz-appearance: none;
+  border: none;
+}
 
-  #button-newcard:hover {
-    -moz-image-region: rect(24px 24px 48px 0);
-  }
+#ab-toolbox > toolbar {
+  /* force iconsize="small" on these toolbars */
+  counter-reset: smallicons;
+}
 
-  #button-newcard:hover:active {
-    -moz-image-region: rect(24px 24px 48px 0);
-  }
+#ab-toolbox > toolbar:not([type="menubar"]) {
+  padding: 2px 1px;
+}
 
-  #button-newcard[disabled="true"] {
-    -moz-image-region: rect(48px 24px 72px 0) !important;
-  }
+#ab-toolbox > toolbar:not([type="menubar"]):-moz-lwtheme {
+  text-shadow: none;
+}
 
-  #button-newlist {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-    -moz-image-region: rect(0 48px 24px 24px);
-  }
+toolbox > toolbar:last-of-type {
+  padding-top: 1px;
+  padding-bottom: 1px;
+}
 
-  #button-newlist:hover {
-    -moz-image-region: rect(24px 48px 48px 24px);
-  }
+/* ::::: primary toolbar buttons ::::: */
 
-  #button-newlist[disabled="true"] {
-    -moz-image-region: rect(48px 48px 72px 24px) !important;
-  }
-
-  #button-editcard {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-    -moz-image-region: rect(0 72px 24px 48px);
-  }
-
-  #button-editcard:hover {
-    -moz-image-region: rect(24px 72px 48px 48px);
-  }
-
-  #button-editcard[disabled="true"] {
-    -moz-image-region: rect(48px 72px 72px 48px) !important;
-  }
-
-  #button-newmessage {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-    -moz-image-region: rect(0 96px 24px 72px);
-  }
-
-  #button-newmessage:hover {
-    -moz-image-region: rect(24px 96px 48px 72px);
-  }
-
-  #button-newmessage[disabled] {
-    -moz-image-region: rect(48px 96px 72px 72px) !important;
-  }
-
-  #button-newim {
-   list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-   -moz-image-region: rect(0 120px 24px 96px);
-  }
-
-  #button-newim:hover {
-    -moz-image-region: rect(24px 120px 48px 96px);
-  }
-
-  #button-newim[disabled] {
-    -moz-image-region: rect(48px 120px 72px 96px) !important;
-  }
-
-  #button-abdelete {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
-    -moz-image-region: rect(0 144px 24px 120px);
-  }
-
-  #button-abdelete:hover {
-    -moz-image-region: rect(24px 144px 48px 120px);
-  }
-
-  #button-abdelete[disabled] {
-    -moz-image-region: rect(48px 144px 72px 120px) !important;
-  }
-
-  /* ::::: small primary toolbar buttons ::::: */
-
-  toolbar[iconsize="small"] #button-newcard {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-    -moz-image-region: rect(0 16px 16px 0);
-  }
-
-  toolbar[iconsize="small"] #button-newcard:hover {
-    -moz-image-region: rect(16px 16px 32px 0);
-  }
-
-  toolbar[iconsize="small"] #button-newcard[disabled] {
-    -moz-image-region: rect(32px 16px 48px 0) !important;
-  }
-
-  toolbar[iconsize="small"] #button-newlist {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-    -moz-image-region: rect(0 32px 16px 16px);
-  }
-
-  toolbar[iconsize="small"] #button-newlist:hover {
-    -moz-image-region: rect(16px 32px 32px 16px);
-  }
-
-  toolbar[iconsize="small"] #button-newlist[disabled] {
-     -moz-image-region: rect(32px 32px 48px 16px) !important;
-  }
-
-  toolbar[iconsize="small"] #button-editcard {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-    -moz-image-region: rect(0 48px 16px 32px);
-  }
-
-  toolbar[iconsize="small"] #button-editcard:hover {
-    -moz-image-region: rect(16px 48px 32px 32px);
-  }
-
-  toolbar[iconsize="small"] #button-editcard[disabled="true"] {
-    -moz-image-region: rect(32px 48px 48px 32px) !important;
-  }
-
-  toolbar[iconsize="small"] #button-newmessage {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-    -moz-image-region: rect(0 64px 16px 48px);
-  }
-
-  toolbar[iconsize="small"] #button-newmessage:hover {
-    -moz-image-region: rect(16px 64px 32px 48px);
-  }
-
-  toolbar[iconsize="small"] #button-newmessage[disabled] {
-    -moz-image-region: rect(32px 64px 48px 48px) !important;
-  }
-
-  toolbar[iconsize="small"] #button-newim {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-    -moz-image-region: rect(0 80px 16px 64px);
-  }
-
-  toolbar[iconsize="small"] #button-newim:hover {
-    -moz-image-region: rect(16px 80px 32px 64px);
-  }
-
-  toolbar[iconsize="small"] #button-newim[disabled] {
-    -moz-image-region: rect(32px 80px 48px 64px) !important;
-  }
-
-  toolbar[iconsize="small"] #button-abdelete {
-     list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png");
-    -moz-image-region: rect(0 96px 16px 80px);
-  }
-
-  toolbar[iconsize="small"] #button-abdelete:hover {
-    -moz-image-region: rect(16px 96px 32px 80px);
-  }
-
-  toolbar[iconsize="small"] #button-abdelete[disabled] {
-    -moz-image-region: rect(32px 96px 48px 80px) !important;
-  }
-
-  #abContent {
-    border-top: 1px solid ThreeDShadow;
-  }
-
-  /* ::::: directory pane adjustments ::::: */
-
-  /* Don't use the listbox appearance as that gives us a blue-grey top border
-     that collides with the primary toolbar border */
-  #dirTree {
-    -moz-appearance:  none;
-    background-color: -moz-Field;
-    color: -moz-FieldText;
-  }
-
-  /* ::::: splitters ::::: */
-
-  #results-splitter {
-    margin-inline-start: -1px;
-  }
-
-  #dirTree-splitter:-moz-locale-dir(rtl) {
-    /* Don't draw the splitter's border here... */
-    border-left: 0;
-  }
-
-  #abResultsTree:-moz-locale-dir(rtl),
-  #CardViewOuterBox:-moz-locale-dir(rtl){
-    /* ... draw it here instead! (This removes the white highlight just below the
-       folder pane splitter so everything looks pretty.) */
-    margin-right: -2px !important;
-    border-right: 2px solid;
-    -moz-border-right-colors: ThreeDHighlight ThreeDShadow;
-  }
-
-  #abResultsTree:-moz-locale-dir(rtl) {
-    /* Make sure we have a white dot in the top-left corner where the splitters
-       meet. */
-    margin-bottom: -2px;
-    padding-bottom: 2px;
-  }
-
-  /* ::::: results pane ::::: */
-
-  .CardViewHeading {
-    padding: 1px;
-    padding-inline-start: 5px;
-    background-color: Highlight;
-    color: HighlightText;
-    font-weight: bold;
-    min-width: 30px;
-  }
-
-  #cvHomeMapIt,
-  #cvWorkMapIt {
-    margin-bottom: 0;
+@media (-moz-windows-default-theme) {
+  sidebarheader {
+    -moz-appearance: none;
+    background-color: #f8f8f8;
+    border-top: 0;
+    border-bottom: 1px solid #a9b1b8;
   }
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  /* :::: Toolbar :::: */
+#button-newcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard");
+}
 
-  #ab-toolbox:not(:-moz-lwtheme) {
-    -moz-appearance: none;
-    background-color: -moz-Dialog;
-    border-top: none;
-    border-bottom: 1px solid ThreeDShadow;
-  }
+#button-newlist {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newlist");
+}
 
-  toolbar:not(:-moz-lwtheme) {
-    -moz-appearance: none;
-    border: none;
-  }
+#button-editcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#editcard");
+}
 
-  #ab-toolbox > toolbar {
-    /* force iconsize="small" on these toolbars */
-    counter-reset: smallicons;
-  }
+#button-newmessage {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newmessage");
+}
 
-  #ab-toolbox > toolbar:not([type="menubar"]) {
-    padding: 2px 1px;
-  }
+#button-newim {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newim");
+}
 
-  #ab-toolbox > toolbar:not([type="menubar"]):-moz-lwtheme {
-    text-shadow: none;
-  }
+#button-abdelete {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#abdelete");
+}
 
-  toolbox > toolbar:last-of-type {
-    padding-top: 1px;
-    padding-bottom: 1px;
-  }
+#ab-bar2[brighttext] #button-newcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard-inverted");
+}
 
-  /* ::::: primary toolbar buttons ::::: */
+#ab-bar2[brighttext] #button-newlist {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newlist-inverted");
+}
 
-  @media (-moz-windows-default-theme) {
-    sidebarheader {
-      -moz-appearance: none;
-      background-color: #f8f8f8;
-      border-top: 0;
-      border-bottom: 1px solid #a9b1b8;
-    }
-  }
+#ab-bar2[brighttext] #button-editcard {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#editcard-inverted");
+}
 
-  #button-newcard {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard");
-  }
+#ab-bar2[brighttext] #button-newmessage {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newmessage-inverted");
+}
 
-  #button-newlist {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newlist");
-  }
+#ab-bar2[brighttext] #button-newim {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newim-inverted");
+}
 
-  #button-editcard {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#editcard");
-  }
+#ab-bar2[brighttext] #button-abdelete {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#abdelete-inverted");
+}
 
-  #button-newmessage {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newmessage");
-  }
+/* ::::: Search Textbox ::::: */
 
-  #button-newim {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newim");
-  }
+#peopleSearchInput {
+  width: 20em;
+  padding-top: 3px;
+  padding-bottom: 3px;
+  padding-inline-start: 5px;
+}
 
-  #button-abdelete {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#abdelete");
-  }
+/* ::::: directory pane adjustments ::::: */
 
-  #ab-bar2[brighttext] #button-newcard {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard-inverted");
-  }
+/* Don't use the listbox appearance as that gives us a blue-grey top border
+   that collides with the primary toolbar border */
+#dirTree {
+  border-inline-end: 1px solid transparent;
+}
 
-  #ab-bar2[brighttext] #button-newlist {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newlist-inverted");
-  }
+/* ::::: splitters ::::: */
 
-  #ab-bar2[brighttext] #button-editcard {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#editcard-inverted");
-  }
+#dirTree-splitter {
+  border: none;
+  border-inline-end: 1px solid #a9b7c9;
+  min-width: 0;
+  width: 3px;
+  background-color: transparent;
+  margin-inline-start: -3px;
+  position: relative;
+  z-index: 10;
+}
 
-  #ab-bar2[brighttext] #button-newmessage {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newmessage-inverted");
-  }
+#results-splitter {
+  border: none;
+  border-top: 1px solid #a9b7c9;
+  min-height: 0;
+  height: 3px;
+  background-color: transparent;
+  margin-bottom: -3px;
+  position: relative;
+  z-index: 10;
+}
 
-  #ab-bar2[brighttext] #button-newim {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newim-inverted");
-  }
+/* ::::: card view pane ::::: */
 
-  #ab-bar2[brighttext] #button-abdelete {
-    list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#abdelete-inverted");
-  }
-
-  /* ::::: Search Textbox ::::: */
-
-  #peopleSearchInput {
-    width: 20em;
-    padding-top: 3px;
-    padding-bottom: 3px;
-    padding-inline-start: 5px;
-  }
-
-  /* ::::: directory pane adjustments ::::: */
-
-  /* Don't use the listbox appearance as that gives us a blue-grey top border
-     that collides with the primary toolbar border */
-  #dirTree {
-    border-inline-end: 1px solid transparent;
-  }
-
-  /* ::::: splitters ::::: */
-
-  #dirTree-splitter {
-    border: none;
-    border-inline-end: 1px solid #a9b7c9;
-    min-width: 0;
-    width: 3px;
-    background-color: transparent;
-    margin-inline-start: -3px;
-    position: relative;
-    z-index: 10;
-  }
-
-  #results-splitter {
-    border: none;
-    border-top: 1px solid #a9b7c9;
-    min-height: 0;
-    height: 3px;
-    background-color: transparent;
-    margin-bottom: -3px;
-    position: relative;
-    z-index: 10;
-  }
-
-  /* ::::: results pane ::::: */
-
-  #abResultsTree {
-    border-inline-end: 1px solid ThreeDHighlight;
-  }
-
-  /* ::::: card view pane ::::: */
-
-  #CardViewOuterBox {
-    border: none;
-    border-top: 1px solid ThreeDShadow;
-  }
+#CardViewOuterBox {
+  border: none;
+  border-top: 1px solid ThreeDShadow;
 }
 
 @media (-moz-windows-glass) {
@@ -439,16 +205,14 @@
   }
 }
 
-@media (-moz-os-version: windows-vista),
-        (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) {
   #ab-toolbox:not(:-moz-lwtheme) {
   background-image: linear-gradient(rgba(255, 255, 255, .5),
                     rgba(255, 255, 255, 0));
   }
 }
 
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) and (-moz-windows-default-theme) {
   #ab-toolbox:not(:-moz-lwtheme) {
     background-color: hsl(210, 75%, 92%);
   }
@@ -465,14 +229,14 @@
   }
 }
 
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+@media (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
   #dirTree {
     background-color: #fafafa;
   }
 }
 
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
+@media (-moz-os-version: windows-win8) and (-moz-windows-default-theme),
+       (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
   #button-newcard {
     list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.svg#newcard-flat");
   }

mail/themes/windows/mail/cloudfile/addAccountDialog.css

@@ -29,18 +29,7 @@ a {
 .small-indent {
   margin-bottom: 15px;
   margin-inline-start: 6px;
-}
-
-@media (-moz-os-version: windows-xp) {
-  .small-indent {
-    margin-inline-end: 5px;
-  }
-}
-
-@media not all and (-moz-os-version: windows-xp) {
-  .small-indent {
-    margin-inline-end: 6px;
-  }
+  margin-inline-end: 6px;
 }
 
 #accountType {
@@ -110,10 +99,7 @@ a {
   float: right;
 }
 
-@media (-moz-windows-default-theme) and  (-moz-os-version: windows-vista),
-       (-moz-windows-default-theme) and  (-moz-os-version: windows-win7),
-       (-moz-windows-default-theme) and  (-moz-os-version: windows-win8),
-       (-moz-windows-default-theme) and  (-moz-os-version: windows-win10) {
+@media (-moz-windows-default-theme) {
   #accountType {
     height: 26px;
     /* We have to be a stickler about the width here, or else we get
@@ -124,6 +110,6 @@ a {
   }
 
   #provider-form label {
-    margin-left: 0px;
+    margin-left: 0;
   }
 }

mail/themes/windows/mail/downloads/aboutDownloads.css

@@ -36,25 +36,14 @@
   padding-inline-start: 5px;
 }
 
-@media (-moz-os-version: windows-xp) {
-  #msgDownloadsRichListBox > richlistitem.download {
-    padding: 5px 8px;
-  }
-}
-
 .fileTypeIcon {
+  margin-inline-start: 8px;
   margin-inline-end: 8px;
   /* explicitly size the icon, so size doesn't vary on hidpi systems */
   height: 32px;
   width: 32px;
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  .fileTypeIcon {
-    margin-inline-start: 8px;
-  }
-}
-
 .fileName {
   margin-bottom: 3px;
   cursor: inherit;
@@ -67,32 +56,30 @@
   cursor: inherit;
 }
 
-@media not all and (-moz-os-version: windows-xp) {
-  @media (-moz-windows-default-theme) {
-    /*
-    -moz-appearance: menuitem is almost right, but the hover effect is not
-    transparent and is lighter than desired.
+@media (-moz-windows-default-theme) {
+  /*
+  -moz-appearance: menuitem is almost right, but the hover effect is not
+  transparent and is lighter than desired.
 
-    Copied from the autocomplete richlistbox styling in
-    toolkit/themes/windows/global/autocomplete.css
+  Copied from the autocomplete richlistbox styling in
+  toolkit/themes/windows/global/autocomplete.css
 
-    This styling should be kept in sync with the style from the above file.
-    */
-    #msgDownloadsRichListBox > richlistitem.download[selected] {
-      color: inherit;
-      background-color: transparent;
-      /* four gradients for the bevel highlights on each edge, one for blue background */
-      background-image:
-        linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, transparent 3px),
-        linear-gradient(to right, rgba(255,255,255,0.5) 3px, transparent 3px),
-        linear-gradient(to left, rgba(255,255,255,0.5) 3px, transparent 3px),
-        linear-gradient(to top, rgba(255,255,255,0.4) 3px, transparent 3px),
-        linear-gradient(to bottom, rgba(163,196,247,0.3), rgba(122,180,246,0.3));
-      background-clip: content-box;
-      border-radius: 6px;
-      outline: 1px solid rgb(124,163,206);
-      -moz-outline-radius: 3px;
-      outline-offset: -2px;
-    }
+  This styling should be kept in sync with the style from the above file.
+  */
+  #msgDownloadsRichListBox > richlistitem.download[selected] {
+    color: inherit;
+    background-color: transparent;
+    /* four gradients for the bevel highlights on each edge, one for blue background */
+    background-image:
+      linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, transparent 3px),
+      linear-gradient(to right, rgba(255,255,255,0.5) 3px, transparent 3px),
+      linear-gradient(to left, rgba(255,255,255,0.5) 3px, transparent 3px),
+      linear-gradient(to top, rgba(255,255,255,0.4) 3px, transparent 3px),
+      linear-gradient(to bottom, rgba(163,196,247,0.3), rgba(122,180,246,0.3));
+    background-clip: content-box;
+    border-radius: 6px;
+    outline: 1px solid rgb(124,163,206);
+    -moz-outline-radius: 3px;
+    outline-offset: -2px;
   }
 }