From 7008afd8e0c91fa97f37f0cf72b4a225e681c4be Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Wed, 17 Apr 2019 04:52:39 -0400 Subject: [BASILISK] Port PM Sync Client - Part 6a: Obvious ifdef'ing and clean up --- application/basilisk/themes/linux/jar.mn | 4 ++++ application/basilisk/themes/osx/jar.mn | 8 ++++++++ application/basilisk/themes/shared/menupanel.inc.css | 6 ++---- application/basilisk/themes/shared/toolbarbuttons.inc.css | 12 ++++-------- application/basilisk/themes/windows/jar.mn | 6 ++++++ 5 files changed, 24 insertions(+), 12 deletions(-) (limited to 'application/basilisk/themes') diff --git a/application/basilisk/themes/linux/jar.mn b/application/basilisk/themes/linux/jar.mn index 5835b1ca6..e9f666418 100644 --- a/application/basilisk/themes/linux/jar.mn +++ b/application/basilisk/themes/linux/jar.mn @@ -8,7 +8,9 @@ browser.jar: #include ../shared/jar.inc.mn skin/classic/browser/sanitizeDialog.css skin/classic/browser/aboutSessionRestore-window-icon.png +#ifdef MOZ_SERVICES_SYNC skin/classic/browser/aboutSyncTabs.css +#endif skin/classic/browser/actionicon-tab.png * skin/classic/browser/browser.css * skin/classic/browser/devedition.css @@ -106,6 +108,7 @@ browser.jar: skin/classic/browser/tabbrowser/tab-stroke-start@2x.png (tabbrowser/tab-stroke-start@2x.png) skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png) +#ifdef MOZ_SERVICES_SYNC skin/classic/browser/sync-16.png skin/classic/browser/sync-32.png skin/classic/browser/sync-bg.png @@ -125,6 +128,7 @@ browser.jar: skin/classic/browser/syncProgress-horizontalbar.png skin/classic/browser/syncProgress-horizontalbar@2x.png skin/classic/browser/syncProgress.css +#endif [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: % override chrome://browser/skin/feeds/audioFeedIcon.png chrome://browser/skin/feeds/feedIcon.png diff --git a/application/basilisk/themes/osx/jar.mn b/application/basilisk/themes/osx/jar.mn index 39fcf6343..92d2ceedf 100644 --- a/application/basilisk/themes/osx/jar.mn +++ b/application/basilisk/themes/osx/jar.mn @@ -7,7 +7,9 @@ browser.jar: #include ../shared/jar.inc.mn skin/classic/browser/sanitizeDialog.css skin/classic/browser/aboutSessionRestore-window-icon.png +#ifdef MOZ_SERVICES_SYNC skin/classic/browser/aboutSyncTabs.css +#endif skin/classic/browser/actionicon-tab.png skin/classic/browser/actionicon-tab@2x.png * skin/classic/browser/browser.css @@ -158,6 +160,7 @@ browser.jar: 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/tabDragIndicator@2x.png (tabbrowser/tabDragIndicator@2x.png) +#ifdef MOZ_SERVICES_SYNC skin/classic/browser/sync-16.png skin/classic/browser/sync-32.png skin/classic/browser/sync-bg.png @@ -179,6 +182,7 @@ browser.jar: skin/classic/browser/syncProgress-toolbar-inverted.png skin/classic/browser/syncProgress-toolbar-inverted@2x.png skin/classic/browser/syncProgress.css +#endif skin/classic/browser/Toolbar-background-noise.png (Toolbar-background-noise.png) skin/classic/browser/lion/toolbarbutton-dropmarker.png (toolbarbutton-dropmarker-lion.png) skin/classic/browser/toolbarbutton-dropmarker@2x.png (toolbarbutton-dropmarker-lion@2x.png) @@ -195,8 +199,10 @@ browser.jar: skin/classic/browser/yosemite/menuPanel-help@2x.png (menuPanel-help-yosemite@2x.png) skin/classic/browser/yosemite/reload-stop-go.png (reload-stop-go-yosemite.png) skin/classic/browser/yosemite/reload-stop-go@2x.png (reload-stop-go-yosemite@2x.png) +#ifdef MOZ_SERVICES_SYNC skin/classic/browser/yosemite/sync-horizontalbar.png (sync-horizontalbar-yosemite.png) skin/classic/browser/yosemite/sync-horizontalbar@2x.png (sync-horizontalbar-yosemite@2x.png) +#endif skin/classic/browser/yosemite/tab-selected-end-inactive.svg (tabbrowser/tab-selected-end-yosemite-inactive.svg) skin/classic/browser/yosemite/tab-selected-start-inactive.svg (tabbrowser/tab-selected-start-yosemite-inactive.svg) skin/classic/browser/yosemite/tab-active-middle-inactive.png (tabbrowser/tab-active-middle-yosemite-inactive.png) @@ -224,5 +230,7 @@ browser.jar: % override chrome://browser/skin/menuPanel-help@2x.png chrome://browser/skin/yosemite/menuPanel-help@2x.png os=Darwin osversion>=10.10 % override chrome://browser/skin/reload-stop-go.png chrome://browser/skin/yosemite/reload-stop-go.png os=Darwin osversion>=10.10 % override chrome://browser/skin/reload-stop-go@2x.png chrome://browser/skin/yosemite/reload-stop-go@2x.png os=Darwin osversion>=10.10 +#ifdef MOZ_SERVICES_SYNC % override chrome://browser/skin/sync-horizontalbar.png chrome://browser/skin/yosemite/sync-horizontalbar.png os=Darwin osversion>=10.10 % override chrome://browser/skin/sync-horizontalbar@2x.png chrome://browser/skin/yosemite/sync-horizontalbar@2x.png os=Darwin osversion>=10.10 +#endif diff --git a/application/basilisk/themes/shared/menupanel.inc.css b/application/basilisk/themes/shared/menupanel.inc.css index 2feb941a2..da2f07e1e 100644 --- a/application/basilisk/themes/shared/menupanel.inc.css +++ b/application/basilisk/themes/shared/menupanel.inc.css @@ -48,8 +48,7 @@ toolbarpaletteitem[place="palette"] > #save-page-button { -moz-image-region: rect(0px, 352px, 32px, 320px); } -/* Start Sync Buttons */ - +%ifdef MOZ_SERVICES_SYNC #sync-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #sync-button { -moz-image-region: rect(0px, 384px, 32px, 352px) @@ -71,8 +70,7 @@ toolbarpaletteitem[place="palette"] > #sync-button { toolbarpaletteitem[place="palette"] > #sync-tabs-button { -moz-image-region: rect(0px, 1024px, 32px, 992px); } - -/* End Sync Buttons */ +%endif #containers-panelmenu[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #containers-panelmenu { diff --git a/application/basilisk/themes/shared/toolbarbuttons.inc.css b/application/basilisk/themes/shared/toolbarbuttons.inc.css index 2f74b8361..8992bfcb1 100644 --- a/application/basilisk/themes/shared/toolbarbuttons.inc.css +++ b/application/basilisk/themes/shared/toolbarbuttons.inc.css @@ -52,8 +52,7 @@ toolbar[brighttext] #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarke -moz-image-region: rect(0, 252px, 18px, 234px); } -/* Start Sync Buttons */ - +%ifdef MOZ_SERVICES_SYNC #sync-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 270px, 18px, 252px); } @@ -78,8 +77,7 @@ toolbar[brighttext] #sync-button[cui-areatype="toolbar"][status="active"] { #sync-tabs-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 792px, 18px, 774px); } - -/* End Sync Buttons */ +%endif #containers-panelmenu[cui-areatype="toolbar"] { -moz-image-region: rect(0, 810px, 18px, 792px); @@ -251,8 +249,7 @@ toolbar[brighttext] #sync-button[cui-areatype="toolbar"][status="active"] { -moz-image-region: rect(0, 504px, 36px, 468px); } - /* Start Sync Buttons */ - +%ifdef MOZ_SERVICES_SYNC #sync-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 540px, 36px, 504px); } @@ -277,8 +274,7 @@ toolbar[brighttext] #sync-button[cui-areatype="toolbar"][status="active"] { #sync-tabs-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 1584px, 36px, 1548px); } - - /* End Sync Buttons */ +%endif #containers-panelmenu[cui-areatype="toolbar"] { -moz-image-region: rect(0, 1620px, 36px, 1584px); diff --git a/application/basilisk/themes/windows/jar.mn b/application/basilisk/themes/windows/jar.mn index 09004f57d..28c6c6465 100644 --- a/application/basilisk/themes/windows/jar.mn +++ b/application/basilisk/themes/windows/jar.mn @@ -7,7 +7,9 @@ browser.jar: #include ../shared/jar.inc.mn skin/classic/browser/sanitizeDialog.css skin/classic/browser/aboutSessionRestore-window-icon.png +#ifdef MOZ_SERVICES_SYNC skin/classic/browser/aboutSyncTabs.css +#endif skin/classic/browser/actionicon-tab.png skin/classic/browser/actionicon-tab@2x.png skin/classic/browser/actionicon-tab-win7.png @@ -140,6 +142,7 @@ browser.jar: 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) +#ifdef MOZ_SERVICES_SYNC skin/classic/browser/sync-16.png skin/classic/browser/sync-32.png skin/classic/browser/sync-128.png @@ -167,6 +170,7 @@ browser.jar: skin/classic/browser/syncProgress-toolbar-win7.png skin/classic/browser/syncProgress-toolbar-win7@2x.png skin/classic/browser/syncProgress.css +#endif [extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar: % override chrome://browser/skin/page-livemarks.png chrome://browser/skin/feeds/feedIcon16.png @@ -182,12 +186,14 @@ browser.jar: % override chrome://browser/skin/privatebrowsing-mask-titlebar.png chrome://browser/skin/privatebrowsing-mask-titlebar-win7.png os=WINNT osversion<=6.1 % override chrome://browser/skin/reload-stop-go.png chrome://browser/skin/reload-stop-go-win7.png os=WINNT osversion<=6.1 % override chrome://browser/skin/reload-stop-go@2x.png chrome://browser/skin/reload-stop-go-win7@2x.png os=WINNT osversion<=6.1 +#ifdef MOZ_SERVICES_SYNC % override chrome://browser/skin/sync-horizontalbar.png chrome://browser/skin/sync-horizontalbar-win7.png os=WINNT osversion<=6.1 % override chrome://browser/skin/sync-horizontalbar@2x.png chrome://browser/skin/sync-horizontalbar-win7@2x.png os=WINNT osversion<=6.1 % override chrome://browser/skin/syncProgress-horizontalbar.png chrome://browser/skin/syncProgress-horizontalbar-win7.png os=WINNT osversion<=6.1 % override chrome://browser/skin/syncProgress-horizontalbar@2x.png chrome://browser/skin/syncProgress-horizontalbar-win7@2x.png os=WINNT osversion<=6.1 % override chrome://browser/skin/syncProgress-toolbar.png chrome://browser/skin/syncProgress-toolbar-win7.png os=WINNT osversion<=6.1 % override chrome://browser/skin/syncProgress-toolbar@2x.png chrome://browser/skin/syncProgress-toolbar-win7@2x.png os=WINNT osversion<=6.1 +#endif % override chrome://browser/skin/toolbarbutton-dropdown-arrow.png chrome://browser/skin/toolbarbutton-dropdown-arrow-win7.png os=WINNT osversion<=6.1 % override chrome://browser/skin/urlbar-history-dropmarker.png chrome://browser/skin/urlbar-history-dropmarker-win7.png os=WINNT osversion<=6.1 % override chrome://browser/skin/urlbar-history-dropmarker@2x.png chrome://browser/skin/urlbar-history-dropmarker-win7@2x.png os=WINNT osversion<=6.1 -- cgit v1.2.3