--- a/calendar/base/themes/windows/win-aero/calendar.css
+++ b/calendar/base/themes/windows/win-aero/calendar.css
@@ -95,18 +95,18 @@
#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);
}
}
-/* Win8 and beyond. */
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+@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);
--- a/mail/themes/windows/mail/addrbook/abContactsPanel-aero.css
+++ b/mail/themes/windows/mail/addrbook/abContactsPanel-aero.css
@@ -70,17 +70,18 @@
box-shadow: 0 1px 1px hsla(210, 54%, 20%, .1) inset,
0 0 1px hsla(210, 54%, 20%, .2) inset,
0 1px 0 hsla(210, 54%, 20%, 0),
0 0 2px hsla(210, 54%, 20%, 0);
transition: none;
}
}
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+ (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
button,
#addressbookList {
background-color: hsla(210, 4%, 10%, .08);
border-color: hsla(210, 4%, 10%, .1);
transition-property: background-color, border-color;
transition-duration: 150ms;
}
--- a/mail/themes/windows/mail/addrbook/addressbook-aero.css
+++ b/mail/themes/windows/mail/addrbook/addressbook-aero.css
@@ -158,17 +158,18 @@ toolbox[labelalign="end"] .toolbarbutton
}
.toolbarbutton-1[checked=true]:not(:active):hover {
background-color: rgba(90%, 90%, 90%, .4);
transition: background-color .4s;
}
}
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+ (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
.toolbarbutton-1:not([type="menu-button"]),
.toolbarbutton-1 > .toolbarbutton-menubutton-button,
.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-moz-appearance: none;
border: 1px solid;
border-color: transparent;
transition-property: background-color, border-color;
transition-duration: 150ms;
@@ -379,18 +380,18 @@ toolbox[labelalign="end"] > toolbar[mode
}
#peopleSearchInput[focused] {
border-color: hsla(206, 100%, 60%, .65) hsla(206, 100%, 55%, .65)
hsla(206, 100%, 50%, .65);
}
}
-/* Win8 and beyond. */
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+ (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
#peopleSearchInput: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;
--- a/mail/themes/windows/mail/attachmentList-aero.css
+++ b/mail/themes/windows/mail/attachmentList-aero.css
@@ -122,17 +122,18 @@
}
attachmentitem:hover {
background-image: linear-gradient(rgba(131, 183, 249, 0.05),
rgba(131, 183, 249, 0.16));
}
}
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+ (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
attachmentitem {
padding: 1px;
border-width: 1px;
}
attachmentitem[selected="true"] {
background-image: linear-gradient(rgba(190, 190, 190, 0.4),
rgba(190, 190, 190, 0.4));
--- a/mail/themes/windows/mail/chat-aero.css
+++ b/mail/themes/windows/mail/chat-aero.css
@@ -207,17 +207,18 @@
}
#contactlistbox:focus > :-moz-any(imconv, imcontact, imgroup)[selected] {
background-image: linear-gradient(rgba(131, 183, 249, .16),
rgba(131, 183, 249, .375));
}
}
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+ (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
.statusMessageToolbarItem {
border-radius: 0;
}
#listPaneBox {
background-color: -moz-Dialog;
}
--- a/mail/themes/windows/mail/compose/messengercompose-aero.css
+++ b/mail/themes/windows/mail/compose/messengercompose-aero.css
@@ -243,17 +243,18 @@ toolbox[labelalign="end"] .toolbarbutton
}
.toolbarbutton-1[checked=true]:not(:active):hover {
background-color: rgba(90%, 90%, 90%, .4);
transition: background-color .4s;
}
}
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+ (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
.findbar-button,
.toolbarbutton-1:not([type="menu-button"]),
.toolbarbutton-1 > .toolbarbutton-menubutton-button,
.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-moz-appearance: none;
border: 1px solid;
border-color: transparent;
transition-property: background-color, border-color;
@@ -784,17 +785,18 @@ treechildren::-moz-tree-image(subscribed
border-color: rgba(23, 51, 78, .08) rgba(23, 51, 78, .12)
rgba(23, 51, 78, .1);
background-image: linear-gradient(hsla(0, 0%, 100%, .2),
hsla(0, 0%, 100%, .1));
box-shadow: none;
}
}
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+ (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
.aw-menulist {
margin: 1px;
-moz-margin-end: 4px;
padding: 2px 0 !important;
background-color: hsla(210, 4%, 10%, .04);
border-color: hsla(210, 4%, 10%, .05);
}
}
--- a/mail/themes/windows/mail/mailWindow1-aero.css
+++ b/mail/themes/windows/mail/mailWindow1-aero.css
@@ -11,19 +11,30 @@
.titlebar-button {
display: none;
}
#messengerWindow[sizemode="maximized"] #titlebar-buttonbox {
-moz-margin-end: 3px;
}
- #messengerWindow {
- -moz-appearance: -moz-win-borderless-glass;
- background: transparent;
+ @media (-moz-os-version: windows-vista),
+ (-moz-os-version: windows-win7) {
+ #messengerWindow {
+ -moz-appearance: -moz-win-borderless-glass;
+ background-color: transparent;
+ }
+ }
+
+ @media (-moz-os-version: windows-win8),
+ (-moz-os-version: windows-win10) {
+ #messengerWindow {
+ -moz-appearance: -moz-win-glass;
+ background-color: transparent;
+ }
}
/* Artificially draw window borders that are covered by lwtheme,
see bug 591930. */
#messengerWindow[sizemode="normal"] > #titlebar >
#titlebar-content:-moz-lwtheme {
border-top: 2px solid;
-moz-border-top-colors: rgb(37, 44, 51) rgba(255, 255, 255, 0.6);
@@ -264,17 +275,18 @@ treechildren::-moz-tree-image(junkStatus
0 0 1px hsla(210, 54%, 20%, .2) inset,
0 1px 0 hsla(210, 54%, 20%, 0),
0 0 2px hsla(210, 54%, 20%, 0);
text-shadow: none;
transition: none;
}
}
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+ (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
menulist {
background-color: hsla(210, 4%, 10%, .08);
border-color: hsla(210, 4%, 10%, .1);
transition-property: background-color, border-color;
transition-duration: 150ms;
}
menulist:not([disabled="true"]):not([open="true"]):hover {
@@ -333,23 +345,26 @@ treechildren::-moz-tree-image(junkStatus
@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
(-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
#status-bar {
background-color: hsl(210, 75%, 92%);
}
}
-@media (-moz-os-version: windows-win8) {
+@media (-moz-os-version: windows-win8),
+ (-moz-os-version: windows-win10) {
#folderTree {
background-color: -moz-Dialog;
}
}
-@media (-moz-windows-default-theme) and (-moz-windows-compositor) {
+@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) {
#messengerWindow[sizemode=normal] #tabpanelcontainer {
border: 1px solid rgba(10%, 10%, 10%, .4);
border-top: none;
background-clip: padding-box;
}
#messengerWindow[sizemode=normal] #mail-toolbar-menubar2 {
border-right: 1px solid rgba(10%, 10%, 10%, .4);
--- a/mail/themes/windows/mail/messageHeader-aero.css
+++ b/mail/themes/windows/mail/messageHeader-aero.css
@@ -237,17 +237,18 @@ toolbar[brighttext] #attachmentSaveAllMu
border-color: hsla(210, 54%, 20%, .4) hsla(210, 54%, 20%, .45)
hsla(210, 54%, 20%, .5);
background-color: hsla(210, 48%, 96%, .75);
box-shadow: 0 0 1px hsla(210, 54%, 20%, .1),
0 0 2px hsla(210, 54%, 20%, .1);
}
}
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+ (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
.toolbarbutton-1.msgHeaderView-button,
.toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-button,
.toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-dropmarker {
background-color: hsla(210, 4%, 10%, .08);
border-color: hsla(210, 4%, 10%, .1);
}
.toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) >
--- a/mail/themes/windows/mail/messenger-aero.css
+++ b/mail/themes/windows/mail/messenger-aero.css
@@ -103,18 +103,18 @@ treechildren::-moz-tree-cell-text {
background-color: rgba(255, 255, 255, .898);
}
#tabbar-toolbar #searchInput:not(:-moz-lwtheme)[focused="true"] {
background-color: white;
}
}
-/* Win8 and beyond. */
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+ (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
#searchInput:not(:-moz-lwtheme),
#IMSearchInput:not(:-moz-lwtheme),
.remote-gloda-search: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,
--- a/mail/themes/windows/mail/primaryToolbar-aero.css
+++ b/mail/themes/windows/mail/primaryToolbar-aero.css
@@ -140,17 +140,18 @@
}
.toolbarbutton-1[checked=true]:not(:active):hover {
background-color: rgba(90%, 90%, 90%, .4);
transition: background-color .4s;
}
}
-@media (-moz-os-version: windows-win8) {
+@media (-moz-os-version: windows-win8),
+ (-moz-os-version: windows-win10) {
.findbar-button,
.toolbarbutton-1:not([type="menu-button"]),
.toolbarbutton-1 > .toolbarbutton-menubutton-button,
.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
-moz-appearance: none;
border: 1px solid;
border-color: transparent;
transition-property: background-color, border-color;
@@ -452,17 +453,18 @@ toolbox[labelalign="end"] > toolbar[mode
}
}
#print-preview-toolbar:not(:-moz-lwtheme) {
-moz-appearance: -moz-win-browsertabbar-toolbox;
}
}
-@media (-moz-os-version: windows-win8) {
+@media (-moz-os-version: windows-win8),
+ (-moz-os-version: windows-win10) {
@media not all and (-moz-windows-default-theme) {
#messengerWindow:not([tabsintitlebar]) #tabs-toolbar:not(:-moz-lwtheme),
#messengerWindow:not([tabsintitlebar]) #mail-menubar >
menu:not(:-moz-lwtheme) {
color: CaptionText;
}
#messengerWindow:not([tabsintitlebar])
@@ -643,17 +645,18 @@ toolbar[iconsize="large"]:not([mode="tex
}
/* AppMenu styling */
.splitmenu-menuitem {
-moz-padding-end: 0.5em;
}
-@media (-moz-os-version: windows-win8) {
+@media (-moz-os-version: windows-win8),
+ (-moz-os-version: windows-win10) {
#appmenuSecondaryPane {
--appMenu-bg-color: -moz-dialog;
--appMenu-bg-box-shadow: ThreeDShadow;
}
}
@media (-moz-windows-default-theme) {
#appmenuPrimaryPane menupopup {
--- a/mail/themes/windows/mail/quickFilterBar-aero.css
+++ b/mail/themes/windows/mail/quickFilterBar-aero.css
@@ -225,18 +225,18 @@
}
#qfb-qs-textbox[focused] {
border-color: hsla(206, 100%, 60%, .65) hsla(206, 100%, 55%, .65)
hsla(206, 100%, 50%, .65);
}
}
-/* Win8 and beyond. */
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
+ (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
#qfb-qs-textbox: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;
--- a/mail/themes/windows/mail/tabmail-aero.css
+++ b/mail/themes/windows/mail/tabmail-aero.css
@@ -9,17 +9,18 @@
@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
(-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
.tab-background-middle[selected=true]:not(:-moz-lwtheme) {
background-color: var(--customToolbarColor);
}
}
-@media (-moz-os-version: windows-win8) {
+@media (-moz-os-version: windows-win8),
+ (-moz-os-version: windows-win10) {
@media not all and (-moz-windows-default-theme) {
#tabs-toolbar:not(:-moz-lwtheme) {
color: CaptionText;
}
#tabs-toolbar:not(:-moz-lwtheme):-moz-window-inactive,
#messengerWindow:not([tabsintitlebar])
.tabmail-tab:not([selected]):not(:-moz-lwtheme):-moz-window-inactive {
@@ -56,17 +57,16 @@
list-style-image: url(chrome://messenger/skin/icons/mainwindow-dropdown-arrow.png);
-moz-image-region: rect(0, 13px, 11px, 0);
}
#tabs-toolbar[brighttext] .tabs-alltabs-button {
list-style-image: url(chrome://messenger/skin/icons/mainwindow-dropdown-arrow-inverted.png);
}
-/* Apply only on Win8 */
@media (-moz-windows-default-theme) and (-moz-os-version: windows-win8) {
#messengerWindow[darkwindowframe="true"]
#tabs-toolbar:not(:-moz-lwtheme):not(:-moz-window-inactive),
#messengerWindow[darkwindowframe="true"]
.tabmail-tab:not([selected="true"]):not(:-moz-lwtheme):not(:-moz-window-inactive) {
color: white;
}
