Skip to content

Commit

Permalink
Bug 1280131 - Add tabbrowser hidpi assets in Linux. r=Gijs
Browse files Browse the repository at this point in the history
MozReview-Commit-ID: 45EVizpkB9S
  • Loading branch information
eeejay committed Jun 14, 2016
1 parent f7ff306 commit aa2a01c
Show file tree
Hide file tree
Showing 11 changed files with 51 additions and 77 deletions.
11 changes: 9 additions & 2 deletions browser/themes/linux/jar.mn
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,29 @@ browser.jar:
skin/classic/browser/tabbrowser/alltabs.png (tabbrowser/alltabs.png)
skin/classic/browser/tabbrowser/alltabs-inverted.png (tabbrowser/alltabs-inverted.png)
skin/classic/browser/tabbrowser/connecting.png (tabbrowser/connecting.png)
skin/classic/browser/tabbrowser/[email protected] (tabbrowser/[email protected])
skin/classic/browser/tabbrowser/newtab.svg (tabbrowser/newtab.svg)
skin/classic/browser/tabbrowser/newtab-inverted.svg (tabbrowser/newtab-inverted.svg)
skin/classic/browser/tabbrowser/tab-active-middle.png (tabbrowser/tab-active-middle.png)
skin/classic/browser/tabbrowser/[email protected] (tabbrowser/[email protected])
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-end.png (tabbrowser/tab-background-end.png)
skin/classic/browser/tabbrowser/tab-background-middle.png (tabbrowser/tab-background-middle.png)
skin/classic/browser/tabbrowser/tab-background-start.png (tabbrowser/tab-background-start.png)
skin/classic/browser/tabbrowser/[email protected] (tabbrowser/[email protected])
skin/classic/browser/tabbrowser/tab-background-middle.png (tabbrowser/tab-background-middle.png)
skin/classic/browser/tabbrowser/[email protected] (tabbrowser/[email protected])
skin/classic/browser/tabbrowser/tab-background-start.png (tabbrowser/tab-background-start.png)
skin/classic/browser/tabbrowser/[email protected] (tabbrowser/[email protected])

# NOTE: The following two files (tab-selected-end.svg, tab-selected-start.svg) get pre-processed in
# Makefile.in with a non-default marker of "%" and the result of that gets packaged.
skin/classic/browser/tabbrowser/tab-selected-end.svg (tab-selected-end.svg)
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/[email protected] (tabbrowser/[email protected])
skin/classic/browser/tabbrowser/tab-stroke-start.png (tabbrowser/tab-stroke-start.png)
skin/classic/browser/tabbrowser/[email protected] (tabbrowser/[email protected])
skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)

skin/classic/browser/sync-16.png
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added browser/themes/linux/tabbrowser/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added browser/themes/linux/tabbrowser/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 1 addition & 40 deletions browser/themes/osx/browser.css
Original file line number Diff line number Diff line change
Expand Up @@ -2456,46 +2456,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
text-align: center;
}

@media (min-resolution: 2dppx) {
/* image preloading hack from shared/tabs.inc.css */
#tabbrowser-tabs::before {
background-image:
url(chrome://browser/skin/tabbrowser/[email protected]),
url(chrome://browser/skin/tabbrowser/[email protected]),
url(chrome://browser/skin/tabbrowser/[email protected]);
}

.tabbrowser-tab:hover > .tab-stack > .tab-background:not([visuallyselected=true]),
.tabs-newtab-button:hover {
background-image: url(chrome://browser/skin/tabbrowser/[email protected]),
url(chrome://browser/skin/tabbrowser/[email protected]),
url(chrome://browser/skin/tabbrowser/[email protected]);
}

.tab-background-middle[visuallyselected=true] {
background-image: url(chrome://browser/skin/tabbrowser/[email protected]),
@fgTabTexture@,
none;
}

.tab-background-start[visuallyselected=true]:-moz-locale-dir(ltr)::after,
.tab-background-end[visuallyselected=true]:-moz-locale-dir(rtl)::after {
background-image: url(chrome://browser/skin/tabbrowser/[email protected]);
}

.tab-background-end[visuallyselected=true]:-moz-locale-dir(ltr)::after,
.tab-background-start[visuallyselected=true]:-moz-locale-dir(rtl)::after {
background-image: url(chrome://browser/skin/tabbrowser/[email protected]);
}

.tab-icon-image {
list-style-image: url("chrome://mozapps/skin/places/[email protected]");
}

.tab-throbber[busy] {
list-style-image: url("chrome://browser/skin/tabbrowser/[email protected]");
}

@media (min-resolution: 1.1dppx) {
.tab-throbber[progress] {
list-style-image: url("chrome://global/skin/icons/[email protected]");
}
Expand Down
41 changes: 41 additions & 0 deletions browser/themes/shared/tabs.inc.css
Original file line number Diff line number Diff line change
Expand Up @@ -474,3 +474,44 @@
.tabs-newtab-button {
width: calc(36px + @tabCurveWidth@);
}

@media (min-resolution: 1.1dppx) {
/* image preloading hack from like lowdpi styles */
#tabbrowser-tabs::before {
background-image:
url(chrome://browser/skin/tabbrowser/[email protected]),
url(chrome://browser/skin/tabbrowser/[email protected]),
url(chrome://browser/skin/tabbrowser/[email protected]);
}

.tabbrowser-tab:hover > .tab-stack > .tab-background:not([visuallyselected=true]),
.tabs-newtab-button:hover {
background-image: url(chrome://browser/skin/tabbrowser/[email protected]),
url(chrome://browser/skin/tabbrowser/[email protected]),
url(chrome://browser/skin/tabbrowser/[email protected]);
}

.tab-background-middle[visuallyselected=true] {
background-image: url(chrome://browser/skin/tabbrowser/[email protected]),
@fgTabTexture@,
none;
}

.tab-background-start[visuallyselected=true]:-moz-locale-dir(ltr)::after,
.tab-background-end[visuallyselected=true]:-moz-locale-dir(rtl)::after {
background-image: url(chrome://browser/skin/tabbrowser/[email protected]);
}

.tab-background-end[visuallyselected=true]:-moz-locale-dir(ltr)::after,
.tab-background-start[visuallyselected=true]:-moz-locale-dir(rtl)::after {
background-image: url(chrome://browser/skin/tabbrowser/[email protected]);
}

.tab-throbber[busy] {
list-style-image: url("chrome://browser/skin/tabbrowser/[email protected]");
}

.tab-icon-image {
list-style-image: url("chrome://mozapps/skin/places/[email protected]");
}
}
35 changes: 0 additions & 35 deletions browser/themes/windows/browser.css
Original file line number Diff line number Diff line change
Expand Up @@ -1950,41 +1950,6 @@ html|span.ac-emphasize-text-url {
%include ../shared/tabs.inc.css

@media (min-resolution: 1.1dppx) {
/* image preloading hack from shared/tabs.inc.css */
#tabbrowser-tabs::before {
background-image:
url(chrome://browser/skin/tabbrowser/[email protected]),
url(chrome://browser/skin/tabbrowser/[email protected]),
url(chrome://browser/skin/tabbrowser/[email protected]);
}

.tabbrowser-tab:hover > .tab-stack > .tab-background:not([visuallyselected=true]),
.tabs-newtab-button:hover {
background-image: url(chrome://browser/skin/tabbrowser/[email protected]),
url(chrome://browser/skin/tabbrowser/[email protected]),
url(chrome://browser/skin/tabbrowser/[email protected]);
}

.tab-background-middle[visuallyselected=true] {
background-image: url(chrome://browser/skin/tabbrowser/[email protected]),
@fgTabTexture@,
none;
}

.tab-background-start[visuallyselected=true]:-moz-locale-dir(ltr)::after,
.tab-background-end[visuallyselected=true]:-moz-locale-dir(rtl)::after {
background-image: url(chrome://browser/skin/tabbrowser/[email protected]);
}

.tab-background-end[visuallyselected=true]:-moz-locale-dir(ltr)::after,
.tab-background-start[visuallyselected=true]:-moz-locale-dir(rtl)::after {
background-image: url(chrome://browser/skin/tabbrowser/[email protected]);
}

.tab-throbber[busy] {
list-style-image: url("chrome://browser/skin/tabbrowser/[email protected]");
}

.tab-throbber[progress] {
list-style-image: url("chrome://global/skin/icons/[email protected]");
}
Expand Down

0 comments on commit aa2a01c

Please sign in to comment.