--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -164,17 +164,17 @@ chrome/en-US/locale/en-US/passwordmgr/pa
chrome/en-US/locale/en-US/pluginproblem/pluginproblem.dtd
chrome/toolkit/skin/classic/global/autocomplete.css
chrome/toolkit/skin/classic/global/button.css
chrome/toolkit/skin/classic/global/checkbox.css
chrome/toolkit/skin/classic/global/dialog.css
chrome/toolkit/skin/classic/global/dropmarker.css
chrome/toolkit/skin/classic/global/global.css
chrome/toolkit/skin/classic/global/groupbox.css
-chrome/toolkit/skin/classic/global/icons/close-XPVista7.png
+chrome/toolkit/skin/classic/global/icons/close-win7.png
chrome/toolkit/skin/classic/global/icons/tabprompts-bgtexture.png
chrome/toolkit/skin/classic/global/listbox.css
chrome/toolkit/skin/classic/global/media/clicktoplay-bgtexture.png
chrome/toolkit/skin/classic/global/menu.css
chrome/toolkit/skin/classic/global/menulist.css
chrome/toolkit/skin/classic/global/numberbox.css
chrome/toolkit/skin/classic/global/popup.css
chrome/toolkit/skin/classic/global/preferences.css
@@ -189,24 +189,22 @@ chrome/toolkit/skin/classic/global/spinb
chrome/toolkit/skin/classic/global/splitter.css
chrome/toolkit/skin/classic/global/tabbox.css
chrome/toolkit/skin/classic/global/textbox.css
chrome/toolkit/skin/classic/global/toolbar.css
chrome/toolkit/skin/classic/global/toolbarbutton.css
chrome/toolkit/skin/classic/global/tree.css
chrome/toolkit/skin/classic/global/wizard.css
chrome/toolkit/skin/classic/mozapps/downloads/buttons.png
-chrome/toolkit/skin/classic/mozapps/downloads/downloadButtons-XP.png
chrome/toolkit/skin/classic/mozapps/downloads/downloadButtons.png
chrome/toolkit/skin/classic/mozapps/extensions/category-dictionaries.png
chrome/toolkit/skin/classic/mozapps/extensions/category-experiments.png
chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.png
chrome/toolkit/skin/classic/mozapps/extensions/experimentGeneric.png
chrome/toolkit/skin/classic/mozapps/update/buttons.png
-chrome/toolkit/skin/classic/mozapps/update/downloadButtons-XP.png
chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
components/FxAccountsPush.js
crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib
# firefox/firefox-bin is bug 658850
firefox
firefox-bin
modules/FxAccountsPush.js
deleted file mode 100644
index c20f66ce624a4be9e4c1f5a050d6b66113b72245..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 335febbb3c86a2fc3e93dedd5fbb289f85de2104..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index dff60911f9aeadf997c613acd4912871fc507f4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 30c425c26b347190b99477699ec6bafd1016fc98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
rename from browser/themes/windows/Toolbar-aero.png
rename to browser/themes/windows/Toolbar-win7.png
rename from browser/themes/windows/Toolbar-aero@2x.png
rename to browser/themes/windows/Toolbar-win7@2x.png
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -41,18 +41,17 @@
margin-inline-end: -3px;
}
.menu-accel,
.menu-iconic-accel {
color: graytext;
}
- @media (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+ @media (-moz-os-version: windows-win7) {
.sidebar-header:not(:-moz-lwtheme),
#sidebar-header:not(:-moz-lwtheme) {
background-color: #EEF3FA;
}
.sidebar-splitter,
#appcontent ~ .sidebar-splitter {
border-color: #A9B7C9;
@@ -78,266 +77,260 @@
/* On win10, if we don't set this on the entire browser container including
* the sidebar, if the sidebar is open the accent color bleeds through in
* the titlebar */
#browser {
-moz-appearance: -moz-win-exclude-glass;
}
- @media not all and (-moz-os-version: windows-vista) {
- @media not all and (-moz-os-version: windows-win7) {
- @media not all and (-moz-os-version: windows-win8) {
- @media (-moz-windows-default-theme) {
- #main-window {
- background-color: hsl(0, 0%, 78%);
- }
-
- :root[tabsintitlebar] .tab-label:-moz-window-inactive {
- /* Calculated to match the opacity change of Windows Explorer
- titlebar text change for inactive windows. */
- opacity: .6;
- }
+ @media not all and (-moz-os-version: windows-win7) {
+ @media not all and (-moz-os-version: windows-win8) {
+ @media (-moz-windows-default-theme) {
+ #main-window {
+ background-color: hsl(0, 0%, 78%);
}
- @media (-moz-windows-default-theme: 0) {
- #main-window {
- background-color: transparent;
- }
+ :root[tabsintitlebar] .tab-label:-moz-window-inactive {
+ /* Calculated to match the opacity change of Windows Explorer
+ titlebar text change for inactive windows. */
+ opacity: .6;
}
+ }
- #titlebar-buttonbox,
- .titlebar-button {
- -moz-appearance: none !important;
+ @media (-moz-windows-default-theme: 0) {
+ #main-window {
+ background-color: transparent;
}
+ }
+ #titlebar-buttonbox,
+ .titlebar-button {
+ -moz-appearance: none !important;
+ }
+
+ .titlebar-button {
+ border: none;
+ margin: 0 !important;
+ padding: 10px 17px;
+ }
+
+ #main-window[sizemode=maximized] .titlebar-button {
+ padding-top: 8px;
+ padding-bottom: 8px;
+ }
+
+ .titlebar-button > .toolbarbutton-icon {
+ width: 12px;
+ height: 12px;
+ }
+
+ #titlebar-min {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize);
+ }
+
+ #titlebar-max {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize);
+ }
+
+ #main-window[sizemode="maximized"] #titlebar-max {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore);
+ }
+
+ #titlebar-close {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#close);
+ }
+ #titlebar-close:hover {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white);
+ }
+
+ #titlebar-min:-moz-lwtheme {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-themes);
+ }
+ #titlebar-max:-moz-lwtheme {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-themes);
+ }
+ #main-window[sizemode="maximized"] #titlebar-max:-moz-lwtheme {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-themes);
+ }
+ #titlebar-close:-moz-lwtheme {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-themes);
+ }
+
+
+ /* the 12px image renders a 10px icon, and the 10px upscaled gets rounded to 12.5, which
+ * rounds up to 13px, which makes the icon one pixel too big on 1.25dppx. Fix: */
+ @media (min-resolution: 1.20dppx) and (max-resolution: 1.45dppx) {
+ .titlebar-button > .toolbarbutton-icon {
+ width: 11.5px;
+ height: 11.5px;
+ }
+ }
+
+ /* 175% dpi should result in the same device pixel sizes as 150% dpi. */
+ @media (min-resolution: 1.70dppx) and (max-resolution: 1.95dppx) {
.titlebar-button {
- border: none;
- margin: 0 !important;
- padding: 10px 17px;
- }
-
- #main-window[sizemode=maximized] .titlebar-button {
- padding-top: 8px;
- padding-bottom: 8px;
+ padding-left: 14.1px;
+ padding-right: 14.1px;
}
.titlebar-button > .toolbarbutton-icon {
- width: 12px;
- height: 12px;
+ width: 10.8px;
+ height: 10.8px;
+ }
+ }
+
+ /* 225% dpi should result in the same device pixel sizes as 200% dpi. */
+ @media (min-resolution: 2.20dppx) and (max-resolution: 2.45dppx) {
+ .titlebar-button {
+ padding-left: 15.3333px;
+ padding-right: 15.3333px;
+ }
+
+ .titlebar-button > .toolbarbutton-icon {
+ width: 10.8px;
+ height: 10.8px;
+ }
+ }
+
+ /* 275% dpi should result in the same device pixel sizes as 250% dpi. */
+ @media (min-resolution: 2.70dppx) and (max-resolution: 2.95dppx) {
+ /* NB: todo: this should also change padding on the buttons
+ * themselves, but without a device to test this on, it's
+ * impossible to know by how much. */
+ .titlebar-button > .toolbarbutton-icon {
+ width: 10.8px;
+ height: 10.8px;
+ }
+ }
+
+ @media (-moz-windows-default-theme) {
+ .titlebar-button:hover {
+ background-color: hsla(0, 0%, 0%, .12);
+ }
+
+ .titlebar-button:hover:active {
+ background-color: hsla(0, 0%, 0%, .22);
+ }
+
+ .titlebar-button:not(:hover) > .toolbarbutton-icon:-moz-window-inactive {
+ opacity: 0.5;
+ }
+
+ #titlebar-close:hover {
+ background-color: hsl(355, 86%, 49%);
+ }
+
+ #titlebar-close:hover:active {
+ background-color: hsl(355, 82%, 69%);
+ }
+ }
+ @media (-moz-windows-default-theme: 0) {
+ .titlebar-button {
+ background-color: -moz-field;
+ }
+ .titlebar-button:hover {
+ background-color: Highlight;
}
#titlebar-min {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize);
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-highcontrast);
+ }
+ #titlebar-min:hover {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-highcontrast-hover);
}
#titlebar-max {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize);
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-highcontrast);
+ }
+ #titlebar-max:hover {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-highcontrast-hover);
}
#main-window[sizemode="maximized"] #titlebar-max {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore);
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-highcontrast);
+ }
+ #main-window[sizemode="maximized"] #titlebar-max:hover {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-highcontrast-hover);
}
#titlebar-close {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#close);
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highcontrast);
}
#titlebar-close:hover {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white);
- }
-
- #titlebar-min:-moz-lwtheme {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-themes);
- }
- #titlebar-max:-moz-lwtheme {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-themes);
- }
- #main-window[sizemode="maximized"] #titlebar-max:-moz-lwtheme {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-themes);
- }
- #titlebar-close:-moz-lwtheme {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-themes);
- }
-
-
- /* the 12px image renders a 10px icon, and the 10px upscaled gets rounded to 12.5, which
- * rounds up to 13px, which makes the icon one pixel too big on 1.25dppx. Fix: */
- @media (min-resolution: 1.20dppx) and (max-resolution: 1.45dppx) {
- .titlebar-button > .toolbarbutton-icon {
- width: 11.5px;
- height: 11.5px;
- }
- }
-
- /* 175% dpi should result in the same device pixel sizes as 150% dpi. */
- @media (min-resolution: 1.70dppx) and (max-resolution: 1.95dppx) {
- .titlebar-button {
- padding-left: 14.1px;
- padding-right: 14.1px;
- }
-
- .titlebar-button > .toolbarbutton-icon {
- width: 10.8px;
- height: 10.8px;
- }
- }
-
- /* 225% dpi should result in the same device pixel sizes as 200% dpi. */
- @media (min-resolution: 2.20dppx) and (max-resolution: 2.45dppx) {
- .titlebar-button {
- padding-left: 15.3333px;
- padding-right: 15.3333px;
- }
-
- .titlebar-button > .toolbarbutton-icon {
- width: 10.8px;
- height: 10.8px;
- }
- }
-
- /* 275% dpi should result in the same device pixel sizes as 250% dpi. */
- @media (min-resolution: 2.70dppx) and (max-resolution: 2.95dppx) {
- /* NB: todo: this should also change padding on the buttons
- * themselves, but without a device to test this on, it's
- * impossible to know by how much. */
- .titlebar-button > .toolbarbutton-icon {
- width: 10.8px;
- height: 10.8px;
- }
- }
-
- @media (-moz-windows-default-theme) {
- .titlebar-button:hover {
- background-color: hsla(0, 0%, 0%, .12);
- }
-
- .titlebar-button:hover:active {
- background-color: hsla(0, 0%, 0%, .22);
- }
-
- .titlebar-button:not(:hover) > .toolbarbutton-icon:-moz-window-inactive {
- opacity: 0.5;
- }
-
- #titlebar-close:hover {
- background-color: hsl(355, 86%, 49%);
- }
-
- #titlebar-close:hover:active {
- background-color: hsl(355, 82%, 69%);
- }
- }
- @media (-moz-windows-default-theme: 0) {
- .titlebar-button {
- background-color: -moz-field;
- }
- .titlebar-button:hover {
- background-color: Highlight;
- }
-
- #titlebar-min {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-highcontrast);
- }
- #titlebar-min:hover {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-highcontrast-hover);
- }
-
- #titlebar-max {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-highcontrast);
- }
- #titlebar-max:hover {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-highcontrast-hover);
- }
-
- #main-window[sizemode="maximized"] #titlebar-max {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-highcontrast);
- }
- #main-window[sizemode="maximized"] #titlebar-max:hover {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-highcontrast-hover);
- }
-
- #titlebar-close {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highcontrast);
- }
- #titlebar-close:hover {
- list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highcontrast-hover);
- }
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highcontrast-hover);
}
}
}
}
- @media (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7),
+ @media (-moz-os-version: windows-win7),
(-moz-os-version: windows-win8) {
#main-window[sizemode="maximized"] #titlebar-buttonbox {
margin-inline-end: 3px;
}
#main-window {
background-color: transparent;
-moz-appearance: -moz-win-borderless-glass;
}
/* These should be hidden w/ glass enabled. Windows draws its own buttons. */
.titlebar-button {
display: none;
}
/* The borders on the glass frame are ours, and inside #browser, and on
- * vista and win7 we want to make sure they are "glassy", so we can't use
- * #browser as the exclude-glass container. We use #appcontent instead. */
+ * win7 we want to make sure they are "glassy", so we can't use #browser
+ * as the exclude-glass container. We use #appcontent instead. */
#browser {
-moz-appearance: none;
}
#appcontent {
-moz-appearance: -moz-win-exclude-glass;
}
}
@media (-moz-os-version: windows-win8) {
/* Artificially draw window borders that are covered by lwtheme, see bug 591930.
- * Borders for vista/win7 are below, win10 doesn't need them. */
+ * Borders for win7 are below, win10 doesn't need them. */
#main-window[sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme {
border-top: 1px solid @toolbarShadowColor@;
}
}
@media (-moz-windows-default-theme) {
#toolbar-menubar:not(:-moz-lwtheme),
#TabsToolbar:not(:-moz-lwtheme) {
color: black;
}
#main-menubar > menu:not(:-moz-lwtheme) {
color: inherit;
}
/* Use a different color only on Windows 8 and higher for inactive windows.
- * On aero, the menubar fog disappears for inactive windows, and renders gray
+ * On Win 7, the menubar fog disappears for inactive windows, and renders gray
* illegible.
*/
- @media not all and (-moz-os-version: windows-vista) {
- @media not all and (-moz-os-version: windows-win7) {
- #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive {
- color: ThreeDShadow;
- }
+ @media not all and (-moz-os-version: windows-win7) {
+ #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive {
+ color: ThreeDShadow;
}
}
}
#main-window[darkwindowframe="true"] #toolbar-menubar:not(:-moz-lwtheme):not(:-moz-window-inactive),
#main-window[darkwindowframe="true"] #TabsToolbar:not(:-moz-lwtheme):not(:-moz-window-inactive) {
color: white;
}
- /* Show borders on vista through win8, but not on win10 and later: */
- @media (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7),
+ /* Show borders on Win 7 & 8, but not on 10 and later: */
+ @media (-moz-os-version: windows-win7),
(-moz-os-version: windows-win8) {
/* Vertical toolbar border */
#main-window:not([customizing])[sizemode=normal] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme),
#main-window:not([customizing])[sizemode=normal] #navigator-toolbox:-moz-lwtheme,
#main-window[customizing] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar) {
border-left: 1px solid @toolbarShadowColor@;
border-right: 1px solid @toolbarShadowColor@;
background-clip: padding-box;
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -124,18 +124,17 @@ toolbar:-moz-lwtheme {
#navigator-toolbox::after {
content: "";
display: -moz-box;
-moz-box-ordinal-group: 101; /* tabs toolbar is 100 */
border-bottom: 1px solid ThreeDShadow;
}
@media (-moz-windows-default-theme) {
- @media (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+ @media (-moz-os-version: windows-win7) {
#navigator-toolbox::after {
border-bottom-color: #aabccf;
}
}
@media (-moz-os-version: windows-win8),
(-moz-os-version: windows-win10) {
#navigator-toolbox::after {
@@ -153,19 +152,17 @@ toolbar:-moz-lwtheme {
border-style: none;
}
#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar) {
background-clip: padding-box;
background-image: linear-gradient(@toolbarHighlight@, @toolbarHighlight@);
}
-@media (-moz-os-version: windows-xp),
- (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) {
#nav-bar {
background-image: linear-gradient(@toolbarHighlight@, transparent) !important;
}
#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar) {
background-image: none;
}
}
@@ -308,74 +305,16 @@ toolbar:-moz-lwtheme {
/* End classic titlebar gradient */
#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) toolbarbutton:not(:-moz-lwtheme) {
color: inherit;
}
}
-/* Render a window top border for lwthemes on WinXP modern themes: */
-@media (-moz-windows-theme: luna-blue) {
- #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme {
- background-image: linear-gradient(to bottom,
- rgb(8, 49, 216) 0, rgb(8, 49, 216) 1px,
- rgb(15, 77, 227) 1px, rgb(15, 77, 227) 2px,
- rgb(22, 106, 238) 2px, rgb(22, 106, 238) 3px,
- rgb(8, 85, 221) 3px, rgb(8, 85, 221) 4px,
- transparent 4px);
- }
-
- #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme:-moz-window-inactive {
- background-image: linear-gradient(to bottom,
- rgb(91, 104, 205) 0, rgb(91, 104, 205) 1px,
- rgb(116, 128, 220) 1px, rgb(116, 128, 220) 2px,
- rgb(117, 140, 221) 2px, rgb(117, 140, 221) 4px,
- transparent 4px);
- }
-}
-
-@media (-moz-windows-theme: luna-silver) {
- #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme {
- background-image: linear-gradient(to bottom,
- rgb(102,102,126) 0, rgb(102,102,126) 1px,
- rgb(168,167,191) 1px, rgb(168,167,191) 2px,
- white 2px, white 3px,
- rgb(188,188,207) 3px, rgb(188,188,207) 4px,
- transparent 4px);
- }
-
- #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme:-moz-window-inactive {
- background-image: linear-gradient(to bottom,
- rgb(186,186,197) 0, rgb(186,186,197) 1px,
- rgb(236,238,245) 1px, rgb(236,238,245) 2px,
- white 2px, white 3px,
- rgb(215,215,227) 3px, rgb(215,215,227) 4px,
- transparent 4px);
- }
-}
-
-@media (-moz-windows-theme: luna-olive) {
- #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme {
- background-image: linear-gradient(to bottom,
- rgb(139,161,105) 0, rgb(139,161,105) 1px,
- rgb(171, 189, 133) 1px, rgb(171, 189, 133) 2px,
- rgb(164,178,127) 2px, rgb(164,178,127) 3px,
- transparent 3px);
- }
-
- #main-window[tabsintitlebar][sizemode="normal"] > #tab-view-deck > #browser-panel:-moz-lwtheme:-moz-window-inactive {
- background-image: linear-gradient(to bottom,
- rgb(207, 214, 188) 0, rgb(207, 214, 188) 1px,
- rgb(224, 226, 200) 1px, rgb(224, 226, 200) 2px,
- rgb(214, 216, 190) 2px, rgb(214, 216, 190) 3px,
- transparent 3px);
- }
-}
-
#TabsToolbar:not([collapsed="true"]) + #nav-bar {
/* Move up into the TabsToolbar for the inner highlight at the top of the nav-bar */
margin-top: calc(-1 * var(--navbar-tab-toolbar-highlight-overlap));
/* Position the toolbar above the bottom of background tabs */
position: relative;
z-index: 1;
}
@@ -396,22 +335,16 @@ toolbar:-moz-lwtheme {
#print-preview-toolbar:not(:-moz-lwtheme) {
-moz-appearance: toolbox;
}
#browser-bottombox:not(:-moz-lwtheme) {
background-color: -moz-dialog;
}
-@media (-moz-os-version: windows-xp) and (-moz-windows-default-theme) {
- #main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar {
- margin-top: 4px;
- }
-}
-
/* ::::: titlebar ::::: */
#main-window[sizemode="normal"] > #titlebar {
-moz-appearance: -moz-window-titlebar;
}
#main-window[sizemode="maximized"] > #titlebar {
-moz-appearance: -moz-window-titlebar-maximized;
@@ -422,32 +355,26 @@ toolbar:-moz-lwtheme {
margin-top: 4px;
}
}
/* The button box must appear on top of the navigator-toolbox in order for
* click and hover mouse events to work properly for the button in the restored
* window state. Otherwise, elements in the navigator-toolbox, like the menubar,
* can swallow those events. It will also place the buttons above the fog on
- * themes with Aero Glass.
+ * Windows 7 with Aero Glass.
*/
#titlebar-buttonbox {
z-index: 1;
}
.titlebar-placeholder[type="caption-buttons"] {
margin-left: 22px; /* space needed for Aero Snap */
}
-@media (-moz-os-version: windows-xp) {
- .titlebar-placeholder[type="caption-buttons"] {
- margin-left: 10px; /* less space needed on XP because there's no Aero Snap */
- }
-}
-
/* titlebar command buttons */
#titlebar-min {
-moz-appearance: -moz-window-button-minimize;
}
#titlebar-max {
-moz-appearance: -moz-window-button-maximize;
@@ -660,23 +587,16 @@ menuitem.bookmark-item {
.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text {
opacity: 0.7;
}
/* ::::: primary toolbar buttons ::::: */
%include ../shared/toolbarbuttons.inc.css
-@media (-moz-windows-theme: luna-silver) and (max-resolution: 1dppx) {
- :-moz-any(@primaryToolbarButtons@),
- #bookmarks-menu-button.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
- list-style-image: url("chrome://browser/skin/Toolbar-lunaSilver.png");
- }
-}
-
#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-icon,
#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker,
#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled=true] > .toolbarbutton-icon {
opacity: .4;
}
@@ -770,20 +690,17 @@ toolbar[brighttext] .toolbarbutton-1 > .
#nav-bar .toolbarbutton-1 > .toolbarbutton-icon,
#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
#nav-bar #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
/* horizontal padding + border + actual icon width */
max-width: 32px;
}
-@media (-moz-os-version: windows-xp),
- (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
- /* < Win8 */
+@media (-moz-os-version: windows-win7) {
:root {
--toolbarbutton-hover-background: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
--toolbarbutton-hover-bordercolor: hsla(210,54%,20%,.15) hsla(210,54%,20%,.2) hsla(210,54%,20%,.25);
--toolbarbutton-hover-boxshadow: 0 1px hsla(0,0%,100%,.3) inset,
0 1px hsla(210,54%,20%,.03),
0 0 2px hsla(210,54%,20%,.1);
--toolbarbutton-active-background: hsla(210,54%,20%,.15) linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
@@ -1091,19 +1008,17 @@ toolbar[brighttext] #minimize-button {
toolbar[brighttext] #restore-button {
list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-white);
}
toolbar[brighttext] #close-button {
list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white);
}
-@media (-moz-os-version: windows-xp),
- (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) {
#window-controls {
margin-inline-start: 4px;
}
#minimize-button,
#restore-button,
#close-button {
/* Important to ensure this applies even on toolbar[brighttext] */
@@ -1149,18 +1064,17 @@ toolbar[brighttext] #close-button {
-moz-image-region: rect(16px, 48px, 32px, 32px);
}
#close-button:hover:active {
-moz-image-region: rect(32px, 48px, 48px, 32px);
}
}
-@media (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) {
#window-controls {
-moz-box-align: start;
}
#minimize-button,
#restore-button,
#close-button {
-moz-appearance: none;
@@ -1194,18 +1108,17 @@ toolbar[brighttext] #close-button {
--urlbar-border-color-hover: var(--urlbar-border-color);
}
#navigator-toolbox:-moz-lwtheme {
--urlbar-border-color: var(--toolbarbutton-hover-bordercolor);
}
@media (-moz-windows-default-theme) {
- @media (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7),
+ @media (-moz-os-version: windows-win7),
(-moz-os-version: windows-win8) {
#main-window:not(:-moz-lwtheme) {
--urlbar-border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.27) hsla(210,54%,20%,.3);
--urlbar-border-color-hover: hsla(210,54%,20%,.35) hsla(210,54%,20%,.37) hsla(210,54%,20%,.4);
}
}
@media (-moz-os-version: windows-win10) {
@@ -1232,18 +1145,17 @@ toolbar[brighttext] #close-button {
}
@media (-moz-windows-default-theme) {
#urlbar,
.searchbar-textbox {
border-radius: 1px;
}
- @media (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7),
+ @media (-moz-os-version: windows-win7),
(-moz-os-version: windows-win8) {
#urlbar:not(:-moz-lwtheme),
.searchbar-textbox:not(:-moz-lwtheme) {
box-shadow: 0 1px 0 hsla(0,0%,0%,.01) inset,
0 1px 0 hsla(0,0%,100%,.1);
}
}
@@ -1256,21 +1168,19 @@ toolbar[brighttext] #close-button {
}
#urlbar:not(:-moz-lwtheme)[focused],
.searchbar-textbox:not(:-moz-lwtheme)[focused] {
box-shadow: 0 0 0 1px Highlight inset;
}
}
- @media not all and (-moz-os-version: windows-xp) {
- #urlbar:not(:-moz-lwtheme)[focused],
- .searchbar-textbox:not(:-moz-lwtheme)[focused] {
- border-color: Highlight;
- }
+ #urlbar:not(:-moz-lwtheme)[focused],
+ .searchbar-textbox:not(:-moz-lwtheme)[focused] {
+ border-color: Highlight;
}
}
@media (-moz-os-version: windows-win10) {
#urlbar,
.searchbar-textbox {
font-size: 1.15em;
min-height: 28px;
@@ -1972,19 +1882,17 @@ html|span.ac-emphasize-text-url {
}
@media (min-resolution: 1.1dppx) {
#sidebar-header > .close-icon:-moz-lwtheme-brighttext {
list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
}
}
-@media (-moz-os-version: windows-xp),
- (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) {
#sidebar-header > .close-icon {
padding-top: 4px;
padding-bottom: 4px;
}
}
.browserContainer > findbar {
background-color: -moz-dialog;
@@ -1995,49 +1903,38 @@ html|span.ac-emphasize-text-url {
/* Tabstrip */
#TabsToolbar {
min-height: 0;
padding: 0;
margin-bottom: calc(-1 * var(--tab-toolbar-navbar-overlap)); /* overlap the nav-bar's top border */
}
-@media (-moz-os-version: windows-xp) and (-moz-windows-default-theme) {
- #main-window[sizemode=normal] #TabsToolbar {
- padding-left: 2px;
- padding-right: 2px;
- }
-}
-
%include ../shared/tabs.inc.css
/* Remove border between tab strip and navigation toolbar on Windows 10+ */
-@media not all and (-moz-os-version: windows-xp) {
- @media not all and (-moz-os-version: windows-vista) {
- @media not all and (-moz-os-version: windows-win7) {
- @media not all and (-moz-os-version: windows-win8) {
- @media (-moz-windows-default-theme) {
- .tab-background-end[selected=true]::after,
- .tab-background-start[selected=true]::after {
- content: none;
- }
-
- #TabsToolbar {
- --tab-stroke-background-size: 0 0;
- }
-
- :root {
- --tab-toolbar-navbar-overlap: 0px;
- }
-
- #nav-bar {
- border-top-style: none !important;
- box-shadow: none;
- }
- }
+@media not all and (-moz-os-version: windows-win7) {
+ @media not all and (-moz-os-version: windows-win8) {
+ @media (-moz-windows-default-theme) {
+ .tab-background-end[selected=true]::after,
+ .tab-background-start[selected=true]::after {
+ content: none;
+ }
+
+ #TabsToolbar {
+ --tab-stroke-background-size: 0 0;
+ }
+
+ :root {
+ --tab-toolbar-navbar-overlap: 0px;
+ }
+
+ #nav-bar {
+ border-top-style: none !important;
+ box-shadow: none;
}
}
}
}
/* Invert the unhovered close tab icons on bright-text tabs */
@media not all and (min-resolution: 1.1dppx) {
.tab-close-button:-moz-lwtheme-brighttext,
@@ -2512,62 +2409,45 @@ notification.pluginVulnerable > .notific
#main-window[inFullscreen] #TabsToolbar > .private-browsing-indicator {
background: url("chrome://browser/skin/privatebrowsing-mask-titlebar.png") no-repeat center 0px;
margin-inline-end: 4px;
width: 40px;
height: 20px;
position: relative;
}
-@media (-moz-os-version: windows-xp) {
- @media not all and (-moz-windows-classic) {
- #private-browsing-indicator-titlebar > .private-browsing-indicator {
- background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-XPVista7-tall.png");
- height: 28px;
- }
-
- #main-window[sizemode="maximized"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
- top: -5px;
- }
- #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
- top: -1px;
- }
- }
-}
-
@media (-moz-windows-classic) {
/**
* We have to use top instead of background-position in this case, otherwise
* the bottom of the indicator would get cut off by the bounds of the
* private-browsing-indicator element.
*/
#main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
top: 4px;
}
}
-@media (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) {
@media (-moz-windows-glass) {
#main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
top: 1px;
}
#main-window[sizemode="maximized"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
top: -1px;
}
}
/**
* This next block targets Aero Basic, which has different positioning for the
* window caption buttons, and therefore needs to be special-cased.
*/
@media (-moz-windows-default-theme) {
@media (-moz-windows-compositor: 0) {
#main-window[sizemode="normal"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
- background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-XPVista7-tall.png");
+ background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-win7-tall.png");
height: 28px;
}
}
}
}
/* End private browsing indicators */
@@ -2590,29 +2470,24 @@ notification.pluginVulnerable > .notific
padding-bottom: 4px;
}
#context-sep-navigation {
margin-inline-start: -28px;
margin-top: -4px;
}
-
-@media not all and (-moz-os-version: windows-xp) {
%include browser-aero.css
-}
.browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent {
padding: 0;
overflow: hidden;
}
-@media (-moz-os-version: windows-xp),
- (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) {
.cui-widget-panelview[id^=PanelUI-webext-] {
border-radius: 4px;
}
}
.webextension-popup-browser {
border-radius: inherit;
}
--- a/browser/themes/windows/customizableui/panelUI.css
+++ b/browser/themes/windows/customizableui/panelUI.css
@@ -126,26 +126,22 @@ menu[disabled="true"].subviewbutton > .m
}
}
menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) {
transform: scaleX(-1);
}
/* Win8 and beyond. */
-@media not all and (-moz-os-version: windows-xp) {
- @media not all and (-moz-os-version: windows-vista) {
- @media not all and (-moz-os-version: windows-win7) {
- panelview .toolbarbutton-1,
- .subviewbutton,
- .widget-overflow-list .toolbarbutton-1,
- .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button,
- #BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
- #edit-controls@inAnyPanel@,
- #zoom-controls@inAnyPanel@,
- #edit-controls@inAnyPanel@ > toolbarbutton,
- #zoom-controls@inAnyPanel@ > toolbarbutton {
- border-radius: 0;
- }
- }
+@media not all and (-moz-os-version: windows-win7) {
+ panelview .toolbarbutton-1,
+ .subviewbutton,
+ .widget-overflow-list .toolbarbutton-1,
+ .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button,
+ #BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
+ #edit-controls@inAnyPanel@,
+ #zoom-controls@inAnyPanel@,
+ #edit-controls@inAnyPanel@ > toolbarbutton,
+ #zoom-controls@inAnyPanel@ > toolbarbutton {
+ border-radius: 0;
}
}
--- a/browser/themes/windows/devedition.css
+++ b/browser/themes/windows/devedition.css
@@ -11,17 +11,17 @@
:root[devtoolstheme="dark"],
:root[devtoolstheme="light"] {
/* Matches the #browser-border-start, #browser-border-end color */
--chrome-nav-bar-separator-color: rgba(10, 31, 51, 0.35);
}
/* The window background is white due to no accentcolor in the lightweight
theme. It can't be changed to transparent when there is no compositor
- (Win XP or 7 in classic / basic theme), or else dragging and focus become
+ (Win 7 in classic / basic theme), or else dragging and focus become
broken. So instead just show the normal titlebar in that case, and override
the window color as transparent when the compositor is available. */
@media (-moz-windows-compositor: 0) {
#main-window[tabsintitlebar] #titlebar:-moz-lwtheme {
visibility: visible;
}
#main-window {
@@ -111,19 +111,17 @@
@media (min-resolution: 1.1dppx) {
:root[devtoolstheme="dark"] .findbar-closebutton,
:root[devtoolstheme="dark"] #sidebar-header > .close-icon,
.tab-close-button[selected=true] {
list-style-image: url("chrome://global/skin/icons/close-inverted@2x.png");
}
}
-@media (-moz-os-version: windows-xp),
- (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7),
+@media (-moz-os-version: windows-win7),
(-moz-os-version: windows-win8) {
:root {
--space-above-tabbar: 15px;
}
/* It'd be nice if there was an element in the scrollbox's inner content
that collapsed to the current width of the tabs. Since there isn't we
need to handle overflowing and non-overflowing tabs separately.
@@ -258,18 +256,17 @@
/* The sidebar header has no background now that the background of the #browser-panel
* has no image and is transparent. Fix: */
.sidebar-header:-moz-lwtheme,
#sidebar-header {
background-color: var(--chrome-background-color);
color: var(--chrome-color);
}
-@media (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7),
+@media (-moz-os-version: windows-win7),
(-moz-os-version: windows-win8) {
/* And then we add them back on toolbars so that they don't look borderless: */
#main-window:not([customizing])[sizemode=normal] #navigator-toolbox::after,
#main-window:not([customizing])[sizemode=normal] #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar) {
border-left: 1px solid hsla(209,67%,12%,0.35);
border-right: 1px solid hsla(209,67%,12%,0.35);
}
}
--- a/browser/themes/windows/downloads/allDownloadsViewOverlay.css
+++ b/browser/themes/windows/downloads/allDownloadsViewOverlay.css
@@ -13,37 +13,35 @@
@media (-moz-windows-default-theme) {
.downloadProgress > .progress-bar {
background-color: #3c9af8;
}
}
/*** Highlighted list items ***/
-@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.
- */
- @itemFocused@ {
- 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.
+ */
+ @itemFocused@ {
+ 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;
}
}
rename from browser/themes/windows/downloads/download-glow-menuPanel-XPVista7.png
rename to browser/themes/windows/downloads/download-glow-menuPanel-win7.png
rename from browser/themes/windows/downloads/download-glow-XPVista7.png
rename to browser/themes/windows/downloads/download-glow-win7.png
--- a/browser/themes/windows/downloads/indicator.css
+++ b/browser/themes/windows/downloads/indicator.css
@@ -161,23 +161,19 @@ toolbar[brighttext] #downloads-button:no
#downloads-indicator-counter {
height: 9px;
margin: -3px 0px 0px 0px;
color: hsl(0,0%,30%);
text-shadow: hsla(0,0%,100%,.5) 0 1px;
font-size: 9px;
line-height: 9px;
text-align: center;
-}
-@media not all and (-moz-os-version: windows-xp) {
- #downloads-indicator-counter {
- /* Bug 812345 added this... */
- margin-bottom: -1px;
- }
+ /* Bug 812345 added this... */
+ margin-bottom: -1px;
}
toolbar[brighttext] #downloads-indicator-counter {
color: white;
text-shadow: 0 0 1px rgba(0,0,0,.7),
0 1px 1.5px rgba(0,0,0,.5);
}
deleted file mode 100644
index d0cafb1d4a1ade383553ed3855a6cc91e32059b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index dd7821f8dcf3f562a34af52cb6d810b1ebee391e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -10,137 +10,113 @@ browser.jar:
skin/classic/browser/aboutSyncTabs.css
* skin/classic/browser/syncedtabs/sidebar.css (syncedtabs/sidebar.css)
* skin/classic/browser/browser.css
* skin/classic/browser/devedition.css
* skin/classic/browser/browser-lightweightTheme.css
skin/classic/browser/caption-buttons.svg
skin/classic/browser/click-to-play-warning-stripes.png
skin/classic/browser/Info.png
- skin/classic/browser/Info-XP.png
skin/classic/browser/keyhole-forward-mask.svg
skin/classic/browser/livemark-folder.png
- skin/classic/browser/livemark-folder-XP.png
skin/classic/browser/menu-back.png
- skin/classic/browser/menu-back-XP.png
skin/classic/browser/menu-forward.png
- skin/classic/browser/menu-forward-XP.png
skin/classic/browser/menuPanel-customize.png
skin/classic/browser/menuPanel-customize@2x.png
skin/classic/browser/menuPanel-exit.png
skin/classic/browser/menuPanel-exit@2x.png
skin/classic/browser/menuPanel-help.png
skin/classic/browser/menuPanel-help@2x.png
skin/classic/browser/monitor.png
skin/classic/browser/monitor_16-10.png
skin/classic/browser/pageInfo.css
skin/classic/browser/pageInfo.png
- skin/classic/browser/pageInfo-XP.png
skin/classic/browser/privatebrowsing-mask-tabstrip.png
- skin/classic/browser/privatebrowsing-mask-tabstrip-XPVista7.png
+ skin/classic/browser/privatebrowsing-mask-tabstrip-win7.png
skin/classic/browser/privatebrowsing-mask-titlebar.png
- skin/classic/browser/privatebrowsing-mask-titlebar-XPVista7.png
- skin/classic/browser/privatebrowsing-mask-titlebar-XPVista7-tall.png
+ skin/classic/browser/privatebrowsing-mask-titlebar-win7.png
+ skin/classic/browser/privatebrowsing-mask-titlebar-win7-tall.png
skin/classic/browser/reload-stop-go.png
skin/classic/browser/reload-stop-go@2x.png
- skin/classic/browser/reload-stop-go-XPVista7.png
- skin/classic/browser/reload-stop-go-XPVista7@2x.png
+ skin/classic/browser/reload-stop-go-win7.png
+ skin/classic/browser/reload-stop-go-win7@2x.png
skin/classic/browser/searchbar.css
skin/classic/browser/setDesktopBackground.css
skin/classic/browser/slowStartup-16.png
skin/classic/browser/Toolbar.png
skin/classic/browser/Toolbar@2x.png
- skin/classic/browser/Toolbar-aero.png
- skin/classic/browser/Toolbar-aero@2x.png
+ skin/classic/browser/Toolbar-win7.png
+ skin/classic/browser/Toolbar-win7@2x.png
skin/classic/browser/Toolbar-inverted.png
skin/classic/browser/Toolbar-inverted@2x.png
- skin/classic/browser/Toolbar-lunaSilver.png
skin/classic/browser/Toolbar-win8.png
skin/classic/browser/Toolbar-win8@2x.png
- skin/classic/browser/Toolbar-XP.png
- skin/classic/browser/toolbarbutton-dropdown-arrow-XPVista7.png
+ skin/classic/browser/toolbarbutton-dropdown-arrow-win7.png
skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
skin/classic/browser/urlbar-popup-blocked.png
skin/classic/browser/urlbar-history-dropmarker.png
skin/classic/browser/urlbar-history-dropmarker@2x.png
- skin/classic/browser/urlbar-history-dropmarker-XPVista7.png
- skin/classic/browser/urlbar-history-dropmarker-XPVista7@2x.png
+ skin/classic/browser/urlbar-history-dropmarker-win7.png
+ skin/classic/browser/urlbar-history-dropmarker-win7@2x.png
skin/classic/browser/webRTC-indicator.css (../shared/webRTC-indicator.css)
* skin/classic/browser/controlcenter/panel.css (controlcenter/panel.css)
skin/classic/browser/customizableui/background-noise-toolbar.png (customizableui/background-noise-toolbar.png)
skin/classic/browser/customizableui/customize-titleBar-toggle.png (customizableui/customize-titleBar-toggle.png)
skin/classic/browser/customizableui/customize-titleBar-toggle@2x.png (customizableui/customize-titleBar-toggle@2x.png)
skin/classic/browser/customizableui/customizeMode-gridTexture.png (customizableui/customizeMode-gridTexture.png)
skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png (customizableui/customizeMode-separatorHorizontal.png)
skin/classic/browser/customizableui/customizeMode-separatorVertical.png (customizableui/customizeMode-separatorVertical.png)
skin/classic/browser/customizableui/menu-arrow.svg (customizableui/menu-arrow.svg)
* skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css)
* skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css)
skin/classic/browser/downloads/download-glow-menuPanel.png (downloads/download-glow-menuPanel.png)
- skin/classic/browser/downloads/download-glow-menuPanel-XPVista7.png (downloads/download-glow-menuPanel-XPVista7.png)
+ skin/classic/browser/downloads/download-glow-menuPanel-win7.png (downloads/download-glow-menuPanel-win7.png)
skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
* skin/classic/browser/downloads/downloads.css (downloads/downloads.css)
skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png)
skin/classic/browser/feeds/feedIcon16.png (feeds/feedIcon16.png)
- skin/classic/browser/feeds/feedIcon-XP.png (feeds/feedIcon-XP.png)
- skin/classic/browser/feeds/feedIcon16-XP.png (feeds/feedIcon16-XP.png)
skin/classic/browser/feeds/subscribe.css (feeds/subscribe.css)
* skin/classic/browser/newtab/newTab.css (newtab/newTab.css)
skin/classic/browser/places/places.css (places/places.css)
* skin/classic/browser/places/organizer.css (places/organizer.css)
skin/classic/browser/places/query.png (places/query.png)
- skin/classic/browser/places/query-XP.png (places/query-XP.png)
skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png)
- skin/classic/browser/places/bookmarksMenu-XP.png (places/bookmarksMenu-XP.png)
skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png)
- skin/classic/browser/places/bookmarksToolbar-XP.png (places/bookmarksToolbar-XP.png)
skin/classic/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel.png)
- skin/classic/browser/places/bookmarksToolbar-menuPanel-XP.png (places/bookmarksToolbar-menuPanel-XP.png)
skin/classic/browser/places/bookmarks-notification-finish.png (places/bookmarks-notification-finish.png)
skin/classic/browser/places/calendar.png (places/calendar.png)
- skin/classic/browser/places/calendar-XP.png (places/calendar-XP.png)
skin/classic/browser/places/toolbarDropMarker.png (places/toolbarDropMarker.png)
- skin/classic/browser/places/toolbarDropMarker-XP.png (places/toolbarDropMarker-XP.png)
skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css)
skin/classic/browser/places/libraryToolbar.png (places/libraryToolbar.png)
- skin/classic/browser/places/libraryToolbar-XP.png (places/libraryToolbar-XP.png)
skin/classic/browser/places/starred48.png (places/starred48.png)
- skin/classic/browser/places/starred48-XP.png (places/starred48-XP.png)
skin/classic/browser/places/unstarred48.png (places/unstarred48.png)
skin/classic/browser/places/tag.png (places/tag.png)
- skin/classic/browser/places/tag-XP.png (places/tag-XP.png)
skin/classic/browser/places/history.png (places/history.png)
- skin/classic/browser/places/history-XP.png (places/history-XP.png)
skin/classic/browser/places/allBookmarks.png (places/allBookmarks.png)
- skin/classic/browser/places/allBookmarks-XP.png (places/allBookmarks-XP.png)
skin/classic/browser/places/unsortedBookmarks.png (places/unsortedBookmarks.png)
- skin/classic/browser/places/unsortedBookmarks-XP.png (places/unsortedBookmarks-XP.png)
skin/classic/browser/places/downloads.png (places/downloads.png)
skin/classic/browser/places/livemark-item.png (places/livemark-item.png)
skin/classic/browser/preferences/alwaysAsk.png (preferences/alwaysAsk.png)
- skin/classic/browser/preferences/alwaysAsk-XP.png (preferences/alwaysAsk-XP.png)
skin/classic/browser/preferences/application.png (preferences/application.png)
- skin/classic/browser/preferences/application-XP.png (preferences/application-XP.png)
skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png)
- skin/classic/browser/preferences/saveFile-XP.png (preferences/saveFile-XP.png)
skin/classic/browser/preferences/preferences.css (preferences/preferences.css)
* skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
* skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css)
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/social/services-16.png (social/services-16.png)
skin/classic/browser/social/services-64.png (social/services-64.png)
skin/classic/browser/tabbrowser/newtab.svg (tabbrowser/newtab.svg)
- skin/classic/browser/tabbrowser/newtab-XPVista7.svg (tabbrowser/newtab-XPVista7.svg)
+ skin/classic/browser/tabbrowser/newtab-win7.svg (tabbrowser/newtab-win7.svg)
skin/classic/browser/tabbrowser/newtab-inverted.svg (tabbrowser/newtab-inverted.svg)
- skin/classic/browser/tabbrowser/newtab-inverted-XPVista7.svg (tabbrowser/newtab-inverted-XPVista7.svg)
+ skin/classic/browser/tabbrowser/newtab-inverted-win7.svg (tabbrowser/newtab-inverted-win7.svg)
skin/classic/browser/tabbrowser/tab-active-middle.png (tabbrowser/tab-active-middle.png)
skin/classic/browser/tabbrowser/tab-active-middle@2x.png (tabbrowser/tab-active-middle@2x.png)
skin/classic/browser/tabbrowser/tab-arrow-left.svg (tabbrowser/tab-arrow-left.svg)
- skin/classic/browser/tabbrowser/tab-arrow-left-XPVista7.svg (tabbrowser/tab-arrow-left-XPVista7.svg)
+ skin/classic/browser/tabbrowser/tab-arrow-left-win7.svg (tabbrowser/tab-arrow-left-win7.svg)
skin/classic/browser/tabbrowser/tab-arrow-left-inverted.svg (tabbrowser/tab-arrow-left-inverted.svg)
skin/classic/browser/tabbrowser/tab-background-start.png (tabbrowser/tab-background-start.png)
skin/classic/browser/tabbrowser/tab-background-start@2x.png (tabbrowser/tab-background-start@2x.png)
skin/classic/browser/tabbrowser/tab-background-middle.png (tabbrowser/tab-background-middle.png)
skin/classic/browser/tabbrowser/tab-background-middle@2x.png (tabbrowser/tab-background-middle@2x.png)
skin/classic/browser/tabbrowser/tab-background-end.png (tabbrowser/tab-background-end.png)
skin/classic/browser/tabbrowser/tab-background-end@2x.png (tabbrowser/tab-background-end@2x.png)
skin/classic/browser/tabbrowser/tab-background-start-preWin10.png (tabbrowser/tab-background-start-preWin10.png)
@@ -162,88 +138,59 @@ browser.jar:
skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
skin/classic/browser/sync-16.png
skin/classic/browser/sync-32.png
skin/classic/browser/sync-128.png
skin/classic/browser/sync-bg.png
skin/classic/browser/sync-desktopIcon.svg (../shared/sync-desktopIcon.svg)
skin/classic/browser/sync-horizontalbar.png
skin/classic/browser/sync-horizontalbar@2x.png
- skin/classic/browser/sync-horizontalbar-XPVista7.png
- skin/classic/browser/sync-horizontalbar-XPVista7@2x.png
+ skin/classic/browser/sync-horizontalbar-win7.png
+ skin/classic/browser/sync-horizontalbar-win7@2x.png
skin/classic/browser/sync-mobileIcon.svg (../shared/sync-mobileIcon.svg)
skin/classic/browser/sync-notification-24.png
skin/classic/browser/syncSetup.css
skin/classic/browser/syncCommon.css
skin/classic/browser/syncQuota.css
skin/classic/browser/syncProgress-horizontalbar.png
skin/classic/browser/syncProgress-horizontalbar@2x.png
- skin/classic/browser/syncProgress-horizontalbar-XPVista7.png
- skin/classic/browser/syncProgress-horizontalbar-XPVista7@2x.png
+ skin/classic/browser/syncProgress-horizontalbar-win7.png
+ skin/classic/browser/syncProgress-horizontalbar-win7@2x.png
#ifdef E10S_TESTING_ONLY
skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
#endif
[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
% override chrome://browser/skin/page-livemarks.png chrome://browser/skin/feeds/feedIcon16.png
% override chrome://browser/skin/feeds/audioFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
% override chrome://browser/skin/feeds/audioFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
% override chrome://browser/skin/feeds/videoFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
% override chrome://browser/skin/feeds/videoFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
-% override chrome://browser/skin/aboutSessionRestore-window-icon.png chrome://browser/skin/preferences/application.png os!=WINNT
-% override chrome://browser/skin/aboutSessionRestore-window-icon.png chrome://browser/skin/preferences/application.png os=WINNT osversion<6
+% override chrome://browser/skin/privatebrowsing-mask-tabstrip.png chrome://browser/skin/privatebrowsing-mask-tabstrip-win7.png os=WINNT osversion<=6.1
+% override chrome://browser/skin/privatebrowsing-mask-titlebar.png chrome://browser/skin/privatebrowsing-mask-titlebar-win7.png os=WINNT osversion<=6.1
+% override chrome://browser/skin/reload-stop-go.png chrome://browser/skin/reload-stop-go-win7.png os=WINNT osversion<=6.1
+% override chrome://browser/skin/reload-stop-go@2x.png chrome://browser/skin/reload-stop-go-win7@2x.png os=WINNT osversion<=6.1
+% override chrome://browser/skin/sync-horizontalbar.png chrome://browser/skin/sync-horizontalbar-win7.png os=WINNT osversion<=6.1
+% override chrome://browser/skin/sync-horizontalbar@2x.png chrome://browser/skin/sync-horizontalbar-win7@2x.png os=WINNT osversion<=6.1
+% override chrome://browser/skin/syncProgress-horizontalbar.png chrome://browser/skin/syncProgress-horizontalbar-win7.png os=WINNT osversion<=6.1
+% override chrome://browser/skin/syncProgress-horizontalbar@2x.png chrome://browser/skin/syncProgress-horizontalbar-win7@2x.png os=WINNT osversion<=6.1
+% override chrome://browser/skin/toolbarbutton-dropdown-arrow.png chrome://browser/skin/toolbarbutton-dropdown-arrow-win7.png os=WINNT osversion<=6.1
+% override chrome://browser/skin/urlbar-history-dropmarker.png chrome://browser/skin/urlbar-history-dropmarker-win7.png os=WINNT osversion<=6.1
+% override chrome://browser/skin/urlbar-history-dropmarker@2x.png chrome://browser/skin/urlbar-history-dropmarker-win7@2x.png os=WINNT osversion<=6.1
+% override chrome://browser/skin/downloads/download-glow-menuPanel.png chrome://browser/skin/downloads/download-glow-menuPanel-win7.png os=WINNT osversion<=6.1
+% override chrome://browser/skin/tabbrowser/newtab.svg chrome://browser/skin/tabbrowser/newtab-win7.svg os=WINNT osversion<=6.1
+% override chrome://browser/skin/tabbrowser/newtab-inverted.svg chrome://browser/skin/tabbrowser/newtab-inverted-win7.svg os=WINNT osversion<=6.1
+% override chrome://browser/skin/tabbrowser/tab-arrow-left.svg chrome://browser/skin/tabbrowser/tab-arrow-left-win7.svg os=WINNT osversion<=6.1
-% override chrome://browser/skin/Info.png chrome://browser/skin/Info-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/livemark-folder.png chrome://browser/skin/livemark-folder-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/menu-back.png chrome://browser/skin/menu-back-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/menu-forward.png chrome://browser/skin/menu-forward-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/pageInfo.png chrome://browser/skin/pageInfo-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/feeds/feedIcon.png chrome://browser/skin/feeds/feedIcon-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/feeds/feedIcon16.png chrome://browser/skin/feeds/feedIcon16-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/places/query.png chrome://browser/skin/places/query-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/places/bookmarksMenu.png chrome://browser/skin/places/bookmarksMenu-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/places/bookmarksToolbar.png chrome://browser/skin/places/bookmarksToolbar-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/places/bookmarksToolbar-menuPanel.png chrome://browser/skin/places/bookmarksToolbar-menuPanel-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/places/calendar.png chrome://browser/skin/places/calendar-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/places/toolbarDropMarker.png chrome://browser/skin/places/toolbarDropMarker-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/places/libraryToolbar.png chrome://browser/skin/places/libraryToolbar-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/places/starred48.png chrome://browser/skin/places/starred48-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/places/tag.png chrome://browser/skin/places/tag-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/places/history.png chrome://browser/skin/places/history-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/places/allBookmarks.png chrome://browser/skin/places/allBookmarks-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/places/unsortedBookmarks.png chrome://browser/skin/places/unsortedBookmarks-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/preferences/alwaysAsk.png chrome://browser/skin/preferences/alwaysAsk-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/preferences/application.png chrome://browser/skin/preferences/application-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/preferences/saveFile.png chrome://browser/skin/preferences/saveFile-XP.png os=WINNT osversion<6
-
-% override chrome://browser/skin/privatebrowsing-mask-tabstrip.png chrome://browser/skin/privatebrowsing-mask-tabstrip-XPVista7.png os=WINNT osversion<=6.1
-% override chrome://browser/skin/privatebrowsing-mask-titlebar.png chrome://browser/skin/privatebrowsing-mask-titlebar-XPVista7.png os=WINNT osversion<=6.1
-% override chrome://browser/skin/reload-stop-go.png chrome://browser/skin/reload-stop-go-XPVista7.png os=WINNT osversion<=6.1
-% override chrome://browser/skin/reload-stop-go@2x.png chrome://browser/skin/reload-stop-go-XPVista7@2x.png os=WINNT osversion<=6.1
-% override chrome://browser/skin/sync-horizontalbar.png chrome://browser/skin/sync-horizontalbar-XPVista7.png os=WINNT osversion<=6.1
-% override chrome://browser/skin/sync-horizontalbar@2x.png chrome://browser/skin/sync-horizontalbar-XPVista7@2x.png os=WINNT osversion<=6.1
-% override chrome://browser/skin/syncProgress-horizontalbar.png chrome://browser/skin/syncProgress-horizontalbar-XPVista7.png os=WINNT osversion<=6.1
-% override chrome://browser/skin/syncProgress-horizontalbar@2x.png chrome://browser/skin/syncProgress-horizontalbar-XPVista7@2x.png os=WINNT osversion<=6.1
-% override chrome://browser/skin/toolbarbutton-dropdown-arrow.png chrome://browser/skin/toolbarbutton-dropdown-arrow-XPVista7.png os=WINNT osversion<=6.1
-% override chrome://browser/skin/urlbar-history-dropmarker.png chrome://browser/skin/urlbar-history-dropmarker-XPVista7.png os=WINNT osversion<=6.1
-% override chrome://browser/skin/urlbar-history-dropmarker@2x.png chrome://browser/skin/urlbar-history-dropmarker-XPVista7@2x.png os=WINNT osversion<=6.1
-% override chrome://browser/skin/downloads/download-glow-menuPanel.png chrome://browser/skin/downloads/download-glow-menuPanel-XPVista7.png os=WINNT osversion<=6.1
-% override chrome://browser/skin/tabbrowser/newtab.svg chrome://browser/skin/tabbrowser/newtab-XPVista7.svg os=WINNT osversion<=6.1
-% override chrome://browser/skin/tabbrowser/newtab-inverted.svg chrome://browser/skin/tabbrowser/newtab-inverted-XPVista7.svg os=WINNT osversion<=6.1
-% override chrome://browser/skin/tabbrowser/tab-arrow-left.svg chrome://browser/skin/tabbrowser/tab-arrow-left-XPVista7.svg os=WINNT osversion<=6.1
-
-% override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-aero@2x.png os=WINNT osversion=6
-% override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-aero@2x.png os=WINNT osversion=6.1
+% override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-win7@2x.png os=WINNT osversion=6.1
% override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-win8@2x.png os=WINNT osversion=6.2
% override chrome://browser/skin/Toolbar@2x.png chrome://browser/skin/Toolbar-win8@2x.png os=WINNT osversion=6.3
-% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-XP.png os=WINNT osversion<6
-% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-aero.png os=WINNT osversion=6
-% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-aero.png os=WINNT osversion=6.1
+% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-win7.png os=WINNT osversion=6.1
% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-win8.png os=WINNT osversion=6.2
% override chrome://browser/skin/Toolbar.png chrome://browser/skin/Toolbar-win8.png os=WINNT osversion=6.3
% override chrome://browser/skin/tabbrowser/tab-background-start.png chrome://browser/skin/tabbrowser/tab-background-start-preWin10.png os=WINNT osversion<=6.3
% override chrome://browser/skin/tabbrowser/tab-background-start@2x.png chrome://browser/skin/tabbrowser/tab-background-start-preWin10@2x.png os=WINNT osversion<=6.3
% override chrome://browser/skin/tabbrowser/tab-background-middle.png chrome://browser/skin/tabbrowser/tab-background-middle-preWin10.png os=WINNT osversion<=6.3
% override chrome://browser/skin/tabbrowser/tab-background-middle@2x.png chrome://browser/skin/tabbrowser/tab-background-middle-preWin10@2x.png os=WINNT osversion<=6.3
% override chrome://browser/skin/tabbrowser/tab-background-end.png chrome://browser/skin/tabbrowser/tab-background-end-preWin10.png os=WINNT osversion<=6.3
deleted file mode 100644
index 00aa0364d3e5003c0d531ba68ad2ed11b1a5f451..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index ecb8ccd1a48561a91b7886d5ec05f37ca12e681a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a7460dc27d04ba17ebecedf67f256b7d2699e4aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index bbf25723791213e734f898765595a002db4765c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index f7903cc5f05fef8bb85caedfea04cf39bb8bf1ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8f0c8bf5832e647849e43818a1037acfe7582991..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 9e988de201adc50018d34bdf8c27764e890ec8da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0e4247adb5318f350e9279843ce72ebdf6d087c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7645af5cd121c1f3c8a34954d97a97c9a8d8e37f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index fcc89bbbf0b6d30d0f33c6dc209b4ff172fe908e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 75b390ff664ae3de2abc8cd00d997356437629bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/windows/places/organizer.css
+++ b/browser/themes/windows/places/organizer.css
@@ -15,23 +15,16 @@
opacity: .4;
}
#back-button,
#forward-button {
list-style-image: url("chrome://browser/skin/Toolbar.png");
}
-@media (-moz-windows-theme: luna-silver) {
- #back-button,
- #forward-button {
- list-style-image: url("chrome://browser/skin/Toolbar-lunaSilver.png");
- }
-}
-
#back-button {
-moz-image-region: rect(0, 54px, 18px, 36px);
}
#forward-button {
-moz-image-region: rect(0, 72px, 18px, 54px);
}
@@ -114,21 +107,16 @@
#maintenanceButton {
-moz-image-region: rect(0px, 48px, 16px, 32px);
}
#maintenanceButton:hover,
#maintenanceButton[open="true"] {
-moz-image-region: rect(16px, 48px, 32px, 32px);
}
-/* Root View */
-#placesView {
- border-top: 1px solid ThreeDDarkShadow;
-}
-
/* Info box */
#detailsDeck {
border-top: 1px solid ThreeDShadow;
padding: 5px;
}
#infoBoxExpanderLabel {
padding-inline-start: 2px;
@@ -146,60 +134,52 @@
display: none;
}
#clearDownloadsButton {
padding-inline-start: 9px;
padding-inline-end: 9px;
}
-
-@media not all and (-moz-os-version: windows-xp) {
- #placesView {
- border-top: none;
+@media not all and (-moz-windows-classic) {
+ #placesToolbox {
+ -moz-appearance: none;
+ background-color: transparent;
}
- @media not all and (-moz-windows-classic) {
- #placesToolbox {
- -moz-appearance: none;
- background-color: transparent;
- }
-
- #placesToolbar {
- -moz-appearance: none;
- background-color: -moz-Dialog;
- color: -moz-dialogText;
- }
+ #placesToolbar {
+ -moz-appearance: none;
+ background-color: -moz-Dialog;
+ color: -moz-dialogText;
}
+}
- @media (-moz-windows-default-theme) {
- #placesView > splitter {
- border: 0;
- border-inline-end: 1px solid #A9B7C9;
- min-width: 0;
- width: 3px;
- background-color: transparent;
- margin-inline-start: -3px;
- position: relative;
- }
+@media (-moz-windows-default-theme) {
+ #placesView > splitter {
+ border: 0;
+ border-inline-end: 1px solid #A9B7C9;
+ min-width: 0;
+ width: 3px;
+ background-color: transparent;
+ margin-inline-start: -3px;
+ position: relative;
}
}
@media (-moz-windows-glass) {
#placesToolbox {
border-top: none;
}
#placesToolbar {
background-image: linear-gradient(@toolbarHighlight@, transparent);
}
}
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
- (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
+@media (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
#placesView,
#infoPane,
#placesList,
#placeContent {
background-color: #EEF3FA;
}
#placesToolbar {
--- a/browser/themes/windows/places/places.css
+++ b/browser/themes/windows/places/places.css
@@ -19,31 +19,27 @@
cursor: pointer;
text-decoration: underline;
}
.sidebar-placesTreechildren::-moz-tree-cell(separator) {
cursor: default;
}
-/* Style Places sidebars as Vista media collection */
@media (-moz-windows-default-theme) {
- @media not all and (-moz-os-version: windows-xp) {
- .sidebar-placesTree {
- background-color: transparent;
- border-top: none;
- }
-
- .sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) {
- text-decoration: none;
- }
+ .sidebar-placesTree {
+ background-color: transparent;
+ border-top: none;
}
- @media (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+ .sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) {
+ text-decoration: none;
+ }
+
+ @media (-moz-os-version: windows-win7) {
#bookmarksPanel,
#history-panel,
#tabs-panel {
background-color: #EEF3FA;
}
}
}
deleted file mode 100644
index 9e79fc79159ca845c4ab1788c8c9eeb85760c4ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1cb7bc57d34fbe404e327f9871b174d33b0067c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4b4a13e662c4b9d1187454ca80ea8bcfed0216e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 9173b7a7a3c93f57d4d7b71b2e6b948157fe0fd5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index cf73f946494c886a8e62672ce521d76088cbf5b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8693211ac154658791285a7f2016c584e827a063..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7d279ff849e433bc6ea090f6cc19cb61e8737253..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index e115eaa9fd3ad66c65b6d8b26135a8cef1cb4690..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
rename from browser/themes/windows/privatebrowsing-mask-tabstrip-XPVista7.png
rename to browser/themes/windows/privatebrowsing-mask-tabstrip-win7.png
rename from browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7-tall.png
rename to browser/themes/windows/privatebrowsing-mask-titlebar-win7-tall.png
rename from browser/themes/windows/privatebrowsing-mask-titlebar-XPVista7.png
rename to browser/themes/windows/privatebrowsing-mask-titlebar-win7.png
rename from browser/themes/windows/reload-stop-go-XPVista7.png
rename to browser/themes/windows/reload-stop-go-win7.png
rename from browser/themes/windows/reload-stop-go-XPVista7@2x.png
rename to browser/themes/windows/reload-stop-go-win7@2x.png
rename from browser/themes/windows/sync-horizontalbar-XPVista7.png
rename to browser/themes/windows/sync-horizontalbar-win7.png
rename from browser/themes/windows/sync-horizontalbar-XPVista7@2x.png
rename to browser/themes/windows/sync-horizontalbar-win7@2x.png
rename from browser/themes/windows/syncProgress-horizontalbar-XPVista7.png
rename to browser/themes/windows/syncProgress-horizontalbar-win7.png
rename from browser/themes/windows/syncProgress-horizontalbar-XPVista7@2x.png
rename to browser/themes/windows/syncProgress-horizontalbar-win7@2x.png
rename from browser/themes/windows/tabbrowser/newtab-inverted-XPVista7.svg
rename to browser/themes/windows/tabbrowser/newtab-inverted-win7.svg
rename from browser/themes/windows/tabbrowser/newtab-XPVista7.svg
rename to browser/themes/windows/tabbrowser/newtab-win7.svg
rename from browser/themes/windows/tabbrowser/tab-arrow-left-XPVista7.svg
rename to browser/themes/windows/tabbrowser/tab-arrow-left-win7.svg
rename from browser/themes/windows/toolbarbutton-dropdown-arrow-XPVista7.png
rename to browser/themes/windows/toolbarbutton-dropdown-arrow-win7.png
rename from browser/themes/windows/urlbar-history-dropmarker-XPVista7.png
rename to browser/themes/windows/urlbar-history-dropmarker-win7.png
rename from browser/themes/windows/urlbar-history-dropmarker-XPVista7@2x.png
rename to browser/themes/windows/urlbar-history-dropmarker-win7@2x.png
--- a/browser/themes/windows/windowsShared.inc
+++ b/browser/themes/windows/windowsShared.inc
@@ -3,11 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
%filter substitution
%define toolbarHighlight rgba(255,255,255,.4)
%define fgTabTexture linear-gradient(transparent 2px, @toolbarHighlight@ 2px, @toolbarHighlight@)
%define fgTabBackgroundColor -moz-dialog
%define fgTabTextureLWT @fgTabTexture@
-
-% Aero-only defines
%define customToolbarColor hsl(210,75%,92%)
deleted file mode 100644
index 102de5196014905f59909a9a0cb012c050e88ce3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 99191f3a52643b28fc085d96ded3bfc143b58d3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4febb764bd8bfb05550289e9dbeff8b68a81afc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 851502d47db2aa380cac1353b80a90e9b62f7e00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -345,19 +345,17 @@ popupnotificationcontent {
}
.close-icon > .button-icon,
.close-icon > .button-box > .button-icon,
.close-icon > .toolbarbutton-icon {
width: 20px;
}
-@media (-moz-os-version: windows-xp),
- (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) {
.close-icon {
-moz-image-region: rect(0, 16px, 16px, 0);
}
.close-icon:hover {
-moz-image-region: rect(0, 32px, 16px, 16px);
}
@@ -381,19 +379,17 @@ popupnotificationcontent {
.close-icon:hover {
-moz-image-region: rect(0, 80px, 40px, 40px);
}
.close-icon:hover:active {
-moz-image-region: rect(0, 120px, 40px, 80px);
}
- @media (-moz-os-version: windows-xp),
- (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+ @media (-moz-os-version: windows-win7) {
.close-icon {
-moz-image-region: rect(0, 32px, 32px, 0);
}
.close-icon:hover {
-moz-image-region: rect(0, 64px, 32px, 32px);
}
deleted file mode 100644
index 59ad20d70b616fb0a761b9d3e86e0f9d5598cfd8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index cc43abdf313832534405357b93885ca075e98ff7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index ce36e84132ef1bb8b55700ff6b7f389af8b75d6f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6f4736737feb37c804685830cc5274e17a82b5a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index c10004078bf4a9ab2ef06c178dcb7bf18030c944..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 39d800e1ae0765f7a5153b3001ffb17062d8da66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 9eb0e259f23befe254f16d25a0c5e357d82b11ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index c0ec9b519fb887d7ca546d3769e053057e89d87b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 6aac3d98e9e5b8ae9db35c05b9473eb352a3387f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 74af56f577c90e98cf5d3f872249f661a9ccf692..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 96ff341c0abaa7fc265ea712bd80252e6f49a498..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
rename from toolkit/themes/windows/global/icons/close-inverted-XPVista7.png
rename to toolkit/themes/windows/global/icons/close-inverted-win7.png
rename from toolkit/themes/windows/global/icons/close-inverted-XPVista7@2x.png
rename to toolkit/themes/windows/global/icons/close-inverted-win7@2x.png
rename from toolkit/themes/windows/global/icons/close-XPVista7.png
rename to toolkit/themes/windows/global/icons/close-win7.png
rename from toolkit/themes/windows/global/icons/close-XPVista7@2x.png
rename to toolkit/themes/windows/global/icons/close-win7@2x.png
deleted file mode 100644
index 936d2abeb9cdd5f94d483dfa10464514aa16b3b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 75a00c4903bdcf5458612e6366893264d9c25641..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 26cda98c9b4419e9797d383bf761cd6a1b96fb18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index aa8ce6e88a88276f2d05665c58765fcda6d4942a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7fa782d58c8a7371747fc8ea9f6d31c4e1f065d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5120db685e34f511dd3f9b9031eb6dfe8898a0f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0c8eafda08acf20c21eeef8ae63cc6630590084b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a1a51b8d8f580a7c97b449aed9ae60207a6a5373..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 09946986fe60ca1be972cfaf5d52456e6bcbdd74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a21574370bd91df3d6a14cf2625ef2150fec5797..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 832f348867e0fa15331010f1a2acd570fe70e874..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0ec8e79f68f4cc5427b15d3db5b62405aad76b2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d90efb05b2d50fabc745c6dc2dfaa98f93686130..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -34,107 +34,40 @@ toolkit.jar:
skin/classic/global/toolbar.css
skin/classic/global/toolbarbutton.css
* skin/classic/global/tree.css
skin/classic/global/alerts/alert.css (alerts/alert.css)
skin/classic/global/dirListing/remote.png (dirListing/remote.png)
skin/classic/global/icons/autocomplete-search.svg (icons/autocomplete-search.svg)
skin/classic/global/icons/blacklist_favicon.png (icons/blacklist_favicon.png)
skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png)
- skin/classic/global/icons/close-XPVista7.png (icons/close-XPVista7.png)
- skin/classic/global/icons/close-XPVista7@2x.png (icons/close-XPVista7@2x.png)
- skin/classic/global/icons/close-inverted-XPVista7.png (icons/close-inverted-XPVista7.png)
- skin/classic/global/icons/close-inverted-XPVista7@2x.png (icons/close-inverted-XPVista7@2x.png)
+ skin/classic/global/icons/close-win7.png (icons/close-win7.png)
+ skin/classic/global/icons/close-win7@2x.png (icons/close-win7@2x.png)
+ skin/classic/global/icons/close-inverted-win7.png (icons/close-inverted-win7.png)
+ skin/classic/global/icons/close-inverted-win7@2x.png (icons/close-inverted-win7@2x.png)
skin/classic/global/icons/resizer.png (icons/resizer.png)
skin/classic/global/icons/sslWarning.png (icons/sslWarning.png)
* skin/classic/global/in-content/common.css (in-content/common.css)
* skin/classic/global/in-content/info-pages.css (in-content/info-pages.css)
skin/classic/global/toolbar/spring.png (toolbar/spring.png)
- skin/classic/global/dirListing/folder-XP.png (dirListing/folder-XP.png)
- skin/classic/global/dirListing/local-XP.png (dirListing/local-XP.png)
- skin/classic/global/dirListing/remote-XP.png (dirListing/remote-XP.png)
- skin/classic/global/dirListing/up-XP.png (dirListing/up-XP.png)
skin/classic/global/icons/autoscroll.png (icons/autoscroll.png)
- skin/classic/global/icons/autoscroll-XP.png (icons/autoscroll-XP.png)
- skin/classic/global/icons/blacklist_favicon-XP.png (icons/blacklist_favicon-XP.png)
- skin/classic/global/icons/blacklist_large-XP.png (icons/blacklist_large-XP.png)
- skin/classic/global/icons/Error-XP.png (icons/Error-XP.png)
- skin/classic/global/icons/error-16-XP.png (icons/error-16-XP.png)
- skin/classic/global/icons/error-64-XP.png (icons/error-64-XP.png)
- skin/classic/global/icons/folder-item-XP.png (icons/folder-item-XP.png)
- skin/classic/global/icons/information-16-XP.png (icons/information-16-XP.png)
- skin/classic/global/icons/information-24-XP.png (icons/information-24-XP.png)
- skin/classic/global/icons/information-32-XP.png (icons/information-32-XP.png)
- skin/classic/global/icons/Print-preview-XP.png (icons/Print-preview-XP.png)
- skin/classic/global/icons/Portrait-XP.png (icons/Portrait-XP.png)
- skin/classic/global/icons/Landscape-XP.png (icons/Landscape-XP.png)
- skin/classic/global/icons/Question-XP.png (icons/Question-XP.png)
- skin/classic/global/icons/question-16-XP.png (icons/question-16-XP.png)
- skin/classic/global/icons/question-64-XP.png (icons/question-64-XP.png)
- skin/classic/global/icons/Search-close-XP.png (icons/Search-close-XP.png)
- skin/classic/global/icons/Search-glass-XP.png (icons/Search-glass-XP.png)
- skin/classic/global/icons/sslWarning-XP.png (icons/sslWarning-XP.png)
- skin/classic/global/icons/Warning-XP.png (icons/Warning-XP.png)
- skin/classic/global/icons/warning-large-XP.png (icons/warning-large-XP.png)
- skin/classic/global/icons/warning-16-XP.png (icons/warning-16-XP.png)
- skin/classic/global/icons/warning-64-XP.png (icons/warning-64-XP.png)
- skin/classic/global/icons/windowControls-XP.png (icons/windowControls-XP.png)
- skin/classic/global/toolbar/spring-XP.png (toolbar/spring-XP.png)
- skin/classic/global/tree/sort-asc-XP.png (tree/sort-asc-XP.png)
- skin/classic/global/tree/sort-dsc-XP.png (tree/sort-dsc-XP.png)
skin/classic/global/tree/twisty.svg (tree/twisty.svg)
- skin/classic/global/tree/twisty-XP.svg (tree/twisty-XP.svg)
- skin/classic/global/tree/twisty-Vista78.svg (tree/twisty-Vista78.svg)
+ skin/classic/global/tree/twisty-preWin10.svg (tree/twisty-preWin10.svg)
#if MOZ_BUILD_APP == browser
[browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
#elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
#endif
-% override chrome://global/skin/dirListing/folder.png chrome://global/skin/dirListing/folder-XP.png osversion<6
-% override chrome://global/skin/dirListing/local.png chrome://global/skin/dirListing/local-XP.png osversion<6
-% override chrome://global/skin/dirListing/remote.png chrome://global/skin/dirListing/remote-XP.png osversion<6
-% override chrome://global/skin/dirListing/up.png chrome://global/skin/dirListing/up-XP.png osversion<6
-% override chrome://global/skin/icons/autoscroll.png chrome://global/skin/icons/autoscroll-XP.png osversion<6
-% override chrome://global/skin/icons/blacklist_favicon.png chrome://global/skin/icons/blacklist_favicon-XP.png osversion<6
-% override chrome://global/skin/icons/blacklist_large.png chrome://global/skin/icons/blacklist_large-XP.png osversion<6
-% override chrome://global/skin/icons/Error.png chrome://global/skin/icons/Error-XP.png osversion<6
-% override chrome://global/skin/icons/error-16.png chrome://global/skin/icons/error-16-XP.png osversion<6
-% override chrome://global/skin/icons/error-64.png chrome://global/skin/icons/error-64-XP.png osversion<6
-% override chrome://global/skin/icons/folder-item.png chrome://global/skin/icons/folder-item-XP.png osversion<6
-% override chrome://global/skin/icons/information-16.png chrome://global/skin/icons/information-16-XP.png osversion<6
-% override chrome://global/skin/icons/information-24.png chrome://global/skin/icons/information-24-XP.png osversion<6
-% override chrome://global/skin/icons/information-32.png chrome://global/skin/icons/information-32-XP.png osversion<6
-% override chrome://global/skin/icons/Print-preview.png chrome://global/skin/icons/Print-preview-XP.png osversion<6
-% override chrome://global/skin/icons/Portrait.png chrome://global/skin/icons/Portrait-XP.png osversion<6
-% override chrome://global/skin/icons/Landscape.png chrome://global/skin/icons/Landscape-XP.png osversion<6
-% override chrome://global/skin/icons/Question.png chrome://global/skin/icons/Question-XP.png osversion<6
-% override chrome://global/skin/icons/question-16.png chrome://global/skin/icons/question-16-XP.png osversion<6
-% override chrome://global/skin/icons/question-64.png chrome://global/skin/icons/question-64-XP.png osversion<6
-% override chrome://global/skin/icons/Search-close.png chrome://global/skin/icons/Search-close-XP.png osversion<6
-% override chrome://global/skin/icons/Search-glass.png chrome://global/skin/icons/Search-glass-XP.png osversion<6
-% override chrome://global/skin/icons/sslWarning.png chrome://global/skin/icons/sslWarning-XP.png osversion<6
-% override chrome://global/skin/icons/Warning.png chrome://global/skin/icons/Warning-XP.png osversion<6
-% override chrome://global/skin/icons/warning-large.png chrome://global/skin/icons/warning-large-XP.png osversion<6
-% override chrome://global/skin/icons/warning-16.png chrome://global/skin/icons/warning-16-XP.png osversion<6
-% override chrome://global/skin/icons/warning-64.png chrome://global/skin/icons/warning-64-XP.png osversion<6
-% override chrome://global/skin/icons/windowControls.png chrome://global/skin/icons/windowControls-XP.png osversion<6
-% override chrome://global/skin/toolbar/spring.png chrome://global/skin/toolbar/spring-XP.png osversion<6
-% override chrome://global/skin/tree/sort-asc.png chrome://global/skin/tree/sort-asc-XP.png osversion<6
-% override chrome://global/skin/tree/sort-dsc.png chrome://global/skin/tree/sort-dsc-XP.png osversion<6
+% override chrome://global/skin/icons/close.png chrome://global/skin/icons/close-win7.png osversion<=6.1
+% override chrome://global/skin/icons/close@2x.png chrome://global/skin/icons/close-win7@2x.png osversion<=6.1
+% override chrome://global/skin/icons/close-inverted.png chrome://global/skin/icons/close-inverted-win7.png osversion<=6.1
+% override chrome://global/skin/icons/close-inverted@2x.png chrome://global/skin/icons/close-inverted-win7@2x.png osversion<=6.1
-% override chrome://global/skin/icons/close.png chrome://global/skin/icons/close-XPVista7.png osversion<=6.1
-% override chrome://global/skin/icons/close@2x.png chrome://global/skin/icons/close-XPVista7@2x.png osversion<=6.1
-% override chrome://global/skin/icons/close-inverted.png chrome://global/skin/icons/close-inverted-XPVista7.png osversion<=6.1
-% override chrome://global/skin/icons/close-inverted@2x.png chrome://global/skin/icons/close-inverted-XPVista7@2x.png osversion<=6.1
-
-% override chrome://global/skin/tree/twisty.svg#clsd chrome://global/skin/tree/twisty-Vista78.svg#clsd osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#clsd-rtl chrome://global/skin/tree/twisty-Vista78.svg#clsd-rtl osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#clsd-hover chrome://global/skin/tree/twisty-Vista78.svg#clsd-hover osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#clsd-hover-rtl chrome://global/skin/tree/twisty-Vista78.svg#clsd-hover-rtl osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#open chrome://global/skin/tree/twisty-Vista78.svg#open osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#open-rtl chrome://global/skin/tree/twisty-Vista78.svg#open-rtl osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#open-hover chrome://global/skin/tree/twisty-Vista78.svg#open-hover osversion<=6.3
-% override chrome://global/skin/tree/twisty.svg#open-hover-rtl chrome://global/skin/tree/twisty-Vista78.svg#open-hover-rtl osversion<=6.3
-# to be sure osversion<6 has always higher precedence than osversion<=6.3 we override twisty-Vista78.svg instead of twisty.svg
-% override chrome://global/skin/tree/twisty-Vista78.svg#clsd chrome://global/skin/tree/twisty-XP.svg#clsd osversion<6
-% override chrome://global/skin/tree/twisty-Vista78.svg#open chrome://global/skin/tree/twisty-XP.svg#open osversion<6
+% override chrome://global/skin/tree/twisty.svg#clsd chrome://global/skin/tree/twisty-preWin10.svg#clsd osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#clsd-rtl chrome://global/skin/tree/twisty-preWin10.svg#clsd-rtl osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#clsd-hover chrome://global/skin/tree/twisty-preWin10.svg#clsd-hover osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#clsd-hover-rtl chrome://global/skin/tree/twisty-preWin10.svg#clsd-hover-rtl osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#open chrome://global/skin/tree/twisty-preWin10.svg#open osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#open-rtl chrome://global/skin/tree/twisty-preWin10.svg#open-rtl osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#open-hover chrome://global/skin/tree/twisty-preWin10.svg#open-hover osversion<=6.3
+% override chrome://global/skin/tree/twisty.svg#open-hover-rtl chrome://global/skin/tree/twisty-preWin10.svg#open-hover-rtl osversion<=6.3
--- a/toolkit/themes/windows/global/listbox.css
+++ b/toolkit/themes/windows/global/listbox.css
@@ -139,80 +139,77 @@ listheader[sortable="true"]:hover:active
margin: 0px 2px;
border: 1px solid -moz-DialogText;
min-width: 13px;
min-height: 13px;
background: -moz-Field no-repeat 50% 50%;
}
@media (-moz-windows-default-theme) {
- @media not all and (-moz-os-version: windows-xp) {
- listitem {
- --listitem-selectedColor: rgb(217,217,217);
- --listitem-selectedBorder: var(--listitem-selectedColor);
- --listitem-selectedBottomBorder: rgb(204,204,204);
- --listitem-selectedBackground: var(--listitem-selectedColor);
- --listitem-selectedImage: none;
- --listitem-selectedCurrentBorder: rgb(123,195,255);
- --listitem-selectedFocusColor: rgb(205,232,255);
- --listitem-selectedFocusBorder: var(--listitem-selectedFocusColor);
- --listitem-selectedFocusBottomBorder: rgb(165,214,255);
- --listitem-selectedFocusBackground: var(--listitem-selectedFocusColor);
- --listitem-selectedFocusImage: none;
- --listitem-selectedFocusCurrentBorder: var(--listitem-selectedFocusColor);
- --listitem-selectedFocusCurrentBottomBorder: var(--listitem-selectedFocusBottomBorder);
- --listitem-selectedFocusCurrentBackground: var(--listitem-selectedFocusColor);
-
- color: -moz-FieldText;
- margin-inline-start: 1px;
- margin-inline-end: 1px;
- padding-top: 1px;
- padding-bottom: 1px;
- border-width: 1px;
- background-repeat: no-repeat;
- background-size: 100% 100%;
- }
+ listitem {
+ --listitem-selectedColor: rgb(217,217,217);
+ --listitem-selectedBorder: var(--listitem-selectedColor);
+ --listitem-selectedBottomBorder: rgb(204,204,204);
+ --listitem-selectedBackground: var(--listitem-selectedColor);
+ --listitem-selectedImage: none;
+ --listitem-selectedCurrentBorder: rgb(123,195,255);
+ --listitem-selectedFocusColor: rgb(205,232,255);
+ --listitem-selectedFocusBorder: var(--listitem-selectedFocusColor);
+ --listitem-selectedFocusBottomBorder: rgb(165,214,255);
+ --listitem-selectedFocusBackground: var(--listitem-selectedFocusColor);
+ --listitem-selectedFocusImage: none;
+ --listitem-selectedFocusCurrentBorder: var(--listitem-selectedFocusColor);
+ --listitem-selectedFocusCurrentBottomBorder: var(--listitem-selectedFocusBottomBorder);
+ --listitem-selectedFocusCurrentBackground: var(--listitem-selectedFocusColor);
- listitem[selected="true"] {
- border-top-color: var(--listitem-selectedBorder);
- border-right-color: var(--listitem-selectedBorder);
- border-left-color: var(--listitem-selectedBorder);
- border-bottom-color: var(--listitem-selectedBottomBorder);
- background-image: var(--listitem-selectedImage);
- background-color: var(--listitem-selectedBackground);
- color: -moz-DialogText;
- }
-
- listbox:focus > listitem[selected="true"] {
- border-top-color: var(--listitem-selectedFocusBorder);
- border-right-color: var(--listitem-selectedFocusBorder);
- border-left-color: var(--listitem-selectedFocusBorder);
- border-bottom-color: var(--listitem-selectedFocusBottomBorder);
- background-image: var(--listitem-selectedFocusImage);
- background-color: var(--listitem-selectedFocusBackground);
- color: -moz-DialogText;
- }
-
- listbox:focus > listitem[current="true"] {
- border-color: var(--listitem-selectedCurrentBorder);
- outline: none;
- }
-
- listbox:focus > listitem[selected="true"][current="true"] {
- border-top-color: var(--listitem-selectedFocusCurrentBorder);
- border-right-color: var(--listitem-selectedFocusCurrentBorder);
- border-left-color: var(--listitem-selectedFocusCurrentBorder);
- border-bottom-color: var(--listitem-selectedFocusCurrentBottomBorder);
- background-color: var(--listitem-selectedFocusCurrentBackground);
- outline: none;
- }
+ color: -moz-FieldText;
+ margin-inline-start: 1px;
+ margin-inline-end: 1px;
+ padding-top: 1px;
+ padding-bottom: 1px;
+ border-width: 1px;
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
}
- @media (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+ listitem[selected="true"] {
+ border-top-color: var(--listitem-selectedBorder);
+ border-right-color: var(--listitem-selectedBorder);
+ border-left-color: var(--listitem-selectedBorder);
+ border-bottom-color: var(--listitem-selectedBottomBorder);
+ background-image: var(--listitem-selectedImage);
+ background-color: var(--listitem-selectedBackground);
+ color: -moz-DialogText;
+ }
+
+ listbox:focus > listitem[selected="true"] {
+ border-top-color: var(--listitem-selectedFocusBorder);
+ border-right-color: var(--listitem-selectedFocusBorder);
+ border-left-color: var(--listitem-selectedFocusBorder);
+ border-bottom-color: var(--listitem-selectedFocusBottomBorder);
+ background-image: var(--listitem-selectedFocusImage);
+ background-color: var(--listitem-selectedFocusBackground);
+ color: -moz-DialogText;
+ }
+
+ listbox:focus > listitem[current="true"] {
+ border-color: var(--listitem-selectedCurrentBorder);
+ outline: none;
+ }
+
+ listbox:focus > listitem[selected="true"][current="true"] {
+ border-top-color: var(--listitem-selectedFocusCurrentBorder);
+ border-right-color: var(--listitem-selectedFocusCurrentBorder);
+ border-left-color: var(--listitem-selectedFocusCurrentBorder);
+ border-bottom-color: var(--listitem-selectedFocusCurrentBottomBorder);
+ background-color: var(--listitem-selectedFocusCurrentBackground);
+ outline: none;
+ }
+
+ @media (-moz-os-version: windows-win7) {
listitem {
--listitem-selectedBottomBorder: var(--listitem-selectedColor);
--listitem-selectedBackground: rgba(190,190,190,.15);
--listitem-selectedImage: linear-gradient(rgba(190,190,190,.1), rgba(190,190,190,.4));
--listitem-selectedCurrentBorder: rgb(125,162,206);
--listitem-selectedFocusColor: rgb(132,172,221);
--listitem-selectedFocusBottomBorder: var(--listitem-selectedFocusColor);
--listitem-selectedFocusBackground: rgba(131,183,249,.02);
--- a/toolkit/themes/windows/global/menu.css
+++ b/toolkit/themes/windows/global/menu.css
@@ -138,25 +138,23 @@ menubar > menu:-moz-lwtheme:not([disable
menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) {
background-color: Highlight;
color: HighlightText !important;
text-shadow: none;
}
@media (-moz-windows-default-theme) {
- @media not all and (-moz-os-version: windows-xp) {
- menubar > menu:-moz-lwtheme {
- -moz-appearance: menuitem;
- }
+ menubar > menu:-moz-lwtheme {
+ -moz-appearance: menuitem;
+ }
- menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) {
- color: inherit !important;
- text-shadow: inherit;
- }
+ menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) {
+ color: inherit !important;
+ text-shadow: inherit;
}
}
%ifdef XP_WIN
menubar > menu:-moz-window-inactive {
color: ThreeDShadow;
}
%endif
--- a/toolkit/themes/windows/global/menulist.css
+++ b/toolkit/themes/windows/global/menulist.css
@@ -77,22 +77,16 @@ menulist:focus:not([open="true"]) > .men
background-color: Highlight;
color: HighlightText;
}
menulist:-moz-focusring:not([open="true"]) > .menulist-label-box {
border: 1px dotted ThreeDDarkShadow;
}
-@media (-moz-os-version: windows-xp) {
- menulist:-moz-focusring:not([open="true"]) > .menulist-label-box {
- border: 1px dotted #F5DB95;
- }
-}
-
/* ..... disabled state ..... */
menulist[disabled="true"] {
background-color: -moz-Dialog;
color: GrayText;
}
/* ::::: editable menulists ::::: */
@@ -108,36 +102,34 @@ html|*.menulist-editable-input {
margin: 0px !important;
border: none !important;
padding: 0px !important;
background: inherit;
font: inherit;
}
@media (-moz-windows-default-theme) {
- @media not all and (-moz-os-version: windows-xp) {
- .menulist-label-box {
- background-color: transparent !important;
- color: inherit !important;
- }
+ .menulist-label-box {
+ background-color: transparent !important;
+ color: inherit !important;
+ }
- .menulist-label {
- margin-top: -1px !important;
- margin-bottom: -1px !important;
- margin-inline-start: 0 !important;
- }
+ .menulist-label {
+ margin-top: -1px !important;
+ margin-bottom: -1px !important;
+ margin-inline-start: 0 !important;
+ }
- .menulist-description {
- margin-inline-start: 1ex !important;
- }
+ .menulist-description {
+ margin-inline-start: 1ex !important;
+ }
- menulist:not([editable="true"]) > .menulist-dropmarker {
- margin-top: -2px;
- margin-inline-start: 3px;
- margin-inline-end: -3px;
- }
+ menulist:not([editable="true"]) > .menulist-dropmarker {
+ margin-top: -2px;
+ margin-inline-start: 3px;
+ margin-inline-end: -3px;
+ }
- .menulist-icon {
- margin-top: -1px;
- margin-bottom: -1px;
- }
+ .menulist-icon {
+ margin-top: -1px;
+ margin-bottom: -1px;
}
}
--- a/toolkit/themes/windows/global/popup.css
+++ b/toolkit/themes/windows/global/popup.css
@@ -53,19 +53,17 @@ panel[type="arrow"][side="right"] {
background: var(--arrowpanel-background);
background-clip: padding-box;
border: 1px solid var(--arrowpanel-border-color);
box-shadow: 0 0 4px hsla(0,0%,0%,.2);
margin: 4px;
}
%ifdef XP_WIN
-@media (-moz-os-version: windows-xp),
- (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
+@media (-moz-os-version: windows-win7) {
%endif
.panel-arrowcontent {
border-radius: 4px;
}
%ifdef XP_WIN
}
%endif
--- a/toolkit/themes/windows/global/textbox.css
+++ b/toolkit/themes/windows/global/textbox.css
@@ -32,20 +32,18 @@ html|*.textbox-textarea {
border: none !important;
padding: 0px 1px !important;
background-color: inherit;
color: inherit;
font: inherit;
}
@media (-moz-windows-default-theme) {
- @media not all and (-moz-os-version: windows-xp) {
- textbox html|*.textbox-input::placeholder {
- font-style: italic;
- }
+ textbox html|*.textbox-input::placeholder {
+ font-style: italic;
}
}
.textbox-contextmenu {
cursor: default;
}
/* ..... readonly state ..... */
deleted file mode 100644
index e20f602c22ca95f82b8e05b37e1f6986cc9b8904..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/global/toolbarbutton.css
+++ b/toolkit/themes/windows/global/toolbarbutton.css
@@ -79,27 +79,20 @@ toolbarbutton[checked="true"]:not([disab
color: ButtonText;
}
@media (-moz-windows-default-theme) {
toolbarbutton:-moz-lwtheme {
text-shadow: none;
}
- toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):not([disabled="true"]) {
+ toolbarbutton:-moz-lwtheme:not([disabled="true"]) {
color: inherit;
text-shadow: inherit;
}
-
- @media not all and (-moz-os-version: windows-xp) {
- toolbarbutton:-moz-lwtheme:not([disabled="true"]) {
- color: inherit;
- text-shadow: inherit;
- }
- }
}
@media (-moz-windows-default-theme: 0) {
toolbarbutton:-moz-lwtheme {
-moz-appearance: none;
}
toolbarbutton:-moz-lwtheme:not([disabled="true"]) {
--- a/toolkit/themes/windows/global/tree.css
+++ b/toolkit/themes/windows/global/tree.css
@@ -305,28 +305,52 @@ treecol:not([hideheader="true"]) > .tree
.tree-columnpicker-icon {
list-style-image: url("chrome://global/skin/tree/columnpicker.gif");
}
/* ::::: twisty ::::: */
treechildren::-moz-tree-twisty {
- padding-inline-end: 4px;
+ padding-inline-end: 1px;
padding-top: 1px;
width: 9px; /* The image's width is 9 pixels */
list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd");
}
treechildren::-moz-tree-twisty(open) {
list-style-image: url("chrome://global/skin/tree/twisty.svg#open");
}
+treechildren::-moz-tree-twisty(hover) {
+ list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover");
+}
+
+treechildren::-moz-tree-twisty(hover, open) {
+ list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover");
+}
+
+treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty {
+ list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-rtl");
+}
+
+treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) {
+ list-style-image: url("chrome://global/skin/tree/twisty.svg#open-rtl");
+}
+
+treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover) {
+ list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover-rtl");
+}
+
+treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover, open) {
+ list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover-rtl");
+}
+
treechildren::-moz-tree-indentation {
- width: 18px;
+ width: 12px;
}
/* ::::: gridline style ::::: */
treechildren.gridlines::-moz-tree-cell {
border-right: 1px solid transparent !important;
border-bottom: 1px solid transparent !important;
}
@@ -354,239 +378,202 @@ treechildren::-moz-tree-cell-text(select
-moz-border-left-colors: Highlight;
-moz-border-right-colors: Highlight;
margin: 0;
margin-inline-start: -4px;
padding: 1px;
}
%ifdef XP_WIN
-@media not all and (-moz-os-version: windows-xp) {
- /* ::::: twisty ::::: */
-
- treechildren::-moz-tree-indentation {
- width: 12px;
- }
-
- treechildren::-moz-tree-twisty {
- padding-inline-end: 1px;
- }
-
- treechildren::-moz-tree-twisty(hover) {
- list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover");
+@media (-moz-windows-default-theme) {
+ treechildren {
+ --treechildren-outline: none;
+ --treechildren-2ndBorderColor: rgba(255,255,255,.4);
+ --treechildren-selectedColor: rgb(217,217,217);
+ --treechildren-focusColor: rgb(123,195,255);
+ --treechildren-selectedFocusColor: rgb(205,232,255);
+ --treechildren-currentColor: rgb(125,162,206);
+ --treechildren-hoverColor: rgb(229,243,255);
+ --treechildren-selectedBorder: var(--treechildren-selectedColor);
+ --treechildren-selectedBottomBorder: rgb(204,204,204);
+ --treechildren-selectedImage: linear-gradient(rgb(217,217,217), rgb(217,217,217));
+ --treechildren-selectedBackground: transparent;
+ --treechildren-currentFocusBorder: var(--treechildren-focusColor);
+ --treechildren-currentFocusBottomBorder: var(--treechildren-focusColor);
+ --treechildren-selectedFocusBorder: var(--treechildren-selectedFocusColor);
+ --treechildren-selectedFocusBottomBorder: rgb(165,214,255);
+ --treechildren-selectedFocusImage: none;
+ --treechildren-selectedFocusBackground: var(--treechildren-selectedFocusColor);
+ --treechildren-selectedFocusCurrentBorder: var(--treechildren-focusColor);
+ --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-focusColor);
+ --treechildren-selectedFocusCurrentImage: linear-gradient(rgb(205,232,255), rgb(205,232,255));
+ --treechildren-hoverBorder: var(--treechildren-hoverColor);
+ --treechildren-hoverBottomBorder: var(--treechildren-hoverColor);
+ --treechildren-hoverImage: linear-gradient(rgb(229,243,255), rgb(229,243,255));
+ --treechildren-hoverCurrentBorder: var(--treechildren-currentColor);
+ --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor);
+ --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16));
+ --treechildren-hoverSelectedBorder: var(--treechildren-focusColor);
+ --treechildren-hoverSelectedBottomBorder: var(--treechildren-focusColor);
+ --treechildren-hoverSelectedImage: linear-gradient(rgb(205,232,255), rgb(205,232,255));
}
- treechildren::-moz-tree-twisty(hover, open) {
- list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover");
+ treechildren:not(.autocomplete-treebody)::-moz-tree-row {
+ height: 1.8em;
+ color: -moz-FieldText;
+ margin-inline-start: 1px;
+ margin-inline-end: 1px;
+ border-width: 1px;
+ border-color: transparent;
+ background-repeat: no-repeat;
+ background-size: 100% 100%;
}
- treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty {
- list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-rtl");
+ treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) {
+ -moz-border-top-colors: var(--treechildren-selectedBorder);
+ -moz-border-right-colors: var(--treechildren-selectedBorder);
+ -moz-border-left-colors: var(--treechildren-selectedBorder);
+ -moz-border-bottom-colors: var(--treechildren-selectedBottomBorder);
+ background-image: var(--treechildren-selectedImage);
+ background-color: var(--treechildren-selectedBackground);
+ outline: var(--treechildren-outline);
}
- treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) {
- list-style-image: url("chrome://global/skin/tree/twisty.svg#open-rtl");
+ treechildren:not(.autocomplete-treebody)::-moz-tree-row(current, focus) {
+ border-style: solid;
+ -moz-border-top-colors: var(--treechildren-currentFocusBorder);
+ -moz-border-right-colors: var(--treechildren-currentFocusBorder);
+ -moz-border-left-colors: var(--treechildren-currentFocusBorder);
+ -moz-border-bottom-colors: var(--treechildren-currentFocusBottomBorder);
+ outline: var(--treechildren-outline);
}
- treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover) {
- list-style-image: url("chrome://global/skin/tree/twisty.svg#clsd-hover-rtl");
+ treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, focus),
+ treechildren::-moz-tree-row(dropOn) {
+ -moz-border-top-colors: var(--treechildren-selectedFocusBorder);
+ -moz-border-right-colors: var(--treechildren-selectedFocusBorder);
+ -moz-border-left-colors: var(--treechildren-selectedFocusBorder);
+ -moz-border-bottom-colors: var(--treechildren-selectedFocusBottomBorder);
+ background-image: var(--treechildren-selectedFocusImage);
+ background-color: var(--treechildren-selectedFocusBackground);
}
- treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(hover, open) {
- list-style-image: url("chrome://global/skin/tree/twisty.svg#open-hover-rtl");
+ treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, current, focus) {
+ border-style: solid;
+ -moz-border-top-colors: var(--treechildren-selectedFocusCurrentBorder);
+ -moz-border-right-colors: var(--treechildren-selectedFocusCurrentBorder);
+ -moz-border-left-colors: var(--treechildren-selectedFocusCurrentBorder);
+ -moz-border-bottom-colors: var(--treechildren-selectedFocusCurrentBottomBorder);
+ background-image: var(--treechildren-selectedFocusCurrentImage);
+ }
+
+ treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) {
+ -moz-border-top-colors: var(--treechildren-hoverBorder);
+ -moz-border-right-colors: var(--treechildren-hoverBorder);
+ -moz-border-left-colors: var(--treechildren-hoverBorder);
+ -moz-border-bottom-colors: var(--treechildren-hoverBottomBorder);
+ background-image: var(--treechildren-hoverImage);
+ outline: var(--treechildren-outline);
+ }
+
+ treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, current) {
+ -moz-border-top-colors: var(--treechildren-hoverCurrentBorder);
+ -moz-border-right-colors: var(--treechildren-hoverCurrentBorder);
+ -moz-border-left-colors: var(--treechildren-hoverCurrentBorder);
+ -moz-border-bottom-colors: var(--treechildren-hoverCurrentBottomBorder);
+ background-image: var(--treechildren-hoverCurrentImage);
+ }
+
+ treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, selected) {
+ -moz-border-top-colors: var(--treechildren-hoverSelectedBorder);
+ -moz-border-right-colors: var(--treechildren-hoverSelectedBorder);
+ -moz-border-left-colors: var(--treechildren-hoverSelectedBorder);
+ -moz-border-bottom-colors: var(--treechildren-hoverSelectedBottomBorder);
+ background-image: var(--treechildren-hoverSelectedImage);
+ }
+
+ tree[disabled="true"] > treechildren::-moz-tree-row {
+ background: none;
+ -moz-border-top-colors: transparent;
+ -moz-border-right-colors: transparent;
+ -moz-border-left-colors: transparent;
+ -moz-border-bottom-colors: transparent;
}
- @media (-moz-windows-default-theme) {
+ treechildren::-moz-tree-cell(dropOn) {
+ background-image: none;
+ background-color: transparent;
+ border-radius: 0;
+ }
+
+ treechildren::-moz-tree-cell-text(primary, dropOn) {
+ color: -moz-FieldText;
+ }
+
+ treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text {
+ padding-bottom: initial;
+ border-color: transparent;
+ background-color: transparent;
+ }
+
+ treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(selected, focus) {
+ color: -moz-DialogText;
+ }
+
+ @media (-moz-os-version: windows-win7) {
treechildren {
- --treechildren-outline: none;
- --treechildren-2ndBorderColor: rgba(255,255,255,.4);
- --treechildren-selectedColor: rgb(217,217,217);
- --treechildren-focusColor: rgb(123,195,255);
- --treechildren-selectedFocusColor: rgb(205,232,255);
- --treechildren-currentColor: rgb(125,162,206);
- --treechildren-hoverColor: rgb(229,243,255);
- --treechildren-selectedBorder: var(--treechildren-selectedColor);
- --treechildren-selectedBottomBorder: rgb(204,204,204);
- --treechildren-selectedImage: linear-gradient(rgb(217,217,217), rgb(217,217,217));
- --treechildren-selectedBackground: transparent;
- --treechildren-currentFocusBorder: var(--treechildren-focusColor);
- --treechildren-currentFocusBottomBorder: var(--treechildren-focusColor);
- --treechildren-selectedFocusBorder: var(--treechildren-selectedFocusColor);
- --treechildren-selectedFocusBottomBorder: rgb(165,214,255);
- --treechildren-selectedFocusImage: none;
- --treechildren-selectedFocusBackground: var(--treechildren-selectedFocusColor);
- --treechildren-selectedFocusCurrentBorder: var(--treechildren-focusColor);
- --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-focusColor);
- --treechildren-selectedFocusCurrentImage: linear-gradient(rgb(205,232,255), rgb(205,232,255));
- --treechildren-hoverBorder: var(--treechildren-hoverColor);
- --treechildren-hoverBottomBorder: var(--treechildren-hoverColor);
- --treechildren-hoverImage: linear-gradient(rgb(229,243,255), rgb(229,243,255));
- --treechildren-hoverCurrentBorder: var(--treechildren-currentColor);
- --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor);
- --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16));
- --treechildren-hoverSelectedBorder: var(--treechildren-focusColor);
- --treechildren-hoverSelectedBottomBorder: var(--treechildren-focusColor);
- --treechildren-hoverSelectedImage: linear-gradient(rgb(205,232,255), rgb(205,232,255));
+ --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor);
+ --treechildren-2ndBottomBorderColor: rgba(255,255,255,.6);
+ --treechildren-selectedBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBorderColor);
+ --treechildren-selectedBottomBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBottomBorderColor);
+ --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.1), rgba(190,190,190,.4));
+ --treechildren-currentFocusBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
+ --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
+ --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor);
+ --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
+ --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.375));
+ --treechildren-selectedFocusBackground: transparent;
+ --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
+ --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
+ --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5));
+ --treechildren-hoverBorder: rgb(184,214,251) var(--treechildren-2ndBorderColor);
+ --treechildren-hoverBottomBorder: rgb(184,214,251) var(--treechildren-2ndBottomBorderColor);
+ --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16));
+ --treechildren-hoverCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
+ --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
+ --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16));
+ --treechildren-hoverSelectedBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
+ --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
+ --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5));
}
treechildren:not(.autocomplete-treebody)::-moz-tree-row {
- height: 1.8em;
- color: -moz-FieldText;
- margin-inline-start: 1px;
- margin-inline-end: 1px;
- border-width: 1px;
- border-color: transparent;
- background-repeat: no-repeat;
- background-size: 100% 100%;
- }
-
- treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected) {
- -moz-border-top-colors: var(--treechildren-selectedBorder);
- -moz-border-right-colors: var(--treechildren-selectedBorder);
- -moz-border-left-colors: var(--treechildren-selectedBorder);
- -moz-border-bottom-colors: var(--treechildren-selectedBottomBorder);
- background-image: var(--treechildren-selectedImage);
- background-color: var(--treechildren-selectedBackground);
- outline: var(--treechildren-outline);
- }
-
- treechildren:not(.autocomplete-treebody)::-moz-tree-row(current, focus) {
- border-style: solid;
- -moz-border-top-colors: var(--treechildren-currentFocusBorder);
- -moz-border-right-colors: var(--treechildren-currentFocusBorder);
- -moz-border-left-colors: var(--treechildren-currentFocusBorder);
- -moz-border-bottom-colors: var(--treechildren-currentFocusBottomBorder);
- outline: var(--treechildren-outline);
+ border-width: 2px;
+ border-radius: 3px;
+ -moz-outline-radius: 3px;
}
-
- treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, focus),
- treechildren::-moz-tree-row(dropOn) {
- -moz-border-top-colors: var(--treechildren-selectedFocusBorder);
- -moz-border-right-colors: var(--treechildren-selectedFocusBorder);
- -moz-border-left-colors: var(--treechildren-selectedFocusBorder);
- -moz-border-bottom-colors: var(--treechildren-selectedFocusBottomBorder);
- background-image: var(--treechildren-selectedFocusImage);
- background-color: var(--treechildren-selectedFocusBackground);
- }
-
- treechildren:not(.autocomplete-treebody)::-moz-tree-row(selected, current, focus) {
- border-style: solid;
- -moz-border-top-colors: var(--treechildren-selectedFocusCurrentBorder);
- -moz-border-right-colors: var(--treechildren-selectedFocusCurrentBorder);
- -moz-border-left-colors: var(--treechildren-selectedFocusCurrentBorder);
- -moz-border-bottom-colors: var(--treechildren-selectedFocusCurrentBottomBorder);
- background-image: var(--treechildren-selectedFocusCurrentImage);
- }
-
- treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover) {
- -moz-border-top-colors: var(--treechildren-hoverBorder);
- -moz-border-right-colors: var(--treechildren-hoverBorder);
- -moz-border-left-colors: var(--treechildren-hoverBorder);
- -moz-border-bottom-colors: var(--treechildren-hoverBottomBorder);
- background-image: var(--treechildren-hoverImage);
- outline: var(--treechildren-outline);
- }
-
- treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, current) {
- -moz-border-top-colors: var(--treechildren-hoverCurrentBorder);
- -moz-border-right-colors: var(--treechildren-hoverCurrentBorder);
- -moz-border-left-colors: var(--treechildren-hoverCurrentBorder);
- -moz-border-bottom-colors: var(--treechildren-hoverCurrentBottomBorder);
- background-image: var(--treechildren-hoverCurrentImage);
- }
-
- treechildren:not(.autocomplete-treebody)::-moz-tree-row(hover, selected) {
- -moz-border-top-colors: var(--treechildren-hoverSelectedBorder);
- -moz-border-right-colors: var(--treechildren-hoverSelectedBorder);
- -moz-border-left-colors: var(--treechildren-hoverSelectedBorder);
- -moz-border-bottom-colors: var(--treechildren-hoverSelectedBottomBorder);
- background-image: var(--treechildren-hoverSelectedImage);
- }
+ }
- tree[disabled="true"] > treechildren::-moz-tree-row {
- background: none;
- -moz-border-top-colors: transparent;
- -moz-border-right-colors: transparent;
- -moz-border-left-colors: transparent;
- -moz-border-bottom-colors: transparent;
- }
-
- treechildren::-moz-tree-cell(dropOn) {
- background-image: none;
- background-color: transparent;
- border-radius: 0;
- }
-
- treechildren::-moz-tree-cell-text(primary, dropOn) {
- color: -moz-FieldText;
- }
-
- treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text {
- padding-bottom: initial;
- border-color: transparent;
- background-color: transparent;
- }
-
- treechildren:not(.autocomplete-treebody)::-moz-tree-cell-text(selected, focus) {
- color: -moz-DialogText;
- }
-
- @media (-moz-os-version: windows-vista),
- (-moz-os-version: windows-win7) {
- treechildren {
- --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor);
- --treechildren-2ndBottomBorderColor: rgba(255,255,255,.6);
- --treechildren-selectedBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBorderColor);
- --treechildren-selectedBottomBorder: var(--treechildren-selectedColor) var(--treechildren-2ndBottomBorderColor);
- --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.1), rgba(190,190,190,.4));
- --treechildren-currentFocusBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
- --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
- --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor);
- --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
- --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.375));
- --treechildren-selectedFocusBackground: transparent;
- --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
- --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
- --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5));
- --treechildren-hoverBorder: rgb(184,214,251) var(--treechildren-2ndBorderColor);
- --treechildren-hoverBottomBorder: rgb(184,214,251) var(--treechildren-2ndBottomBorderColor);
- --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16));
- --treechildren-hoverCurrentBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
- --treechildren-hoverCurrentBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
- --treechildren-hoverCurrentImage: linear-gradient(rgba(131,183,249,.05), rgba(131,183,249,.16));
- --treechildren-hoverSelectedBorder: var(--treechildren-currentColor) var(--treechildren-2ndBorderColor);
- --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor) var(--treechildren-2ndBottomBorderColor);
- --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.28), rgba(131,183,249,.5));
- }
-
- treechildren:not(.autocomplete-treebody)::-moz-tree-row {
- border-width: 2px;
- border-radius: 3px;
- -moz-outline-radius: 3px;
- }
- }
-
- @media (-moz-os-version: windows-win8) {
- treechildren {
- --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor);
- --treechildren-selectedBorder: var(--treechildren-selectedColor);
- --treechildren-selectedBottomBorder: var(--treechildren-selectedColor);
- --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.4), rgba(190,190,190,.4));
- --treechildren-currentFocusBorder: var(--treechildren-currentColor);
- --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor);
- --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor);
- --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor);
- --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.375), rgba(131,183,249,.375));
- --treechildren-selectedFocusBackground: transparent;
- --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor);
- --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor);
- --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5));
- --treechildren-hoverBorder: rgb(184,214,251);
- --treechildren-hoverBottomBorder: rgb(184,214,251);
- --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16));
- --treechildren-hoverSelectedBorder: var(--treechildren-currentColor);
- --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor);
- --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5));
- }
+ @media (-moz-os-version: windows-win8) {
+ treechildren {
+ --treechildren-outline: 1px solid var(--treechildren-2ndBorderColor);
+ --treechildren-selectedBorder: var(--treechildren-selectedColor);
+ --treechildren-selectedBottomBorder: var(--treechildren-selectedColor);
+ --treechildren-selectedImage: linear-gradient(rgba(190,190,190,.4), rgba(190,190,190,.4));
+ --treechildren-currentFocusBorder: var(--treechildren-currentColor);
+ --treechildren-currentFocusBottomBorder: var(--treechildren-currentColor);
+ --treechildren-selectedFocusBorder: rgb(132,172,221) var(--treechildren-2ndBorderColor);
+ --treechildren-selectedFocusBottomBorder: var(--treechildren-currentColor);
+ --treechildren-selectedFocusImage: linear-gradient(rgba(131,183,249,.375), rgba(131,183,249,.375));
+ --treechildren-selectedFocusBackground: transparent;
+ --treechildren-selectedFocusCurrentBorder: var(--treechildren-currentColor);
+ --treechildren-selectedFocusCurrentBottomBorder: var(--treechildren-currentColor);
+ --treechildren-selectedFocusCurrentImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5));
+ --treechildren-hoverBorder: rgb(184,214,251);
+ --treechildren-hoverBottomBorder: rgb(184,214,251);
+ --treechildren-hoverImage: linear-gradient(rgba(131,183,249,.16), rgba(131,183,249,.16));
+ --treechildren-hoverSelectedBorder: var(--treechildren-currentColor);
+ --treechildren-hoverSelectedBottomBorder: var(--treechildren-currentColor);
+ --treechildren-hoverSelectedImage: linear-gradient(rgba(131,183,249,.5), rgba(131,183,249,.5));
}
}
}
%endif
deleted file mode 100644
index 64d077a8f4bb335a605184f844f3f7d725ec69a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 9c4a82587c4dee2c7ced6347841399f637b16cdd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/toolkit/themes/windows/global/tree/twisty-XP.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="9" height="9">
- <style>
- use:not(:target) {
- display: none;
- }
- use {
- stroke: #000000;
- stroke-width: 1;
- }
- </style>
- <defs>
- <linearGradient id="linearGradient1">
- <stop style="stop-color: #ffffff;" offset="0"/>
- <stop style="stop-color: #e0e0e0;" offset="1"/>
- </linearGradient>
- <linearGradient id="linearGradient2">
- <stop style="stop-color: #c9c9c9;" offset="0"/>
- <stop style="stop-color: #f8f8f8;" offset="1"/>
- </linearGradient>
- <linearGradient id="gradient1" xlink:href="#linearGradient1" gradientUnits="userSpaceOnUse" x1="4.5" y1="2" x2="4.5" y2="7"/>
- <linearGradient id="gradient2" xlink:href="#linearGradient2" gradientUnits="userSpaceOnUse" x1="4.5" y1="6" x2="4.5" y2="3"/>
- <path id="clsd-shape" d="m 2,4.5 5,0 M 4.5,2 l 0,5"/>
- <path id="open-shape" d="m 2,4.5 5,0"/>
- </defs>
- <rect style="fill: url(#gradient1); stroke: #5d5cc2; stroke-linejoin: round; stroke-opacity: 0.8" width="8" height="8" x="0.5" y="0.5"/>
- <rect style="fill: url(#gradient2);" width="5" height="5" x="2" y="2"/>
- <use id="clsd" xlink:href="#clsd-shape"/>
- <use id="open" xlink:href="#open-shape"/>
-</svg>
rename from toolkit/themes/windows/global/tree/twisty-Vista78.svg
rename to toolkit/themes/windows/global/tree/twisty-preWin10.svg
deleted file mode 100644
index d36385ce535cc71aeb76224137340dac5fd529fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8225b6c2dc45bea483c282471269f4829ab7aa8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d1b737ab053238e964be204f9a83618e66b059ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a6f5b49b37f13cf890f82309ea9aff678916ec71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5c4d8bf471825d8960b8d35f6060ba620b7b0adc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7ecfc7d4c86e1b5569271ae2a90d4465e64bcfe1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 36e7689a3088f8fe350da770235af2f8c65727de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4d9ac5ad895281ec1fc1154d24270bad38e21be9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 16d77a4a25a3b94e40e36387430a7c1007de43bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index be645f76df92c954c143576eba8a9e43da0499fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -21,44 +21,14 @@ toolkit.jar:
skin/classic/mozapps/extensions/heart.png (extensions/heart.png)
* skin/classic/mozapps/extensions/newaddon.css (extensions/newaddon.css)
skin/classic/mozapps/plugins/pluginGeneric.png (plugins/pluginGeneric.png)
skin/classic/mozapps/plugins/pluginBlocked.png (plugins/pluginBlocked.png)
skin/classic/mozapps/plugins/pluginGeneric-16.png (plugins/pluginGeneric-16.png)
skin/classic/mozapps/profile/profileicon.png (profile/profileicon.png)
skin/classic/mozapps/update/updates.css (update/updates.css)
skin/classic/mozapps/viewsource/viewsource.css (viewsource/viewsource.css)
- skin/classic/mozapps/downloads/downloadButtons-XP.png (downloads/downloadButtons-XP.png)
- skin/classic/mozapps/downloads/downloadIcon-XP.png (downloads/downloadIcon-XP.png)
- skin/classic/mozapps/extensions/category-discover-XP.png (extensions/category-discover-XP.png)
- skin/classic/mozapps/extensions/category-plugins-XP.png (extensions/category-plugins-XP.png)
- skin/classic/mozapps/extensions/category-recent-XP.png (extensions/category-recent-XP.png)
- skin/classic/mozapps/extensions/category-available-XP.png (extensions/category-available-XP.png)
- skin/classic/mozapps/extensions/extensionGeneric-16-XP.png (extensions/extensionGeneric-16-XP.png)
- skin/classic/mozapps/extensions/themeGeneric-XP.png (extensions/themeGeneric-XP.png)
- skin/classic/mozapps/extensions/themeGeneric-16-XP.png (extensions/themeGeneric-16-XP.png)
- skin/classic/mozapps/extensions/localeGeneric-XP.png (extensions/localeGeneric-XP.png)
- skin/classic/mozapps/plugins/pluginGeneric-XP.png (plugins/pluginGeneric-XP.png)
- skin/classic/mozapps/plugins/pluginBlocked-XP.png (plugins/pluginBlocked-XP.png)
- skin/classic/mozapps/plugins/pluginGeneric-16-XP.png (plugins/pluginGeneric-16-XP.png)
- skin/classic/mozapps/profile/profileicon-XP.png (profile/profileicon-XP.png)
- skin/classic/mozapps/update/downloadButtons-XP.png (update/downloadButtons-XP.png)
#if MOZ_BUILD_APP == browser
[browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
#elif MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES
[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
#endif
-% override chrome://mozapps/skin/downloads/downloadButtons.png chrome://mozapps/skin/downloads/downloadButtons-XP.png osversion<6
-% override chrome://mozapps/skin/downloads/downloadIcon.png chrome://mozapps/skin/downloads/downloadIcon-XP.png osversion<6
-% override chrome://mozapps/skin/extensions/category-discover.png chrome://mozapps/skin/extensions/category-discover-XP.png osversion<6
-% override chrome://mozapps/skin/extensions/category-plugins.png chrome://mozapps/skin/extensions/category-plugins-XP.png osversion<6
-% override chrome://mozapps/skin/extensions/category-recent.png chrome://mozapps/skin/extensions/category-recent-XP.png osversion<6
-% override chrome://mozapps/skin/extensions/category-available.png chrome://mozapps/skin/extensions/category-available-XP.png osversion<6
-% override chrome://mozapps/skin/extensions/extensionGeneric-16.png chrome://mozapps/skin/extensions/extensionGeneric-16-XP.png osversion<6
-% override chrome://mozapps/skin/extensions/themeGeneric.png chrome://mozapps/skin/extensions/themeGeneric-XP.png osversion<6
-% override chrome://mozapps/skin/extensions/themeGeneric-16.png chrome://mozapps/skin/extensions/themeGeneric-16-XP.png osversion<6
-% override chrome://mozapps/skin/extensions/localeGeneric.png chrome://mozapps/skin/extensions/localeGeneric-XP.png osversion<6
-% override chrome://mozapps/skin/plugins/pluginGeneric.png chrome://mozapps/skin/plugins/pluginGeneric-XP.png osversion<6
-% override chrome://mozapps/skin/plugins/pluginBlocked.png chrome://mozapps/skin/plugins/pluginBlocked-XP.png osversion<6
-% override chrome://mozapps/skin/plugins/pluginGeneric-16.png chrome://mozapps/skin/plugins/pluginGeneric-16-XP.png osversion<6
-% override chrome://mozapps/skin/profile/profileicon.png chrome://mozapps/skin/profile/profileicon-XP.png osversion<6
-% override chrome://mozapps/skin/update/downloadButtons.png chrome://mozapps/skin/update/downloadButtons-XP.png osversion<6
deleted file mode 100644
index 954036c1f099c58165878f5ab9349f0f9b705d3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d6dffb29b4f853a6f34a709ae5fb116d5b63a6a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3e6d43c9ac1f12558eeb14aaab7a653655eab907..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0854ee17748e2cc0b271d6b9cf4132b5847d8646..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d36385ce535cc71aeb76224137340dac5fd529fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
