Bug 1280510 - Copy hi/lo dpi loading icon from windows to Linux. r?dao
MozReview-Commit-ID: FraPEDKnQAQ
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2426,22 +2426,16 @@ toolbarbutton.chevron > .toolbarbutton-m
%include ../shared/tabs.inc.css
.tab-label {
margin-top: 1px;
margin-bottom: 0;
text-align: center;
}
-@media (min-resolution: 1.1dppx) {
- .tab-throbber[progress] {
- list-style-image: url("chrome://global/skin/icons/loading@2x.png");
- }
-}
-
@media (-moz-mac-yosemite-theme) {
/* image preloading hack from shared/tabs.inc.css */
#tabbrowser-tabs::before {
background-image:
url(chrome://browser/skin/yosemite/tab-selected-end-inactive.svg),
url(chrome://browser/skin/yosemite/tab-selected-start-inactive.svg),
url(chrome://browser/skin/yosemite/tab-stroke-start-inactive.png),
url(chrome://browser/skin/yosemite/tab-active-middle-inactive.png),
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -552,9 +552,13 @@
.tab-throbber[busy] {
list-style-image: url("chrome://browser/skin/tabbrowser/connecting@2x.png");
}
.tab-icon-image {
list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png");
}
+
+ .tab-throbber[progress] {
+ list-style-image: url("chrome://global/skin/icons/loading@2x.png");
+ }
}
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1909,22 +1909,16 @@ html|span.ac-emphasize-text-url {
#main-window[sizemode=normal] #TabsToolbar {
padding-left: 2px;
padding-right: 2px;
}
}
%include ../shared/tabs.inc.css
-@media (min-resolution: 1.1dppx) {
- .tab-throbber[progress] {
- list-style-image: url("chrome://global/skin/icons/loading@2x.png");
- }
-}
-
/* 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[visuallyselected=true]::after,
.tab-background-start[visuallyselected=true]::after {
deleted file mode 100644
index a2f9b797098e4b9c3170c341d5623ccd711e6cc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/linux/global/jar.mn
+++ b/toolkit/themes/linux/global/jar.mn
@@ -38,17 +38,16 @@ toolkit.jar:
skin/classic/global/dirListing/remote.png (dirListing/remote.png)
skin/classic/global/icons/Authentication.png (icons/Authentication.png)
skin/classic/global/icons/autocomplete-search.svg (icons/autocomplete-search.svg)
skin/classic/global/icons/autoscroll.png (icons/autoscroll.png)
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.svg (icons/close.svg)
- skin/classic/global/icons/loading.png (icons/loading.png)
skin/classic/global/icons/panelarrow-horizontal.svg (icons/panelarrow-horizontal.svg)
skin/classic/global/icons/panelarrow-vertical.svg (icons/panelarrow-vertical.svg)
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)
deleted file mode 100644
index b886c73eff9239196fbe3db01116c220f726469b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index ac928c585372bd72707d895c37c9e11931b327bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -93,18 +93,16 @@ toolkit.jar:
skin/classic/global/icons/close@2x.png (icons/close@2x.png)
skin/classic/global/icons/glyph-dropdown.png (icons/glyph-dropdown.png)
skin/classic/global/icons/glyph-dropdown@2x.png (icons/glyph-dropdown@2x.png)
skin/classic/global/icons/information-16.png (icons/information-16.png)
skin/classic/global/icons/information-24.png (icons/information-24.png)
skin/classic/global/icons/information-32.png (icons/information-32.png)
skin/classic/global/icons/information-64.png (icons/information-64.png)
skin/classic/global/icons/information-large.png (icons/information-large.png)
- skin/classic/global/icons/loading.png (icons/loading.png)
- skin/classic/global/icons/loading@2x.png (icons/loading@2x.png)
skin/classic/global/icons/menulist-dropmarker.png (icons/menulist-dropmarker.png)
skin/classic/global/icons/notfound.png (icons/notfound.png)
skin/classic/global/icons/panebutton-active.png (icons/panebutton-active.png)
skin/classic/global/icons/panebutton-inactive.png (icons/panebutton-inactive.png)
skin/classic/global/icons/panel-dropmarker.png (icons/panel-dropmarker.png)
skin/classic/global/icons/resizer.png (icons/resizer.png)
skin/classic/global/icons/resizer@2x.png (icons/resizer@2x.png)
skin/classic/global/icons/resizer-rtl.png (icons/resizer-rtl.png)
rename from toolkit/themes/windows/global/icons/loading.png
rename to toolkit/themes/shared/icons/loading.png
rename from toolkit/themes/windows/global/icons/loading@2x.png
rename to toolkit/themes/shared/icons/loading@2x.png
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -18,16 +18,18 @@ toolkit.jar:
skin/classic/global/aboutReader.css (../../shared/aboutReader.css)
skin/classic/global/aboutReaderContent.css (../../shared/aboutReaderContent.css)
* skin/classic/global/aboutReaderControls.css (../../shared/aboutReaderControls.css)
skin/classic/global/aboutSupport.css (../../shared/aboutSupport.css)
skin/classic/global/appPicker.css (../../shared/appPicker.css)
skin/classic/global/config.css (../../shared/config.css)
skin/classic/global/icons/find-arrows.svg (../../shared/icons/find-arrows.svg)
skin/classic/global/icons/info.svg (../../shared/incontent-icons/info.svg)
+ skin/classic/global/icons/loading.png (../../shared/icons/loading.png)
+ skin/classic/global/icons/loading@2x.png (../../shared/icons/loading@2x.png)
skin/classic/global/icons/loading-inverted.png (../../shared/icons/loading-inverted.png)
skin/classic/global/icons/loading-inverted@2x.png (../../shared/icons/loading-inverted@2x.png)
skin/classic/global/icons/warning.svg (../../shared/incontent-icons/warning.svg)
skin/classic/global/icons/blocked.svg (../../shared/incontent-icons/blocked.svg)
skin/classic/global/alerts/alert-common.css (../../shared/alert-common.css)
skin/classic/global/narrate.css (../../shared/narrate.css)
skin/classic/global/narrateControls.css (../../shared/narrateControls.css)
skin/classic/global/narrate/arrow.svg (../../shared/narrate/arrow.svg)
@@ -58,9 +60,8 @@ toolkit.jar:
skin/classic/global/reader/RM-Line-Height-Minus-38x14.svg (../../shared/reader/RM-Line-Height-Minus-38x14.svg)
skin/classic/global/reader/RM-Line-Height-Plus-38x24.svg (../../shared/reader/RM-Line-Height-Plus-38x24.svg)
#ifdef MOZ_PLACES
skin/classic/mozapps/places/defaultFavicon.png (../../shared/places/defaultFavicon.png)
skin/classic/mozapps/places/defaultFavicon@2x.png (../../shared/places/defaultFavicon@2x.png)
skin/classic/mozapps/places/defaultFavicon-inverted.png (../../shared/places/defaultFavicon-inverted.png)
skin/classic/mozapps/places/defaultFavicon-inverted@2x.png (../../shared/places/defaultFavicon-inverted@2x.png)
#endif
-
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -40,18 +40,16 @@ toolkit.jar:
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/loading.png (icons/loading.png)
- skin/classic/global/icons/loading@2x.png (icons/loading@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)