diff --git a/browser/themes/windows/browser-lightweightTheme.css b/browser/themes/windows/browser-lightweightTheme.css index 06bd40528507..d2a1b840c003 100644 --- a/browser/themes/windows/browser-lightweightTheme.css +++ b/browser/themes/windows/browser-lightweightTheme.css @@ -29,3 +29,11 @@ background-position: 0 0, 0 0, right top; background-repeat: repeat-x, repeat-x, no-repeat; } + +@media (min-resolution: 1.25dppx) { + #tabbrowser-tabs:not([movingtab]) > .tabbrowser-tab > .tab-stack > .tab-background > .tab-background-middle[selected=true]:-moz-lwtheme { + background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle@2x.png), + @fgTabTextureLWT@;/*, + lwtHeader;*/ + } +} diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 71f8224da63d..9d2c76723736 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -1809,6 +1809,39 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { %include ../shared/tabs.inc.css +@media (min-resolution: 1.25dppx) { + /* image preloading hack from shared/tabs.inc.css */ + #tabbrowser-tabs::before { + background-image: + url(chrome://browser/skin/tabbrowser/tab-background-end@2x.png), + url(chrome://browser/skin/tabbrowser/tab-background-middle@2x.png), + url(chrome://browser/skin/tabbrowser/tab-background-start@2x.png); + } + + .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected=true]), + .tabs-newtab-button:hover { + background-image: url(chrome://browser/skin/tabbrowser/tab-background-start@2x.png), + url(chrome://browser/skin/tabbrowser/tab-background-middle@2x.png), + url(chrome://browser/skin/tabbrowser/tab-background-end@2x.png); + } + + .tab-background-middle[selected=true] { + background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle@2x.png), + @fgTabTexture@, + none; + } + + .tab-background-start[selected=true]:-moz-locale-dir(ltr)::after, + .tab-background-end[selected=true]:-moz-locale-dir(rtl)::after { + background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-start@2x.png); + } + + .tab-background-end[selected=true]:-moz-locale-dir(ltr)::after, + .tab-background-start[selected=true]:-moz-locale-dir(rtl)::after { + background-image: url(chrome://browser/skin/tabbrowser/tab-stroke-end@2x.png); + } +} + %ifndef WINDOWS_AERO /* Use lighter colors of buttons and text in the titlebar on luna-blue */ @media (-moz-windows-theme: luna-blue) { diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index ec8226d13975..b32fa121b6d7 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -185,11 +185,15 @@ browser.jar: skin/classic/browser/tabbrowser/loading.png (tabbrowser/loading.png) skin/classic/browser/tabbrowser/tab.png (tabbrowser/tab.png) 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.png (tabbrowser/tab-arrow-left.png) skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png (tabbrowser/tab-arrow-left-inverted.png) 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-overflow-border.png (tabbrowser/tab-overflow-border.png) # NOTE: The following two files (tab-selected-end.svg, tab-selected-start.svg) get pre-processed in @@ -198,7 +202,9 @@ browser.jar: skin/classic/browser/tabbrowser/tab-selected-start.svg (tab-selected-start.svg) skin/classic/browser/tabbrowser/tab-stroke-end.png (tabbrowser/tab-stroke-end.png) + skin/classic/browser/tabbrowser/tab-stroke-end@2x.png (tabbrowser/tab-stroke-end@2x.png) skin/classic/browser/tabbrowser/tab-stroke-start.png (tabbrowser/tab-stroke-start.png) + skin/classic/browser/tabbrowser/tab-stroke-start@2x.png (tabbrowser/tab-stroke-start@2x.png) skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png) skin/classic/browser/tabbrowser/tab-separator-luna-blue.png (tabbrowser/tab-separator-luna-blue.png) skin/classic/browser/tabbrowser/tab-separator.png (tabbrowser/tab-separator.png) @@ -543,11 +549,15 @@ browser.jar: skin/classic/aero/browser/tabbrowser/loading.png (tabbrowser/loading.png) skin/classic/aero/browser/tabbrowser/tab.png (tabbrowser/tab.png) skin/classic/aero/browser/tabbrowser/tab-active-middle.png (tabbrowser/tab-active-middle.png) + skin/classic/aero/browser/tabbrowser/tab-active-middle@2x.png (tabbrowser/tab-active-middle@2x.png) skin/classic/aero/browser/tabbrowser/tab-arrow-left.png (tabbrowser/tab-arrow-left.png) skin/classic/aero/browser/tabbrowser/tab-arrow-left-inverted.png (tabbrowser/tab-arrow-left-inverted.png) skin/classic/aero/browser/tabbrowser/tab-background-start.png (tabbrowser/tab-background-start.png) + skin/classic/aero/browser/tabbrowser/tab-background-start@2x.png (tabbrowser/tab-background-start@2x.png) skin/classic/aero/browser/tabbrowser/tab-background-middle.png (tabbrowser/tab-background-middle.png) + skin/classic/aero/browser/tabbrowser/tab-background-middle@2x.png (tabbrowser/tab-background-middle@2x.png) skin/classic/aero/browser/tabbrowser/tab-background-end.png (tabbrowser/tab-background-end.png) + skin/classic/aero/browser/tabbrowser/tab-background-end@2x.png (tabbrowser/tab-background-end@2x.png) skin/classic/aero/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png) # NOTE: The following two files (tab-selected-end.svg, tab-selected-start.svg) get pre-processed in @@ -556,7 +566,9 @@ browser.jar: skin/classic/aero/browser/tabbrowser/tab-selected-start.svg (tab-selected-start-aero.svg) skin/classic/aero/browser/tabbrowser/tab-stroke-end.png (tabbrowser/tab-stroke-end.png) + skin/classic/aero/browser/tabbrowser/tab-stroke-end@2x.png (tabbrowser/tab-stroke-end@2x.png) skin/classic/aero/browser/tabbrowser/tab-stroke-start.png (tabbrowser/tab-stroke-start.png) + skin/classic/aero/browser/tabbrowser/tab-stroke-start@2x.png (tabbrowser/tab-stroke-start@2x.png) skin/classic/aero/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png) skin/classic/aero/browser/tabbrowser/tab-separator.png (tabbrowser/tab-separator-aero.png) skin/classic/aero/browser/tabview/close.png (tabview/close.png) diff --git a/browser/themes/windows/tabbrowser/tab-active-middle@2x.png b/browser/themes/windows/tabbrowser/tab-active-middle@2x.png new file mode 100644 index 000000000000..ff154d5b9a90 Binary files /dev/null and b/browser/themes/windows/tabbrowser/tab-active-middle@2x.png differ diff --git a/browser/themes/windows/tabbrowser/tab-background-end@2x.png b/browser/themes/windows/tabbrowser/tab-background-end@2x.png new file mode 100644 index 000000000000..edcb3fa84a4c Binary files /dev/null and b/browser/themes/windows/tabbrowser/tab-background-end@2x.png differ diff --git a/browser/themes/windows/tabbrowser/tab-background-middle@2x.png b/browser/themes/windows/tabbrowser/tab-background-middle@2x.png new file mode 100644 index 000000000000..c99921f861c2 Binary files /dev/null and b/browser/themes/windows/tabbrowser/tab-background-middle@2x.png differ diff --git a/browser/themes/windows/tabbrowser/tab-background-start@2x.png b/browser/themes/windows/tabbrowser/tab-background-start@2x.png new file mode 100644 index 000000000000..b71e638beb8a Binary files /dev/null and b/browser/themes/windows/tabbrowser/tab-background-start@2x.png differ diff --git a/browser/themes/windows/tabbrowser/tab-stroke-end@2x.png b/browser/themes/windows/tabbrowser/tab-stroke-end@2x.png new file mode 100644 index 000000000000..25ad262dab69 Binary files /dev/null and b/browser/themes/windows/tabbrowser/tab-stroke-end@2x.png differ diff --git a/browser/themes/windows/tabbrowser/tab-stroke-start@2x.png b/browser/themes/windows/tabbrowser/tab-stroke-start@2x.png new file mode 100644 index 000000000000..af6fb99bcb89 Binary files /dev/null and b/browser/themes/windows/tabbrowser/tab-stroke-start@2x.png differ