Bug 686168 - Move help from toolkit to suite. Minor cleanups. r=IanN a=IanN
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Thu, 28 Jul 2016 00:59:12 +0200
changeset 19790 a744f83c0ab546992dd8c3d44547ff3f1a1b1446
parent 19789 da98f4fe52124cbc900b9a0f308312c4ba423a33
child 19791 5e80a0f786b1c13974b59b17fa3841693a3e7018
push id12117
push userfrgrahl@gmx.net
push dateWed, 27 Jul 2016 22:59:44 +0000
treeherdercomm-central@a744f83c0ab5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, IanN
bugs686168
Bug 686168 - Move help from toolkit to suite. Minor cleanups. r=IanN a=IanN
suite/confvars.sh
suite/themes/modern/communicator/helpviewer/help.css
suite/themes/modern/communicator/helpviewer/helpFileLayout.css
suite/themes/modern/helpviewer/help.css
suite/themes/modern/helpviewer/helpFileLayout.css
suite/themes/modern/jar.mn
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -16,17 +16,16 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/br
 MOZ_EXTENSIONS_DEFAULT=" inspector irc gio"
 MOZ_UPDATER=1
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=seamonkey-comm-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=seamonkey-comm-central
-MOZ_HELP_VIEWER=1
 MOZ_MORK=1
 # Enable navigator.mozPay
 MOZ_PAY=1
 MOZ_SAFE_BROWSING=1
 MOZ_SERVICES_FXACCOUNTS=1
 MOZ_STATIC_BUILD_UNSUPPORTED=1
 MOZ_URL_CLASSIFIER=1
 MOZ_WEBGL_CONFORMANT=1
rename from suite/themes/modern/helpviewer/help.css
rename to suite/themes/modern/communicator/helpviewer/help.css
rename from suite/themes/modern/helpviewer/helpFileLayout.css
rename to suite/themes/modern/communicator/helpviewer/helpFileLayout.css
--- a/suite/themes/modern/jar.mn
+++ b/suite/themes/modern/jar.mn
@@ -3,17 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 modern.jar:
 % override chrome://mozapps/skin/places/defaultFavicon.png chrome://communicator/skin/bookmarks/bookmark-item.png
 % skin communicator modern/1.0 %skin/modern/communicator/
 % skin editor modern/1.0 %skin/modern/editor/
 % skin global modern/1.0 %skin/modern/global/
 % skin global-platform modern/1.0 %skin/modern/global/
-% skin help modern/1.0 %skin/modern/helpviewer/
+% skin help modern/1.0 %skin/modern/communicator/helpviewer/
 % skin messenger modern/1.0 %skin/modern/messenger/
 % skin mozapps modern/1.0 %skin/modern/mozapps/
 % skin navigator modern/1.0 %skin/modern/navigator/
 % skin messenger-newsblog modern/1.0 %skin/modern/messenger-newsblog/
 % style chrome://global/content/customizeToolbar.xul chrome://navigator/skin/navigator.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/primaryToolbar.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/messengercompose/messengercompose.css
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/smime/msgCompSMIMEOverlay.css
@@ -67,16 +67,18 @@ modern.jar:
   skin/modern/communicator/directory/file-icon.gif                 (communicator/directory/file-icon.gif)
   skin/modern/communicator/directory/directory.css                 (communicator/directory/directory.css)
   skin/modern/communicator/downloads/dl-remove.png                 (communicator/downloads/dl-remove.png)
   skin/modern/communicator/downloads/downloadButtons.png           (communicator/downloads/downloadButtons.png)
   skin/modern/communicator/downloads/downloadmanager.css           (communicator/downloads/downloadmanager.css)
   skin/modern/communicator/feed-subscribe.css                      (communicator/feed-subscribe.css)
   skin/modern/communicator/feed-subscribe-ui.css                   (communicator/feed-subscribe-ui.css)
   skin/modern/communicator/fullscreen-video.css                    (communicator/fullscreen-video.css)
+  skin/modern/communicator/helpviewer/help.css                     (communicator/helpviewer/help.css)
+  skin/modern/communicator/helpviewer/helpFileLayout.css           (communicator/helpviewer/helpFileLayout.css)
   skin/modern/communicator/history/calendar.png                    (communicator/history/calendar.png)
   skin/modern/communicator/icons/alwaysAsk.png                     (communicator/icons/alwaysAsk.png)
   skin/modern/communicator/icons/application.png                   (communicator/icons/application.png)
   skin/modern/communicator/icons/audioFeedIcon.png                 (communicator/icons/feedIcon.png)
   skin/modern/communicator/icons/closeFullScreenVideo.png          (communicator/icons/closeFullScreenVideo.png)
   skin/modern/communicator/icons/btn1.gif                          (communicator/icons/btn1.gif)
   skin/modern/communicator/icons/common.png                        (communicator/icons/common.png)
   skin/modern/communicator/icons/common-small.png                  (communicator/icons/common-small.png)
@@ -387,18 +389,16 @@ modern.jar:
   skin/modern/global/mac/tree/sort-dsc.gif                         (global/tree/sort-asc.gif)
   skin/modern/global/unix/tree/sort-asc.gif                        (global/tree/sort-asc.gif)
   skin/modern/global/unix/tree/sort-dsc.gif                        (global/tree/sort-dsc.gif)
   skin/modern/global/win/tree/sort-asc.gif                         (global/tree/sort-dsc.gif)
   skin/modern/global/win/tree/sort-dsc.gif                         (global/tree/sort-asc.gif)
   skin/modern/global/tree/twisty-clsd.gif                          (global/tree/twisty-clsd.gif)
   skin/modern/global/tree/twisty-open.gif                          (global/tree/twisty-open.gif)
   skin/modern/global/tree/columnpicker.gif                         (global/tree/columnpicker.gif)
-  skin/modern/helpviewer/help.css                                  (helpviewer/help.css)
-  skin/modern/helpviewer/helpFileLayout.css                        (helpviewer/helpFileLayout.css)
   skin/modern/messenger/threadPaneLabels.css                       (messenger/threadPaneLabels.css)
   skin/modern/messenger/accountCentral.css                         (messenger/accountCentral.css)
   skin/modern/messenger/accountManage.css                          (messenger/accountManage.css)
   skin/modern/messenger/accountWizard.css                          (messenger/accountWizard.css)
   skin/modern/messenger/addressingWidget.css                       (messenger/addressingWidget.css)
   skin/modern/messenger/browserRequest.css                         (messenger/browserRequest.css)
   skin/modern/messenger/dialogs.css                                (messenger/dialogs.css)
   skin/modern/messenger/filterDialog.css                           (messenger/filterDialog.css)