diff --git a/toolkit/themes/windows/global/arrow/panelarrow-horizontal-themed.svg b/toolkit/themes/windows/global/arrow/panelarrow-horizontal-themed.svg new file mode 100644 index 00000000000..19398675ed3 --- /dev/null +++ b/toolkit/themes/windows/global/arrow/panelarrow-horizontal-themed.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/toolkit/themes/windows/global/arrow/panelarrow-horizontal-white.png b/toolkit/themes/windows/global/arrow/panelarrow-horizontal-white.png deleted file mode 100644 index 24f06bcd5e3..00000000000 Binary files a/toolkit/themes/windows/global/arrow/panelarrow-horizontal-white.png and /dev/null differ diff --git a/toolkit/themes/windows/global/arrow/panelarrow-horizontal.svg b/toolkit/themes/windows/global/arrow/panelarrow-horizontal.svg index 02a57f4de1b..dae46390f63 100644 --- a/toolkit/themes/windows/global/arrow/panelarrow-horizontal.svg +++ b/toolkit/themes/windows/global/arrow/panelarrow-horizontal.svg @@ -7,7 +7,7 @@ width="10" height="20"> + fill="hsla(210,4%,10%,.2)"/> + fill="-moz-field"/> diff --git a/toolkit/themes/windows/global/arrow/panelarrow-vertical-themed.svg b/toolkit/themes/windows/global/arrow/panelarrow-vertical-themed.svg new file mode 100644 index 00000000000..a2d3a95f1f8 --- /dev/null +++ b/toolkit/themes/windows/global/arrow/panelarrow-vertical-themed.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/toolkit/themes/windows/global/arrow/panelarrow-vertical-white.png b/toolkit/themes/windows/global/arrow/panelarrow-vertical-white.png deleted file mode 100644 index 91ba69db285..00000000000 Binary files a/toolkit/themes/windows/global/arrow/panelarrow-vertical-white.png and /dev/null differ diff --git a/toolkit/themes/windows/global/arrow/panelarrow-vertical.svg b/toolkit/themes/windows/global/arrow/panelarrow-vertical.svg index 4bcac9da33a..4e559ed354c 100644 --- a/toolkit/themes/windows/global/arrow/panelarrow-vertical.svg +++ b/toolkit/themes/windows/global/arrow/panelarrow-vertical.svg @@ -7,7 +7,7 @@ width="20" height="10"> + fill="hsla(210,4%,10%,.2)"/> + fill="-moz-field"/> diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn index db9cdb715e6..88e2f70a9b2 100644 --- a/toolkit/themes/windows/global/jar.mn +++ b/toolkit/themes/windows/global/jar.mn @@ -82,9 +82,9 @@ toolkit.jar: skin/classic/global/arrow/arrow-up-hov.gif (arrow/arrow-up-hov.gif) skin/classic/global/arrow/arrow-up-sharp.gif (arrow/arrow-up-sharp.gif) skin/classic/global/arrow/panelarrow-horizontal.svg (arrow/panelarrow-horizontal.svg) - skin/classic/global/arrow/panelarrow-horizontal-white.png (arrow/panelarrow-horizontal-white.png) skin/classic/global/arrow/panelarrow-vertical.svg (arrow/panelarrow-vertical.svg) - skin/classic/global/arrow/panelarrow-vertical-white.png (arrow/panelarrow-vertical-white.png) + skin/classic/global/arrow/panelarrow-horizontal-themed.svg (arrow/panelarrow-horizontal-themed.svg) + skin/classic/global/arrow/panelarrow-vertical-themed.svg (arrow/panelarrow-vertical-themed.svg) skin/classic/global/checkbox/cbox-check.gif (checkbox/cbox-check.gif) skin/classic/global/checkbox/cbox-check-dis.gif (checkbox/cbox-check-dis.gif) skin/classic/global/console/console.css (console/console.css) @@ -225,7 +225,7 @@ toolkit.jar: skin/classic/aero/global/numberbox.css * skin/classic/aero/global/notification.css (notification-aero.css) skin/classic/aero/global/passwordmgr.css -* skin/classic/aero/global/popup.css +* skin/classic/aero/global/popup.css (popup-aero.css) skin/classic/aero/global/preferences.css skin/classic/aero/global/printPageSetup.css skin/classic/aero/global/printPreview.css @@ -267,9 +267,9 @@ toolkit.jar: skin/classic/aero/global/arrow/arrow-up-hov.gif (arrow/arrow-up-hov.gif) skin/classic/aero/global/arrow/arrow-up-sharp.gif (arrow/arrow-up-sharp.gif) skin/classic/aero/global/arrow/panelarrow-horizontal.svg (arrow/panelarrow-horizontal.svg) - skin/classic/aero/global/arrow/panelarrow-horizontal-white.png (arrow/panelarrow-horizontal-white.png) skin/classic/aero/global/arrow/panelarrow-vertical.svg (arrow/panelarrow-vertical.svg) - skin/classic/aero/global/arrow/panelarrow-vertical-white.png (arrow/panelarrow-vertical-white.png) + skin/classic/aero/global/arrow/panelarrow-horizontal-themed.svg (arrow/panelarrow-horizontal-themed.svg) + skin/classic/aero/global/arrow/panelarrow-vertical-themed.svg (arrow/panelarrow-vertical-themed.svg) skin/classic/aero/global/checkbox/cbox-check.gif (checkbox/cbox-check.gif) skin/classic/aero/global/checkbox/cbox-check-dis.gif (checkbox/cbox-check-dis.gif) * skin/classic/aero/global/console/console.css (console/console-aero.css) diff --git a/toolkit/themes/windows/global/popup-aero.css b/toolkit/themes/windows/global/popup-aero.css new file mode 100644 index 00000000000..1fb3a166f62 --- /dev/null +++ b/toolkit/themes/windows/global/popup-aero.css @@ -0,0 +1,7 @@ +% 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/. + +%define WINDOWS_AERO +%include popup.css +%undef WINDOWS_AERO diff --git a/toolkit/themes/windows/global/popup.css b/toolkit/themes/windows/global/popup.css index 02e51dfdad4..bee1e35d9d3 100644 --- a/toolkit/themes/windows/global/popup.css +++ b/toolkit/themes/windows/global/popup.css @@ -75,18 +75,29 @@ panel[type="arrow"][side="right"] { } .panel-arrowcontent { - border-radius: 4px; - padding: 10px; - color: -moz-DialogText; - background: -moz-Dialog; + padding: 4px; + color: -moz-FieldText; + background: -moz-field; background-clip: padding-box; border: 1px solid ThreeDShadow; margin: 4px; } +%ifdef WINDOWS_AERO +@media (-moz-os-version: windows-vista), + (-moz-os-version: windows-win7) { +%endif +/* < Win8 */ +.panel-arrowcontent { + border-radius: 4px; +} +%ifdef WINDOWS_AERO +} +%endif + .panel-arrow[side="top"], .panel-arrow[side="bottom"] { - list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical.svg"); + list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical-themed.svg"); position: relative; margin-left: 10px; margin-right: 10px; @@ -103,7 +114,7 @@ panel[type="arrow"][side="right"] { .panel-arrow[side="left"], .panel-arrow[side="right"] { - list-style-image: url("chrome://global/skin/arrow/panelarrow-horizontal.svg"); + list-style-image: url("chrome://global/skin/arrow/panelarrow-horizontal-themed.svg"); position: relative; margin-top: 10px; margin-bottom: 10px; @@ -121,34 +132,19 @@ panel[type="arrow"][side="right"] { %ifdef XP_WIN @media (-moz-windows-default-theme) { .panel-arrowcontent { - border-color: rgba(0,0,0,.3); - box-shadow: 0 0 4px rgba(0,0,0,.3); - } - - .panel-arrowcontent[side="top"] { - background-image: linear-gradient(white 1px, rgba(255,255,255,0) 15px); - } - - .panel-arrowcontent[side="bottom"] { - background-image: linear-gradient(to top, white 1px, rgba(255,255,255,0) 15px); - } - - .panel-arrowcontent[side="left"] { - background-image: linear-gradient(to right, white 1px, rgba(255,255,255,0) 15px); - } - - .panel-arrowcontent[side="right"] { - background-image: linear-gradient(to left, white 1px, rgba(255,255,255,0) 15px); + border-color: hsla(210,4%,10%,.2); + box-shadow: 0 3px 5px hsla(210,4%,10%,.1), + 0 0 7px hsla(210,4%,10%,.1); } .panel-arrow[side="top"], .panel-arrow[side="bottom"] { - list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical-white.png"); + list-style-image: url("chrome://global/skin/arrow/panelarrow-vertical.svg"); } .panel-arrow[side="left"], .panel-arrow[side="right"] { - list-style-image: url("chrome://global/skin/arrow/panelarrow-horizontal-white.png"); + list-style-image: url("chrome://global/skin/arrow/panelarrow-horizontal.svg"); } } %endif diff --git a/toolkit/themes/windows/mozapps/extensions/extensions.css b/toolkit/themes/windows/mozapps/extensions/extensions.css index ef03128a58a..ccbd32bfd4f 100644 --- a/toolkit/themes/windows/mozapps/extensions/extensions.css +++ b/toolkit/themes/windows/mozapps/extensions/extensions.css @@ -299,11 +299,21 @@ #header-search { -moz-appearance: none; border: 1px solid rgba(0, 0, 0, 0.32); - border-radius: 2.5px; padding-bottom: 2px; background-color: rgba(255, 255, 255, 0.4); } +%ifdef WINDOWS_AERO +@media (-moz-os-version: windows-vista), + (-moz-os-version: windows-win7) { +%endif + #header-search { + border-radius: 2.5px; + } +%ifdef WINDOWS_AERO +} +%endif + #header-search:hover { background-color: rgba(255, 255, 255, .75); } @@ -1138,13 +1148,23 @@ button.button-link:not([disabled="true"]):active:hover { background: linear-gradient(rgba(251, 252, 253, 0.95), rgba(246, 247, 248, 0) 49%, rgba(211, 212, 213, 0.45) 51%, rgba(225, 226, 229, 0.3)); background-clip: padding-box; - border-radius: 2.5px; border: 1px solid rgba(31, 64, 100, 0.4); border-top-color: rgba(31, 64, 100, 0.3); box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.25) inset, 0 0 2px 1px rgba(255, 255, 255, 0.25) inset; } +%ifdef WINDOWS_AERO +@media (-moz-os-version: windows-vista), + (-moz-os-version: windows-win7) { +%endif + .header-button { + border-radius: 2.5px; + } +%ifdef WINDOWS_AERO +} +%endif + .header-button[disabled="true"] { opacity: 0.8; }