Bug 1210703 - fix webapprt theme overlap, r=dao
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Tue, 03 Nov 2015 23:11:52 +0000
changeset 271815 88b8fa914138e84405e7a0a7aa7c4b5d8301cd57
parent 271764 d5b4d4fc3bedee326a08ef8049db0c261164fd2d
child 271816 98befa2ee036966fc2f21b674ed3c5dae680372d
push id29655
push usercbook@mozilla.com
push dateTue, 10 Nov 2015 10:57:28 +0000
treeherdermozilla-central@f2f65c103a35 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1210703
milestone45.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1210703 - fix webapprt theme overlap, r=dao
webapprt/themes/linux/jar.mn
webapprt/themes/moz.build
webapprt/themes/windows/jar.mn
--- a/webapprt/themes/linux/jar.mn
+++ b/webapprt/themes/linux/jar.mn
@@ -1,7 +1,9 @@
 # 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/.
 
 webapprt.jar:
-+ skin/classic/webapprt/downloads/downloadIcon.png          (downloads/downloadIcon.png)
-+ skin/classic/webapprt/downloads/downloads.css             (downloads/downloads.css)
+% skin webapprt classic/1.0 %skin/classic/webapprt/
+  skin/classic/webapprt/downloads/downloadButtons.png       (../windows/downloads/downloadButtons.png)
+  skin/classic/webapprt/downloads/downloadIcon.png          (downloads/downloadIcon.png)
+  skin/classic/webapprt/downloads/downloads.css             (downloads/downloads.css)
--- a/webapprt/themes/moz.build
+++ b/webapprt/themes/moz.build
@@ -10,13 +10,13 @@
 # Windows                 windows (toolkit/themes/windows)
 # GNOME/Linux             windows (toolkit/themes/windows) +
 #                         linux overrides (toolkit/themes/linux)
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 
 if toolkit == 'cocoa':
     DIRS += ['osx']
-else:
+elif toolkit in ('gtk2', 'gtk3', 'qt'):
+    DIRS += ['linux']
+elif:
     DIRS += ['windows']
 
-    if toolkit in ('gtk2', 'gtk3', 'qt'):
-        DIRS += ['linux']
--- a/webapprt/themes/windows/jar.mn
+++ b/webapprt/themes/windows/jar.mn
@@ -5,10 +5,10 @@
 webapprt.jar:
 % skin webapprt classic/1.0 %skin/classic/webapprt/
         skin/classic/webapprt/downloads/downloadButtons.png         (downloads/downloadButtons.png)
         skin/classic/webapprt/downloads/downloadButtons-XP.png      (downloads/downloadButtons-XP.png)
         skin/classic/webapprt/downloads/downloadIcon.png            (downloads/downloadIcon.png)
         skin/classic/webapprt/downloads/downloadIcon-XP.png         (downloads/downloadIcon-XP.png)
         skin/classic/webapprt/downloads/downloads.css               (downloads/downloads.css)
 
-% override chrome://webapprt/skin/downloads/downloadButtons.png     chrome://webapprt/skin/downloads/downloadButtons-XP.png  os=WINNT osversion<6
-% override chrome://webapprt/skin/downloads/downloadIcon.png        chrome://webapprt/skin/downloads/downloadIcon-XP.png     os=WINNT osversion<6
+% override chrome://webapprt/skin/downloads/downloadButtons.png     chrome://webapprt/skin/downloads/downloadButtons-XP.png  osversion<6
+% override chrome://webapprt/skin/downloads/downloadIcon.png        chrome://webapprt/skin/downloads/downloadIcon-XP.png     osversion<6