From 0aa54a6b9135406fffcf52f43f69f8fbb5cdb19f Mon Sep 17 00:00:00 2001 From: Thomas Groman Date: Mon, 20 Apr 2020 21:51:13 -0700 Subject: make webbrowser build with comm configuration and remove more Windows cruft --- build/mach_bootstrap.pyc | Bin 0 -> 656 bytes configure | 26 + webbrowser/app.mozbuild | 6 +- webbrowser/app/moz.build | 6 +- webbrowser/base/jar.mn | 2 +- webbrowser/build.mk | 32 +- webbrowser/components/fuel/fuelApplication.js | 2 +- webbrowser/confvars.sh | 5 +- webbrowser/installer/Makefile.in | 6 +- webbrowser/installer/windows/Makefile.in | 69 - webbrowser/installer/windows/app.tag | 4 - webbrowser/installer/windows/moz.build | 15 - webbrowser/installer/windows/nsis/defines.nsi.in | 65 - webbrowser/installer/windows/nsis/installer.nsi | 1162 ------ webbrowser/installer/windows/nsis/shared.nsh | 1306 ------- webbrowser/installer/windows/nsis/uninstaller.nsi | 557 --- .../installer/windows/nsis/updater_append.ini | 12 - webbrowser/locales/Makefile.in | 14 +- webbrowser/moz.configure | 2 +- webbrowser/themes/linux/browser.css | 4 +- webbrowser/themes/osx/browser.css | 4 +- webbrowser/themes/windows/Geolocation-16.png | Bin 704 -> 0 bytes webbrowser/themes/windows/Geolocation-64.png | Bin 8424 -> 0 bytes webbrowser/themes/windows/Info.png | Bin 615 -> 0 bytes webbrowser/themes/windows/KUI-background.png | Bin 222 -> 0 bytes webbrowser/themes/windows/KUI-close.png | Bin 393 -> 0 bytes webbrowser/themes/windows/Makefile.in | 7 - webbrowser/themes/windows/Privacy-16.png | Bin 798 -> 0 bytes webbrowser/themes/windows/Privacy-32.png | Bin 1997 -> 0 bytes webbrowser/themes/windows/Privacy-48.png | Bin 3912 -> 0 bytes webbrowser/themes/windows/Privacy-64.png | Bin 8172 -> 0 bytes webbrowser/themes/windows/Push-16.png | Bin 704 -> 0 bytes webbrowser/themes/windows/Push-64.png | Bin 8388 -> 0 bytes webbrowser/themes/windows/Secure24.png | Bin 1117 -> 0 bytes webbrowser/themes/windows/Toolbar-glass.png | Bin 18803 -> 0 bytes webbrowser/themes/windows/Toolbar-glass.svg | 3218 ---------------- webbrowser/themes/windows/Toolbar-inverted.png | Bin 7101 -> 0 bytes webbrowser/themes/windows/Toolbar-inverted.svg | 302 -- webbrowser/themes/windows/Toolbar.png | Bin 16015 -> 0 bytes webbrowser/themes/windows/Toolbar.svg | 1356 ------- webbrowser/themes/windows/aboutCertError.css | 73 - .../aboutCertError_sectionCollapsed-rtl.png | Bin 791 -> 0 bytes .../windows/aboutCertError_sectionCollapsed.png | Bin 776 -> 0 bytes .../windows/aboutCertError_sectionExpanded.png | Bin 767 -> 0 bytes webbrowser/themes/windows/aboutPrivateBrowsing.css | 47 - .../windows/aboutSessionRestore-window-icon.png | Bin 352 -> 0 bytes webbrowser/themes/windows/aboutSessionRestore.css | 73 - webbrowser/themes/windows/aboutSyncTabs.css | 101 - webbrowser/themes/windows/actionicon-tab.png | Bin 425 -> 0 bytes webbrowser/themes/windows/appmenu-dropmarker.png | Bin 262 -> 0 bytes webbrowser/themes/windows/appmenu-icons.png | Bin 2115 -> 0 bytes webbrowser/themes/windows/autocomplete.css | 238 -- webbrowser/themes/windows/browser.css | 3856 -------------------- webbrowser/themes/windows/caption-buttons.svg | 121 - .../windows/click-to-play-warning-stripes.png | Bin 1563 -> 0 bytes .../themes/windows/communicator/communicator.css | 6 - webbrowser/themes/windows/communicator/jar.mn | 7 - webbrowser/themes/windows/communicator/moz.build | 7 - .../windows/downloads/allDownloadsViewOverlay.css | 178 - webbrowser/themes/windows/downloads/buttons.png | Bin 6881 -> 0 bytes .../windows/downloads/contentAreaDownloadsView.css | 22 - .../downloads/download-notification-finish.png | Bin 3755 -> 0 bytes .../downloads/download-notification-start.png | Bin 3166 -> 0 bytes .../themes/windows/downloads/download-summary.png | Bin 741 -> 0 bytes webbrowser/themes/windows/downloads/downloads.css | 487 --- webbrowser/themes/windows/engineManager.css | 16 - webbrowser/themes/windows/feeds/feed-icons-16.png | Bin 2138 -> 0 bytes webbrowser/themes/windows/feeds/feedIcon.png | Bin 1885 -> 0 bytes webbrowser/themes/windows/feeds/feedIcon16.png | Bin 787 -> 0 bytes webbrowser/themes/windows/feeds/subscribe-ui.css | 29 - webbrowser/themes/windows/feeds/subscribe.css | 163 - webbrowser/themes/windows/icon.png | Bin 2185 -> 0 bytes .../themes/windows/identity-icons-generic.png | Bin 965 -> 0 bytes .../themes/windows/identity-icons-https-ev.png | Bin 708 -> 0 bytes .../windows/identity-icons-https-mixed-active.png | Bin 984 -> 0 bytes webbrowser/themes/windows/identity-icons-https.png | Bin 672 -> 0 bytes webbrowser/themes/windows/identity.png | Bin 11844 -> 0 bytes webbrowser/themes/windows/imagedocument.png | Bin 2185 -> 0 bytes webbrowser/themes/windows/jar.mn | 168 - webbrowser/themes/windows/keyhole-forward-mask.svg | 15 - webbrowser/themes/windows/livemark-folder.png | Bin 626 -> 0 bytes webbrowser/themes/windows/menu-back.png | Bin 435 -> 0 bytes webbrowser/themes/windows/menu-forward.png | Bin 434 -> 0 bytes .../themes/windows/mixed-content-blocked-16.png | Bin 346 -> 0 bytes .../themes/windows/mixed-content-blocked-64.png | Bin 2063 -> 0 bytes webbrowser/themes/windows/monitor.png | Bin 6217 -> 0 bytes webbrowser/themes/windows/monitor_16-10.png | Bin 6787 -> 0 bytes webbrowser/themes/windows/moz.build | 9 - webbrowser/themes/windows/newtab/newTab.css | 29 - webbrowser/themes/windows/pageInfo.css | 268 -- webbrowser/themes/windows/pageInfo.png | Bin 8432 -> 0 bytes .../windows/permissions/aboutPermissions.css | 153 - webbrowser/themes/windows/places/allBookmarks.png | Bin 612 -> 0 bytes webbrowser/themes/windows/places/bookmark.png | Bin 1779 -> 0 bytes webbrowser/themes/windows/places/bookmarksMenu.png | Bin 346 -> 0 bytes .../themes/windows/places/bookmarksToolbar.png | Bin 380 -> 0 bytes webbrowser/themes/windows/places/calendar.png | Bin 637 -> 0 bytes webbrowser/themes/windows/places/downloads.png | Bin 674 -> 0 bytes webbrowser/themes/windows/places/editBookmark.png | Bin 1642 -> 0 bytes .../themes/windows/places/editBookmarkOverlay.css | 80 - webbrowser/themes/windows/places/history.png | Bin 871 -> 0 bytes .../themes/windows/places/libraryToolbar.png | Bin 1331 -> 0 bytes webbrowser/themes/windows/places/livemark-item.png | Bin 863 -> 0 bytes webbrowser/themes/windows/places/organizer.css | 253 -- webbrowser/themes/windows/places/places.css | 172 - webbrowser/themes/windows/places/query.png | Bin 602 -> 0 bytes webbrowser/themes/windows/places/starred48.png | Bin 1911 -> 0 bytes webbrowser/themes/windows/places/tag.png | Bin 676 -> 0 bytes .../themes/windows/places/toolbarDropMarker.png | Bin 223 -> 0 bytes .../themes/windows/places/unsortedBookmarks.png | Bin 762 -> 0 bytes webbrowser/themes/windows/places/unstarred48.png | Bin 818 -> 0 bytes webbrowser/themes/windows/pointerLock-16.png | Bin 249 -> 0 bytes webbrowser/themes/windows/pointerLock-64.png | Bin 1119 -> 0 bytes .../themes/windows/preferences/Options-sync.png | Bin 3585 -> 0 bytes webbrowser/themes/windows/preferences/Options.png | Bin 8899 -> 0 bytes .../themes/windows/preferences/alwaysAsk.png | Bin 439 -> 0 bytes .../themes/windows/preferences/application.png | Bin 419 -> 0 bytes .../themes/windows/preferences/applications.css | 64 - webbrowser/themes/windows/preferences/mail.png | Bin 549 -> 0 bytes .../themes/windows/preferences/preferences.css | 146 - webbrowser/themes/windows/preferences/saveFile.png | Bin 767 -> 0 bytes webbrowser/themes/windows/privatebrowsing-dark.png | Bin 1355 -> 0 bytes .../themes/windows/privatebrowsing-light.png | Bin 696 -> 0 bytes webbrowser/themes/windows/reload-stop-go.png | Bin 1945 -> 0 bytes webbrowser/themes/windows/sanitize.png | Bin 779 -> 0 bytes webbrowser/themes/windows/sanitizeDialog.css | 93 - .../themes/windows/searchbar-dropdown-arrow.png | Bin 517 -> 0 bytes webbrowser/themes/windows/searchbar.css | 81 - webbrowser/themes/windows/setDesktopBackground.css | 18 - webbrowser/themes/windows/slowStartup-16.png | Bin 512 -> 0 bytes webbrowser/themes/windows/statusbar/overlay.css | 104 - webbrowser/themes/windows/statusbar/prefs.css | 7 - webbrowser/themes/windows/sync-128.png | Bin 20229 -> 0 bytes webbrowser/themes/windows/sync-16.png | Bin 1847 -> 0 bytes webbrowser/themes/windows/sync-32.png | Bin 3384 -> 0 bytes webbrowser/themes/windows/sync-bg.png | Bin 21309 -> 0 bytes webbrowser/themes/windows/sync-desktopIcon.png | Bin 291 -> 0 bytes webbrowser/themes/windows/sync-mobileIcon.png | Bin 352 -> 0 bytes webbrowser/themes/windows/sync-throbber.png | Bin 10362 -> 0 bytes webbrowser/themes/windows/syncCommon.css | 49 - webbrowser/themes/windows/syncProgress.css | 46 - webbrowser/themes/windows/syncQuota.css | 26 - webbrowser/themes/windows/syncSetup.css | 132 - .../themes/windows/tabbrowser/alltabs-inverted.png | Bin 469 -> 0 bytes webbrowser/themes/windows/tabbrowser/alltabs.png | Bin 584 -> 0 bytes .../themes/windows/tabbrowser/connecting.png | Bin 8540 -> 0 bytes webbrowser/themes/windows/tabbrowser/loading.png | Bin 10727 -> 0 bytes .../themes/windows/tabbrowser/newtab-glass.png | Bin 398 -> 0 bytes .../themes/windows/tabbrowser/newtab-inverted.png | Bin 247 -> 0 bytes webbrowser/themes/windows/tabbrowser/newtab.png | Bin 237 -> 0 bytes .../windows/tabbrowser/tab-arrow-left-glass.png | Bin 331 -> 0 bytes .../windows/tabbrowser/tab-arrow-left-inverted.png | Bin 250 -> 0 bytes .../themes/windows/tabbrowser/tab-arrow-left.png | Bin 368 -> 0 bytes .../windows/tabbrowser/tab-overflow-border.png | Bin 193 -> 0 bytes .../themes/windows/tabbrowser/tabDragIndicator.png | Bin 3117 -> 0 bytes .../toolbarbutton-dropdown-arrow-inverted.png | Bin 221 -> 0 bytes .../windows/toolbarbutton-dropdown-arrow.png | Bin 287 -> 0 bytes webbrowser/themes/windows/urlbar-arrow.png | Bin 305 -> 0 bytes .../themes/windows/urlbar-history-dropmarker.png | Bin 480 -> 0 bytes webbrowser/themes/windows/urlbar-popup-blocked.png | Bin 745 -> 0 bytes .../themes/windows/web-notifications-icon.svg | 15 - .../themes/windows/web-notifications-tray.svg | 23 - .../themes/windows/webRTC-shareDevice-16.png | Bin 233 -> 0 bytes .../themes/windows/webRTC-shareDevice-64.png | Bin 1097 -> 0 bytes .../themes/windows/webRTC-sharingDevice-16.png | Bin 404 -> 0 bytes 165 files changed, 66 insertions(+), 15491 deletions(-) create mode 100644 build/mach_bootstrap.pyc create mode 100755 configure delete mode 100644 webbrowser/installer/windows/Makefile.in delete mode 100644 webbrowser/installer/windows/app.tag delete mode 100644 webbrowser/installer/windows/moz.build delete mode 100644 webbrowser/installer/windows/nsis/defines.nsi.in delete mode 100644 webbrowser/installer/windows/nsis/installer.nsi delete mode 100644 webbrowser/installer/windows/nsis/shared.nsh delete mode 100644 webbrowser/installer/windows/nsis/uninstaller.nsi delete mode 100644 webbrowser/installer/windows/nsis/updater_append.ini delete mode 100644 webbrowser/themes/windows/Geolocation-16.png delete mode 100644 webbrowser/themes/windows/Geolocation-64.png delete mode 100644 webbrowser/themes/windows/Info.png delete mode 100644 webbrowser/themes/windows/KUI-background.png delete mode 100644 webbrowser/themes/windows/KUI-close.png delete mode 100644 webbrowser/themes/windows/Makefile.in delete mode 100644 webbrowser/themes/windows/Privacy-16.png delete mode 100644 webbrowser/themes/windows/Privacy-32.png delete mode 100644 webbrowser/themes/windows/Privacy-48.png delete mode 100644 webbrowser/themes/windows/Privacy-64.png delete mode 100644 webbrowser/themes/windows/Push-16.png delete mode 100644 webbrowser/themes/windows/Push-64.png delete mode 100644 webbrowser/themes/windows/Secure24.png delete mode 100644 webbrowser/themes/windows/Toolbar-glass.png delete mode 100644 webbrowser/themes/windows/Toolbar-glass.svg delete mode 100644 webbrowser/themes/windows/Toolbar-inverted.png delete mode 100644 webbrowser/themes/windows/Toolbar-inverted.svg delete mode 100644 webbrowser/themes/windows/Toolbar.png delete mode 100644 webbrowser/themes/windows/Toolbar.svg delete mode 100644 webbrowser/themes/windows/aboutCertError.css delete mode 100644 webbrowser/themes/windows/aboutCertError_sectionCollapsed-rtl.png delete mode 100644 webbrowser/themes/windows/aboutCertError_sectionCollapsed.png delete mode 100644 webbrowser/themes/windows/aboutCertError_sectionExpanded.png delete mode 100644 webbrowser/themes/windows/aboutPrivateBrowsing.css delete mode 100644 webbrowser/themes/windows/aboutSessionRestore-window-icon.png delete mode 100644 webbrowser/themes/windows/aboutSessionRestore.css delete mode 100644 webbrowser/themes/windows/aboutSyncTabs.css delete mode 100644 webbrowser/themes/windows/actionicon-tab.png delete mode 100644 webbrowser/themes/windows/appmenu-dropmarker.png delete mode 100644 webbrowser/themes/windows/appmenu-icons.png delete mode 100644 webbrowser/themes/windows/autocomplete.css delete mode 100644 webbrowser/themes/windows/browser.css delete mode 100644 webbrowser/themes/windows/caption-buttons.svg delete mode 100644 webbrowser/themes/windows/click-to-play-warning-stripes.png delete mode 100644 webbrowser/themes/windows/communicator/communicator.css delete mode 100644 webbrowser/themes/windows/communicator/jar.mn delete mode 100644 webbrowser/themes/windows/communicator/moz.build delete mode 100644 webbrowser/themes/windows/downloads/allDownloadsViewOverlay.css delete mode 100644 webbrowser/themes/windows/downloads/buttons.png delete mode 100644 webbrowser/themes/windows/downloads/contentAreaDownloadsView.css delete mode 100644 webbrowser/themes/windows/downloads/download-notification-finish.png delete mode 100644 webbrowser/themes/windows/downloads/download-notification-start.png delete mode 100644 webbrowser/themes/windows/downloads/download-summary.png delete mode 100644 webbrowser/themes/windows/downloads/downloads.css delete mode 100644 webbrowser/themes/windows/engineManager.css delete mode 100644 webbrowser/themes/windows/feeds/feed-icons-16.png delete mode 100644 webbrowser/themes/windows/feeds/feedIcon.png delete mode 100644 webbrowser/themes/windows/feeds/feedIcon16.png delete mode 100644 webbrowser/themes/windows/feeds/subscribe-ui.css delete mode 100644 webbrowser/themes/windows/feeds/subscribe.css delete mode 100644 webbrowser/themes/windows/icon.png delete mode 100644 webbrowser/themes/windows/identity-icons-generic.png delete mode 100644 webbrowser/themes/windows/identity-icons-https-ev.png delete mode 100644 webbrowser/themes/windows/identity-icons-https-mixed-active.png delete mode 100644 webbrowser/themes/windows/identity-icons-https.png delete mode 100644 webbrowser/themes/windows/identity.png delete mode 100644 webbrowser/themes/windows/imagedocument.png delete mode 100644 webbrowser/themes/windows/jar.mn delete mode 100644 webbrowser/themes/windows/keyhole-forward-mask.svg delete mode 100644 webbrowser/themes/windows/livemark-folder.png delete mode 100644 webbrowser/themes/windows/menu-back.png delete mode 100644 webbrowser/themes/windows/menu-forward.png delete mode 100644 webbrowser/themes/windows/mixed-content-blocked-16.png delete mode 100644 webbrowser/themes/windows/mixed-content-blocked-64.png delete mode 100644 webbrowser/themes/windows/monitor.png delete mode 100644 webbrowser/themes/windows/monitor_16-10.png delete mode 100644 webbrowser/themes/windows/moz.build delete mode 100644 webbrowser/themes/windows/newtab/newTab.css delete mode 100644 webbrowser/themes/windows/pageInfo.css delete mode 100644 webbrowser/themes/windows/pageInfo.png delete mode 100644 webbrowser/themes/windows/permissions/aboutPermissions.css delete mode 100644 webbrowser/themes/windows/places/allBookmarks.png delete mode 100644 webbrowser/themes/windows/places/bookmark.png delete mode 100644 webbrowser/themes/windows/places/bookmarksMenu.png delete mode 100644 webbrowser/themes/windows/places/bookmarksToolbar.png delete mode 100644 webbrowser/themes/windows/places/calendar.png delete mode 100644 webbrowser/themes/windows/places/downloads.png delete mode 100644 webbrowser/themes/windows/places/editBookmark.png delete mode 100644 webbrowser/themes/windows/places/editBookmarkOverlay.css delete mode 100644 webbrowser/themes/windows/places/history.png delete mode 100644 webbrowser/themes/windows/places/libraryToolbar.png delete mode 100644 webbrowser/themes/windows/places/livemark-item.png delete mode 100644 webbrowser/themes/windows/places/organizer.css delete mode 100644 webbrowser/themes/windows/places/places.css delete mode 100644 webbrowser/themes/windows/places/query.png delete mode 100644 webbrowser/themes/windows/places/starred48.png delete mode 100644 webbrowser/themes/windows/places/tag.png delete mode 100644 webbrowser/themes/windows/places/toolbarDropMarker.png delete mode 100644 webbrowser/themes/windows/places/unsortedBookmarks.png delete mode 100644 webbrowser/themes/windows/places/unstarred48.png delete mode 100644 webbrowser/themes/windows/pointerLock-16.png delete mode 100644 webbrowser/themes/windows/pointerLock-64.png delete mode 100644 webbrowser/themes/windows/preferences/Options-sync.png delete mode 100644 webbrowser/themes/windows/preferences/Options.png delete mode 100644 webbrowser/themes/windows/preferences/alwaysAsk.png delete mode 100644 webbrowser/themes/windows/preferences/application.png delete mode 100644 webbrowser/themes/windows/preferences/applications.css delete mode 100644 webbrowser/themes/windows/preferences/mail.png delete mode 100644 webbrowser/themes/windows/preferences/preferences.css delete mode 100644 webbrowser/themes/windows/preferences/saveFile.png delete mode 100644 webbrowser/themes/windows/privatebrowsing-dark.png delete mode 100644 webbrowser/themes/windows/privatebrowsing-light.png delete mode 100644 webbrowser/themes/windows/reload-stop-go.png delete mode 100644 webbrowser/themes/windows/sanitize.png delete mode 100644 webbrowser/themes/windows/sanitizeDialog.css delete mode 100644 webbrowser/themes/windows/searchbar-dropdown-arrow.png delete mode 100644 webbrowser/themes/windows/searchbar.css delete mode 100644 webbrowser/themes/windows/setDesktopBackground.css delete mode 100644 webbrowser/themes/windows/slowStartup-16.png delete mode 100644 webbrowser/themes/windows/statusbar/overlay.css delete mode 100644 webbrowser/themes/windows/statusbar/prefs.css delete mode 100644 webbrowser/themes/windows/sync-128.png delete mode 100644 webbrowser/themes/windows/sync-16.png delete mode 100644 webbrowser/themes/windows/sync-32.png delete mode 100644 webbrowser/themes/windows/sync-bg.png delete mode 100644 webbrowser/themes/windows/sync-desktopIcon.png delete mode 100644 webbrowser/themes/windows/sync-mobileIcon.png delete mode 100644 webbrowser/themes/windows/sync-throbber.png delete mode 100644 webbrowser/themes/windows/syncCommon.css delete mode 100644 webbrowser/themes/windows/syncProgress.css delete mode 100644 webbrowser/themes/windows/syncQuota.css delete mode 100644 webbrowser/themes/windows/syncSetup.css delete mode 100644 webbrowser/themes/windows/tabbrowser/alltabs-inverted.png delete mode 100644 webbrowser/themes/windows/tabbrowser/alltabs.png delete mode 100644 webbrowser/themes/windows/tabbrowser/connecting.png delete mode 100644 webbrowser/themes/windows/tabbrowser/loading.png delete mode 100644 webbrowser/themes/windows/tabbrowser/newtab-glass.png delete mode 100644 webbrowser/themes/windows/tabbrowser/newtab-inverted.png delete mode 100644 webbrowser/themes/windows/tabbrowser/newtab.png delete mode 100644 webbrowser/themes/windows/tabbrowser/tab-arrow-left-glass.png delete mode 100644 webbrowser/themes/windows/tabbrowser/tab-arrow-left-inverted.png delete mode 100644 webbrowser/themes/windows/tabbrowser/tab-arrow-left.png delete mode 100644 webbrowser/themes/windows/tabbrowser/tab-overflow-border.png delete mode 100644 webbrowser/themes/windows/tabbrowser/tabDragIndicator.png delete mode 100644 webbrowser/themes/windows/toolbarbutton-dropdown-arrow-inverted.png delete mode 100644 webbrowser/themes/windows/toolbarbutton-dropdown-arrow.png delete mode 100644 webbrowser/themes/windows/urlbar-arrow.png delete mode 100644 webbrowser/themes/windows/urlbar-history-dropmarker.png delete mode 100644 webbrowser/themes/windows/urlbar-popup-blocked.png delete mode 100644 webbrowser/themes/windows/web-notifications-icon.svg delete mode 100644 webbrowser/themes/windows/web-notifications-tray.svg delete mode 100644 webbrowser/themes/windows/webRTC-shareDevice-16.png delete mode 100644 webbrowser/themes/windows/webRTC-shareDevice-64.png delete mode 100644 webbrowser/themes/windows/webRTC-sharingDevice-16.png diff --git a/build/mach_bootstrap.pyc b/build/mach_bootstrap.pyc new file mode 100644 index 0000000..bb9e2bc Binary files /dev/null and b/build/mach_bootstrap.pyc differ diff --git a/configure b/configure new file mode 100755 index 0000000..50ff644 --- /dev/null +++ b/configure @@ -0,0 +1,26 @@ +#!/bin/sh +SRCDIR=$(dirname $0) +TOPSRCDIR="$SRCDIR" +MOZILLA_SRCDIR="${SRCDIR}/platform" +export OLD_CONFIGURE="${MOZILLA_SRCDIR}"/old-configure + +# Ensure the comm-* values are used. +export MOZ_SOURCE_CHANGESET=$(hg -R "$TOPSRCDIR" parent --template="{node}" 2>/dev/null) +export MOZ_SOURCE_REPO=$(hg -R "$TOPSRCDIR" showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/https:/") + +# If MOZCONFIG isn't set, use the .mozconfig from the current directory. This +# overrides the lookup in mozilla-central's configure, which looks in the wrong +# directory for this file. +if test -z "$MOZCONFIG" -a -f "$SRCDIR"/.mozconfig; then + export MOZCONFIG="$SRCDIR"/.mozconfig +elif test -z "$MOZCONFIG" -a -f "$SRCDIR"/mozconfig; then + export MOZCONFIG="$SRCDIR"/mozconfig +fi + +# Execute the mozilla configure script in the current directory, adding the +# parameter we need to run comm-central. Since the configure script is really +# just a wrapper around invoking a python variant, execute the underlying python +# directly. We use a copy of the underlying configure script to get paths +# correct. +set -- "$@" --with-external-source-dir="$TOPSRCDIR" +which python2.7 > /dev/null && exec python2.7 "$TOPSRCDIR/configure.py" "$@" || exec python "$TOPSRCDIR/configure.py" "$@" diff --git a/webbrowser/app.mozbuild b/webbrowser/app.mozbuild index 5f1c0b9..4334c3c 100644 --- a/webbrowser/app.mozbuild +++ b/webbrowser/app.mozbuild @@ -4,14 +4,14 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. if not CONFIG['LIBXUL_SDK']: - include('/toolkit/toolkit.mozbuild') + include('/platform/toolkit/toolkit.mozbuild') if CONFIG['MOZ_EXTENSIONS']: - DIRS += ['/extensions'] + DIRS += ['/platform/extensions'] DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']] # Never add tier dirs after browser because they apparently won't get # packaged properly on Mac. -DIRS += ['/application/webbrowser'] +DIRS += ['/webbrowser'] diff --git a/webbrowser/app/moz.build b/webbrowser/app/moz.build index 07c4ba5..fb2e108 100644 --- a/webbrowser/app/moz.build +++ b/webbrowser/app/moz.build @@ -28,9 +28,9 @@ DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] LOCAL_INCLUDES += ['!/build'] LOCAL_INCLUDES += [ - '/toolkit/xre', - '/xpcom/base', - '/xpcom/build', + '/platform/toolkit/xre', + '/platform/xpcom/base', + '/platform/xpcom/build', ] USE_LIBS += ['mozglue'] diff --git a/webbrowser/base/jar.mn b/webbrowser/base/jar.mn index 735b6d0..b721398 100644 --- a/webbrowser/base/jar.mn +++ b/webbrowser/base/jar.mn @@ -75,5 +75,5 @@ browser.jar: content/browser/win6BrowserOverlay.xul (content/win6BrowserOverlay.xul) #endif # the following files are browser-specific overrides -* content/browser/license.html (/toolkit/content/license.html) +* content/browser/license.html (/platform/toolkit/content/license.html) % override chrome://global/content/license.html chrome://browser/content/license.html diff --git a/webbrowser/build.mk b/webbrowser/build.mk index 62f25ce..da8734f 100644 --- a/webbrowser/build.mk +++ b/webbrowser/build.mk @@ -1,48 +1,44 @@ -# 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/. - installer: - @$(MAKE) -C application/webbrowser/installer installer + @$(MAKE) -C webbrowser/installer installer package: - @$(MAKE) -C application/webbrowser/installer make-archive + @$(MAKE) -C webbrowser/installer make-archive l10n-package: - @$(MAKE) -C application/webbrowser/installer make-langpack + @$(MAKE) -C webbrowser/installer make-langpack mozpackage: - @$(MAKE) -C application/webbrowser/installer + @$(MAKE) -C webbrowser/installer package-compare: - @$(MAKE) -C application/webbrowser/installer package-compare + @$(MAKE) -C webbrowser/installer package-compare stage-package: - @$(MAKE) -C application/webbrowser/installer stage-package make-buildinfo-file + @$(MAKE) -C webbrowser/installer stage-package make-buildinfo-file install:: - @$(MAKE) -C application/webbrowser/installer install + @$(MAKE) -C webbrowser/installer install clean:: - @$(MAKE) -C application/webbrowser/installer clean + @$(MAKE) -C webbrowser/installer clean distclean:: - @$(MAKE) -C application/webbrowser/installer distclean + @$(MAKE) -C webbrowser/installer distclean source-package:: - @$(MAKE) -C application/webbrowser/installer source-package + @$(MAKE) -C webbrowser/installer source-package upload:: - @$(MAKE) -C application/webbrowser/installer upload + @$(MAKE) -C webbrowser/installer upload source-upload:: - @$(MAKE) -C application/webbrowser/installer source-upload + @$(MAKE) -C webbrowser/installer source-upload hg-bundle:: - @$(MAKE) -C application/webbrowser/installer hg-bundle + @$(MAKE) -C webbrowser/installer hg-bundle l10n-check:: - @$(MAKE) -C application/webbrowser/locales l10n-check + @$(MAKE) -C webbrowser/locales l10n-check ifdef ENABLE_TESTS # Implemented in testing/testsuite-targets.mk diff --git a/webbrowser/components/fuel/fuelApplication.js b/webbrowser/components/fuel/fuelApplication.js index bc3a091..2473f89 100644 --- a/webbrowser/components/fuel/fuelApplication.js +++ b/webbrowser/components/fuel/fuelApplication.js @@ -731,7 +731,7 @@ var ApplicationFactory = { }; -#include ../../../../toolkit/components/exthelper/extApplication.js +#include ../../../platform/toolkit/components/exthelper/extApplication.js //================================================= // Application constructor diff --git a/webbrowser/confvars.sh b/webbrowser/confvars.sh index d3f6756..2968529 100644 --- a/webbrowser/confvars.sh +++ b/webbrowser/confvars.sh @@ -33,8 +33,9 @@ MOZ_APP_STATIC_INI=1 # Changing MOZ_*BRANDING_DIRECTORY requires a clobber because branding # dependencies are broken. # MOZ_APP_DISPLAYNAME will be set by [branding]/configure.sh -MOZ_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/unofficial -MOZ_OFFICIAL_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/official +MOZ_BRANDING_DIRECTORY=webbrowser/branding/unofficial +# No official branding right now so comment this out +#MOZ_OFFICIAL_BRANDING_DIRECTORY=webbrowser/branding/official # Enables conditional code in the platform for Pale Moon only MC_PALEMOON=1 diff --git a/webbrowser/installer/Makefile.in b/webbrowser/installer/Makefile.in index 22d4679..5b09df2 100644 --- a/webbrowser/installer/Makefile.in +++ b/webbrowser/installer/Makefile.in @@ -108,8 +108,8 @@ ifndef LIBXUL_SDK INSTALL_SDK = 1 endif -include $(topsrcdir)/toolkit/mozapps/installer/signing.mk -include $(topsrcdir)/toolkit/mozapps/installer/packager-uxp.mk +include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/signing.mk +include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager-uxp.mk ifeq (bundle, $(MOZ_FS_LAYOUT)) BINPATH = $(_BINPATH) @@ -160,7 +160,7 @@ endif # fail to produce a langpack. see PaleMoon bug 1255096 make-langpack: ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS))) - $(MAKE) -C $(DEPTH)/application/webbrowser/locales langpack + $(MAKE) -C $(DEPTH)/webbrowser/locales langpack else @echo WARNING: "Language Pack was not generated due to using the hybrid FasterMake/RecursiveMake backend." >&2 endif diff --git a/webbrowser/installer/windows/Makefile.in b/webbrowser/installer/windows/Makefile.in deleted file mode 100644 index 25c5ce3..0000000 --- a/webbrowser/installer/windows/Makefile.in +++ /dev/null @@ -1,69 +0,0 @@ -# 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/. - -include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk - -CONFIG_DIR = instgen -SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/palemoon/7zSD.sfx - -INSTALLER_FILES = \ - app.tag \ - nsis/installer.nsi \ - nsis/uninstaller.nsi \ - nsis/shared.nsh \ - $(NULL) - -BRANDING_FILES = \ - branding.nsi \ - appname.bmp \ - wizHeader.bmp \ - wizHeaderRTL.bmp \ - wizWatermark.bmp \ - $(NULL) - -include $(topsrcdir)/config/config.mk - -ifdef LOCALE_MERGEDIR -PPL_LOCALE_ARGS = \ - --l10n-dir=$(LOCALE_MERGEDIR)/application/webbrowser/installer \ - --l10n-dir=$(call EXPAND_LOCALE_SRCDIR,application/webbrowser/locales)/installer \ - --l10n-dir=$(topsrcdir)/application/webbrowser/locales/en-US/installer \ - $(NULL) -else -PPL_LOCALE_ARGS=$(call EXPAND_LOCALE_SRCDIR,application/webbrowser/locales)/installer -endif - -OVERRIDE_DEFAULT_GOAL := installer -installer:: - $(MAKE) -C .. installer-stage - $(MAKE) $(CONFIG_DIR)/setup.exe - -# For building the uninstaller during the application build so it can be -# included for mar file generation. -uninstaller:: - $(RM) -r $(CONFIG_DIR) - $(MKDIR) $(CONFIG_DIR) - $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR) - $(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR) - $(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \ - $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi) - $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \ - --preprocess-locale $(topsrcdir) \ - $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR) - -$(CONFIG_DIR)/setup.exe:: - $(RM) -r $(CONFIG_DIR) - $(MKDIR) $(CONFIG_DIR) - $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR) - $(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR) - $(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \ - $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi) - $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \ - --preprocess-locale $(topsrcdir) \ - $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR) - -GARBARGE_DIRS += instgen - -include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk diff --git a/webbrowser/installer/windows/app.tag b/webbrowser/installer/windows/app.tag deleted file mode 100644 index 39235db..0000000 --- a/webbrowser/installer/windows/app.tag +++ /dev/null @@ -1,4 +0,0 @@ -;!@Install@!UTF-8! -Title="Pale Moon" -RunProgram="setup.exe" -;!@InstallEnd@! \ No newline at end of file diff --git a/webbrowser/installer/windows/moz.build b/webbrowser/installer/windows/moz.build deleted file mode 100644 index 394a85c..0000000 --- a/webbrowser/installer/windows/moz.build +++ /dev/null @@ -1,15 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# 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/. - -DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME'] -DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] -DEFINES['MOZILLA_VERSION'] = CONFIG['MOZILLA_VERSION'] - -if CONFIG['MOZ_APP_DISPLAYNAME'] in ('PaleMoon', 'Palemoon'): - DEFINES['MOZ_APP_DISPLAYNAME'] = "Pale Moon" -else: - DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME'] - diff --git a/webbrowser/installer/windows/nsis/defines.nsi.in b/webbrowser/installer/windows/nsis/defines.nsi.in deleted file mode 100644 index 1764b10..0000000 --- a/webbrowser/installer/windows/nsis/defines.nsi.in +++ /dev/null @@ -1,65 +0,0 @@ -#filter substitution -# 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/. - -# These defines should match application.ini settings -!define AppName "Pale Moon" -!define AppVersion "@APP_VERSION@" -!define GREVersion @MOZILLA_VERSION@ -!define AB_CD "@AB_CD@" - -!define FileMainEXE "@MOZ_APP_NAME@.exe" -!define WindowClass "Pale MoonMessageWindow" -!define DDEApplication "Pale Moon" -!define AppRegName "Pale Moon" - -!ifndef DEV_EDITION -!define BrandShortName "@MOZ_APP_DISPLAYNAME@" -!endif -!define BrandFullName "${BrandFullNameInternal}" - -!define CERTIFICATE_NAME "Mozilla Corporation" -!define CERTIFICATE_ISSUER "DigiCert SHA2 Assured ID Code Signing CA" -; Changing the name or issuer requires us to have both the old and the new -; in the registry at the same time, temporarily. -!define CERTIFICATE_NAME_PREVIOUS "Mozilla Corporation" -!define CERTIFICATE_ISSUER_PREVIOUS "DigiCert Assured ID Code Signing CA-1" - -# LSP_CATEGORIES is the permitted LSP categories for the application. Each LSP -# category value is ANDed together to set multiple permitted categories. -# See http://msdn.microsoft.com/en-us/library/ms742253%28VS.85%29.aspx -# The value below removes all LSP categories previously set. -!define LSP_CATEGORIES "0x00000000" - -!if "@MOZ_UPDATE_CHANNEL@" == "" -!define UpdateChannel "Unknown" -!else -!define UpdateChannel "@MOZ_UPDATE_CHANNEL@" -!endif - -# ARCH is used when it is necessary to differentiate the x64 registry keys from -# the x86 registry keys (e.g. the uninstall registry key). -#ifdef HAVE_64BIT_BUILD -!define HAVE_64BIT_BUILD -!define ARCH "x64" -!define MinSupportedVer "Microsoft Windows 7 x64" -#else -!define ARCH "x86" -!define MinSupportedVer "Microsoft Windows 7" -#endif - -!define MinSupportedCPU "SSE2" - -# File details shared by both the installer and uninstaller -VIProductVersion "1.0.0.0" -VIAddVersionKey "ProductName" "${BrandShortName}" -VIAddVersionKey "CompanyName" "${CompanyName}" -#ifdef MOZ_OFFICIAL_BRANDING -VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of Moonchild Productions." -#endif -VIAddVersionKey "LegalCopyright" "${CompanyName}" -VIAddVersionKey "FileVersion" "${AppVersion}" -VIAddVersionKey "ProductVersion" "${AppVersion}" -# Comments is not used but left below commented out for future reference -# VIAddVersionKey "Comments" "Comments" diff --git a/webbrowser/installer/windows/nsis/installer.nsi b/webbrowser/installer/windows/nsis/installer.nsi deleted file mode 100644 index 9f61c9c..0000000 --- a/webbrowser/installer/windows/nsis/installer.nsi +++ /dev/null @@ -1,1162 +0,0 @@ -# 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/. - -# Required Plugins: -# AppAssocReg http://nsis.sourceforge.net/Application_Association_Registration_plug-in -# ApplicationID http://nsis.sourceforge.net/ApplicationID_plug-in -# CityHash http://dxr.mozilla.org/mozilla-central/source/other-licenses/nsis/Contrib/CityHash -# ShellLink http://nsis.sourceforge.net/ShellLink_plug-in -# UAC http://nsis.sourceforge.net/UAC_plug-in -# ServicesHelper Mozilla specific plugin that is located in /other-licenses/nsis - -; Set verbosity to 3 (e.g. no script) to lessen the noise in the build logs -!verbose 3 - -; 7-Zip provides better compression than the lzma from NSIS so we add the files -; uncompressed and use 7-Zip to create a SFX archive of it -SetDatablockOptimize on -SetCompress off -CRCCheck on - -RequestExecutionLevel user - -; The commands inside this ifdef require NSIS 3.0a2 or greater so the ifdef can -; be removed after we require NSIS 3.0a2 or greater. -!ifdef NSIS_PACKEDVERSION - Unicode true - ManifestSupportedOS all - ManifestDPIAware true -!endif - -!addplugindir ./ - -Var TmpVal -Var InstallType -Var AddStartMenuSC -Var AddQuickLaunchSC -Var AddDesktopSC -Var InstallMaintenanceService -Var PageName -Var PreventRebootRequired - -; By defining NO_STARTMENU_DIR an installer that doesn't provide an option for -; an application's Start Menu PROGRAMS directory and doesn't define the -; StartMenuDir variable can use the common InstallOnInitCommon macro. -!define NO_STARTMENU_DIR - -; On Vista and above attempt to elevate Standard Users in addition to users that -; are a member of the Administrators group. -!define NONADMIN_ELEVATE - -!define AbortSurveyURL "http://www.kampyle.com/feedback_form/ff-feedback-form.php?site_code=8166124&form_id=12116&url=" - -; Other included files may depend upon these includes! -; The following includes are provided by NSIS. -!include FileFunc.nsh -!include LogicLib.nsh -!include MUI.nsh -!include WinMessages.nsh -!include WinVer.nsh -!include WordFunc.nsh - -!insertmacro GetOptions -!insertmacro GetParameters -!insertmacro GetSize -!insertmacro StrFilter -!insertmacro WordFind -!insertmacro WordReplace - -; The following includes are custom. -!include branding.nsi -!include defines.nsi -!include common.nsh -!include locales.nsi - -VIAddVersionKey "FileDescription" "${BrandShortName} Installer" -VIAddVersionKey "OriginalFilename" "setup.exe" - -; Must be inserted before other macros that use logging -!insertmacro _LoggingCommon - -!insertmacro AddDisabledDDEHandlerValues -!insertmacro ChangeMUIHeaderImage -!insertmacro CheckForFilesInUse -!insertmacro CleanUpdateDirectories -!insertmacro CopyFilesFromDir -!insertmacro CreateRegKey -!insertmacro GetLongPath -!insertmacro GetPathFromString -!insertmacro GetParent -!insertmacro InitHashAppModelId -!insertmacro IsHandlerForInstallDir -!insertmacro IsPinnedToTaskBar -!insertmacro LogDesktopShortcut -!insertmacro LogQuickLaunchShortcut -!insertmacro LogStartMenuShortcut -!insertmacro ManualCloseAppPrompt -!insertmacro PinnedToStartMenuLnkCount -!insertmacro RegCleanAppHandler -!insertmacro RegCleanMain -!insertmacro RegCleanUninstall -!insertmacro RemovePrecompleteEntries -!insertmacro SetAppLSPCategories -!insertmacro SetBrandNameVars -!insertmacro UpdateShortcutAppModelIDs -!insertmacro UnloadUAC -!insertmacro WriteRegStr2 -!insertmacro WriteRegDWORD2 - -!include shared.nsh - -; Helper macros for ui callbacks. Insert these after shared.nsh -!insertmacro CheckCustomCommon -!insertmacro InstallEndCleanupCommon -!insertmacro InstallOnInitCommon -!insertmacro InstallStartCleanupCommon -!insertmacro LeaveDirectoryCommon -!insertmacro LeaveOptionsCommon -!insertmacro OnEndCommon -!insertmacro PreDirectoryCommon - -Name "${BrandFullName}" -OutFile "setup.exe" -!ifdef HAVE_64BIT_BUILD - InstallDir "$PROGRAMFILES64\${BrandFullName}\" -!else - InstallDir "$PROGRAMFILES32\${BrandFullName}\" -!endif -ShowInstDetails nevershow - -################################################################################ -# Modern User Interface - MUI - -!define MOZ_MUI_CUSTOM_ABORT -!define MUI_CUSTOMFUNCTION_ABORT "CustomAbort" -!define MUI_ICON setup.ico -!define MUI_UNICON setup.ico -!define MUI_WELCOMEPAGE_TITLE_3LINES -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_RIGHT -!define MUI_WELCOMEFINISHPAGE_BITMAP wizWatermark.bmp - -; Use a right to left header image when the language is right to left -!ifdef ${AB_CD}_rtl -!define MUI_HEADERIMAGE_BITMAP_RTL wizHeaderRTL.bmp -!else -!define MUI_HEADERIMAGE_BITMAP wizHeader.bmp -!endif - -/** - * Installation Pages - */ -; Welcome Page -!define MUI_PAGE_CUSTOMFUNCTION_PRE preWelcome -!insertmacro MUI_PAGE_WELCOME - -; Custom Options Page -Page custom preOptions leaveOptions - -; Select Install Directory Page -!define MUI_PAGE_CUSTOMFUNCTION_PRE preDirectory -!define MUI_PAGE_CUSTOMFUNCTION_LEAVE leaveDirectory -!define MUI_DIRECTORYPAGE_VERIFYONLEAVE -!insertmacro MUI_PAGE_DIRECTORY - -; Custom Shortcuts Page -Page custom preShortcuts leaveShortcuts - -; Custom Summary Page -Page custom preSummary leaveSummary - -; Install Files Page -!insertmacro MUI_PAGE_INSTFILES - -; Finish Page -!define MUI_FINISHPAGE_TITLE_3LINES -!define MUI_FINISHPAGE_RUN -!define MUI_FINISHPAGE_RUN_FUNCTION LaunchApp -!define MUI_FINISHPAGE_RUN_TEXT $(LAUNCH_TEXT) -!define MUI_PAGE_CUSTOMFUNCTION_PRE preFinish -!insertmacro MUI_PAGE_FINISH - -; Use the default dialog for IDD_VERIFY for a simple Banner -ChangeUI IDD_VERIFY "${NSISDIR}\Contrib\UIs\default.exe" - -################################################################################ -# Install Sections - -; Cleanup operations to perform at the start of the installation. -Section "-InstallStartCleanup" - SetDetailsPrint both - DetailPrint $(STATUS_CLEANUP) - SetDetailsPrint none - - SetOutPath "$INSTDIR" - ${StartInstallLog} "${BrandFullName}" "${AB_CD}" "${AppVersion}" "${GREVersion}" - - StrCpy $R9 "true" - StrCpy $PreventRebootRequired "false" - ${GetParameters} $R8 - ${GetOptions} "$R8" "/INI=" $R7 - ${Unless} ${Errors} - ; The configuration file must also exist - ${If} ${FileExists} "$R7" - ReadINIStr $R9 $R7 "Install" "RemoveDistributionDir" - ReadINIStr $R8 $R7 "Install" "PreventRebootRequired" - ${If} $R8 == "true" - StrCpy $PreventRebootRequired "true" - ${EndIf} - ${EndIf} - ${EndUnless} - - ; Remove directories and files we always control before parsing the uninstall - ; log so empty directories can be removed. - ${If} ${FileExists} "$INSTDIR\updates" - RmDir /r "$INSTDIR\updates" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\updated" - RmDir /r "$INSTDIR\updated" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\defaults\shortcuts" - RmDir /r "$INSTDIR\defaults\shortcuts" - ${EndIf} - ; Only remove the distribution directory if it exists and if the installer - ; isn't launched with an ini file that has RemoveDistributionDir=false in the - ; install section. - ${If} ${FileExists} "$INSTDIR\distribution" - ${AndIf} $R9 != "false" - RmDir /r "$INSTDIR\distribution" - ${EndIf} - - ; Delete the app exe if present to prevent launching the app while we are - ; installing. - ClearErrors - ${DeleteFile} "$INSTDIR\${FileMainEXE}" - ${If} ${Errors} - ; If the user closed the application it can take several seconds for it to - ; shut down completely. If the application is being used by another user we - ; can rename the file and then delete is when the system is restarted. - Sleep 5000 - ${DeleteFile} "$INSTDIR\${FileMainEXE}" - ClearErrors - ${EndIf} - - ; setup the application model id registration value - ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs" - - ; Remove the updates directory for Vista and above - ${CleanUpdateDirectories} "Mozilla\Pale Moon" "Mozilla\updates" - - ${RemoveDeprecatedFiles} - ${RemovePrecompleteEntries} "false" - - ${If} ${FileExists} "$INSTDIR\defaults\pref\channel-prefs.js" - Delete "$INSTDIR\defaults\pref\channel-prefs.js" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\defaults\pref" - RmDir "$INSTDIR\defaults\pref" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\defaults" - RmDir "$INSTDIR\defaults" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\uninstall" - ; Remove the uninstall directory that we control - RmDir /r "$INSTDIR\uninstall" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\update-settings.ini" - Delete "$INSTDIR\update-settings.ini" - ${EndIf} - - ; Explictly remove empty webapprt dir in case it exists (bug 757978). - RmDir "$INSTDIR\webapprt\components" - RmDir "$INSTDIR\webapprt" - - ${InstallStartCleanupCommon} -SectionEnd - -Section "-Application" APP_IDX - ${StartUninstallLog} - - SetDetailsPrint both - DetailPrint $(STATUS_INSTALL_APP) - SetDetailsPrint none - - ${LogHeader} "Installing Main Files" - ${CopyFilesFromDir} "$EXEDIR\core" "$INSTDIR" \ - "$(ERROR_CREATE_DIRECTORY_PREFIX)" \ - "$(ERROR_CREATE_DIRECTORY_SUFFIX)" - - ; Register DLLs - ; XXXrstrong - AccessibleMarshal.dll can be used by multiple applications but - ; is only registered for the last application installed. When the last - ; application installed is uninstalled AccessibleMarshal.dll will no longer be - ; registered. bug 338878 - ${LogHeader} "DLL Registration" - ClearErrors - ${RegisterDLL} "$INSTDIR\AccessibleMarshal.dll" - ${If} ${Errors} - ${LogMsg} "** ERROR Registering: $INSTDIR\AccessibleMarshal.dll **" - ${Else} - ${LogUninstall} "DLLReg: \AccessibleMarshal.dll" - ${LogMsg} "Registered: $INSTDIR\AccessibleMarshal.dll" - ${EndIf} - - ClearErrors - - ; Default for creating Start Menu shortcut - ; (1 = create, 0 = don't create) - ${If} $AddStartMenuSC == "" - StrCpy $AddStartMenuSC "1" - ${EndIf} - - ; Default for creating Quick Launch shortcut (1 = create, 0 = don't create) - ${If} $AddQuickLaunchSC == "" - ; Don't install the quick launch shortcut on Windows 7 - ${If} ${AtLeastWin7} - StrCpy $AddQuickLaunchSC "0" - ${Else} - StrCpy $AddQuickLaunchSC "1" - ${EndIf} - ${EndIf} - - ; Default for creating Desktop shortcut (1 = create, 0 = don't create) - ${If} $AddDesktopSC == "" - StrCpy $AddDesktopSC "1" - ${EndIf} - - ${LogHeader} "Adding Registry Entries" - SetShellVarContext current ; Set SHCTX to HKCU - ${RegCleanMain} "Software\Mozilla" - ${RegCleanUninstall} - ${UpdateProtocolHandlers} - - ClearErrors - WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test" - ${If} ${Errors} - StrCpy $TmpVal "HKCU" ; used primarily for logging - ${Else} - SetShellVarContext all ; Set SHCTX to HKLM - DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" - StrCpy $TmpVal "HKLM" ; used primarily for logging - ${RegCleanMain} "Software\Mozilla" - ${RegCleanUninstall} - ${UpdateProtocolHandlers} - - ReadRegStr $0 HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" - ${If} "$0" != "${GREVersion}" - WriteRegStr HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" "${GREVersion}" - ${EndIf} - ${EndIf} - - ${RemoveDeprecatedKeys} - - ; The previous installer adds several regsitry values to both HKLM and HKCU. - ; We now try to add to HKLM and if that fails to HKCU - - ; The order that reg keys and values are added is important if you use the - ; uninstall log to remove them on uninstall. When using the uninstall log you - ; MUST add children first so they will be removed first on uninstall so they - ; will be empty when the key is deleted. This allows the uninstaller to - ; specify that only empty keys will be deleted. - ${SetAppKeys} - - ${FixClassKeys} - - ; Uninstall keys can only exist under HKLM on some versions of windows. Since - ; it doesn't cause problems always add them. - ${SetUninstallKeys} - - ; On install always add the PaleMoonHTML and PaleMoonURL keys. - ; An empty string is used for the 5th param because PaleMoonHTML is not a - ; protocol handler. - ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8 - StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" - - ; In Win8, the delegate execute handler picks up the value in PaleMoonURL and - ; PaleMoonHTML to launch the desktop browser when it needs to. - ${AddDisabledDDEHandlerValues} "PaleMoonHTML" "$2" "$8,1" \ - "${AppRegName} Document" "" - ${AddDisabledDDEHandlerValues} "PaleMoonURL" "$2" "$8,1" "${AppRegName} URL" \ - "true" - - ; For pre win8, the following keys should only be set if we can write to HKLM. - ; For post win8, the keys below get set in both HKLM and HKCU. - ${If} $TmpVal == "HKLM" - ; Set the Start Menu Internet and Vista Registered App HKLM registry keys. - ${SetStartMenuInternet} "HKLM" - ${FixShellIconHandler} "HKLM" - - ; If we are writing to HKLM and create either the desktop or start menu - ; shortcuts set IconsVisible to 1 otherwise to 0. - ${StrFilter} "${FileMainEXE}" "+" "" "" $R9 - StrCpy $0 "Software\Clients\StartMenuInternet\$R9\InstallInfo" - ${If} $AddDesktopSC == 1 - ${OrIf} $AddStartMenuSC == 1 - WriteRegDWORD HKLM "$0" "IconsVisible" 1 - ${Else} - WriteRegDWORD HKLM "$0" "IconsVisible" 0 - ${EndIf} - ${EndIf} - - ${If} ${AtLeastWin8} - ; Set the Start Menu Internet and Vista Registered App HKCU registry keys. - ${SetStartMenuInternet} "HKCU" - ${FixShellIconHandler} "HKCU" - - ; If we create either the desktop or start menu shortcuts, then - ; set IconsVisible to 1 otherwise to 0. - ${StrFilter} "${FileMainEXE}" "+" "" "" $R9 - StrCpy $0 "Software\Clients\StartMenuInternet\$R9\InstallInfo" - ${If} $AddDesktopSC == 1 - ${OrIf} $AddStartMenuSC == 1 - WriteRegDWORD HKCU "$0" "IconsVisible" 1 - ${Else} - WriteRegDWORD HKCU "$0" "IconsVisible" 0 - ${EndIf} - ${EndIf} - - ; These need special handling on uninstall since they may be overwritten by - ; an install into a different location. - StrCpy $0 "Software\Microsoft\Windows\CurrentVersion\App Paths\${FileMainEXE}" - ${WriteRegStr2} $TmpVal "$0" "" "$INSTDIR\${FileMainEXE}" 0 - ${WriteRegStr2} $TmpVal "$0" "Path" "$INSTDIR" 0 - - StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\$R9" - ${CreateRegKey} "$TmpVal" "$0" 0 - StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe" - ${CreateRegKey} "$TmpVal" "$0" 0 - - ${If} $TmpVal == "HKLM" - ; Set the permitted LSP Categories for WinVista and above - ${SetAppLSPCategories} ${LSP_CATEGORIES} - ${EndIf} - - ; Create shortcuts - ${LogHeader} "Adding Shortcuts" - - ; Remove the start menu shortcuts and directory if the SMPROGRAMS section - ; exists in the shortcuts_log.ini and the SMPROGRAMS. The installer's shortcut - ; creation code will create the shortcut in the root of the Start Menu - ; Programs directory. - ${RemoveStartMenuDir} - - ; Always add the application's shortcuts to the shortcuts log ini file. The - ; DeleteShortcuts macro will do the right thing on uninstall if the - ; shortcuts don't exist. - ${LogStartMenuShortcut} "${BrandFullName}.lnk" - ${LogQuickLaunchShortcut} "${BrandFullName}.lnk" - ${LogDesktopShortcut} "${BrandFullName}.lnk" - - ; Best effort to update the Win7 taskbar and start menu shortcut app model - ; id's. The possible contexts are current user / system and the user that - ; elevated the installer. - Call FixShortcutAppModelIDs - ; If the current context is all also perform Win7 taskbar and start menu link - ; maintenance for the current user context. - ${If} $TmpVal == "HKLM" - SetShellVarContext current ; Set SHCTX to HKCU - Call FixShortcutAppModelIDs - SetShellVarContext all ; Set SHCTX to HKLM - ${EndIf} - - ; If running elevated also perform Win7 taskbar and start menu link - ; maintenance for the unelevated user context in case that is different than - ; the current user. - ClearErrors - ${GetParameters} $0 - ${GetOptions} "$0" "/UAC:" $0 - ${Unless} ${Errors} - GetFunctionAddress $0 FixShortcutAppModelIDs - UAC::ExecCodeSegment $0 - ${EndUnless} - - ; UAC only allows elevating to an Admin account so there is no need to add - ; the Start Menu or Desktop shortcuts from the original unelevated process - ; since this will either add it for the user if unelevated or All Users if - ; elevated. - ${If} $AddStartMenuSC == 1 - CreateShortCut "$SMPROGRAMS\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" - ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk" - ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandFullName}.lnk" \ - "$INSTDIR" - ${If} ${AtLeastWin7} - ${AndIf} "$AppUserModelID" != "" - ApplicationID::Set "$SMPROGRAMS\${BrandFullName}.lnk" "$AppUserModelID" "true" - ${EndIf} - ${LogMsg} "Added Shortcut: $SMPROGRAMS\${BrandFullName}.lnk" - ${Else} - ${LogMsg} "** ERROR Adding Shortcut: $SMPROGRAMS\${BrandFullName}.lnk" - ${EndIf} - ${EndIf} - - ; Update lastwritetime of the Start Menu shortcut to clear the tile cache. - ${If} ${AtLeastWin8} - ${AndIf} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk" - FileOpen $0 "$SMPROGRAMS\${BrandFullName}.lnk" a - FileClose $0 - ${EndIf} - - ${If} $AddDesktopSC == 1 - CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" - ${If} ${FileExists} "$DESKTOP\${BrandFullName}.lnk" - ShellLink::SetShortCutWorkingDirectory "$DESKTOP\${BrandFullName}.lnk" \ - "$INSTDIR" - ${If} ${AtLeastWin7} - ${AndIf} "$AppUserModelID" != "" - ApplicationID::Set "$DESKTOP\${BrandFullName}.lnk" "$AppUserModelID" "true" - ${EndIf} - ${LogMsg} "Added Shortcut: $DESKTOP\${BrandFullName}.lnk" - ${Else} - ${LogMsg} "** ERROR Adding Shortcut: $DESKTOP\${BrandFullName}.lnk" - ${EndIf} - ${EndIf} - - ; If elevated the Quick Launch shortcut must be added from the unelevated - ; original process. - ${If} $AddQuickLaunchSC == 1 - ${Unless} ${AtLeastWin7} - ClearErrors - ${GetParameters} $0 - ${GetOptions} "$0" "/UAC:" $0 - ${If} ${Errors} - Call AddQuickLaunchShortcut - ${LogMsg} "Added Shortcut: $QUICKLAUNCH\${BrandFullName}.lnk" - ${Else} - ; It is not possible to add a log entry from the unelevated process so - ; add the log entry without the path since there is no simple way to - ; know the correct full path. - ${LogMsg} "Added Quick Launch Shortcut: ${BrandFullName}.lnk" - GetFunctionAddress $0 AddQuickLaunchShortcut - UAC::ExecCodeSegment $0 - ${EndIf} - ${EndUnless} - ${EndIf} -SectionEnd - -; Cleanup operations to perform at the end of the installation. -Section "-InstallEndCleanup" - SetDetailsPrint both - DetailPrint "$(STATUS_CLEANUP)" - SetDetailsPrint none - - ${Unless} ${Silent} - ClearErrors - ${MUI_INSTALLOPTIONS_READ} $0 "summary.ini" "Field 4" "State" - ${If} "$0" == "1" - ; NB: this code is duplicated in stub.nsi. Please keep in sync. - ; For data migration in the app, we want to know what the default browser - ; value was before we changed it. To do so, we read it here and store it - ; in our own registry key. - StrCpy $0 "" - ${If} ${AtLeastWinVista} - AppAssocReg::QueryCurrentDefault "http" "protocol" "effective" - Pop $1 - ; If the method hasn't failed, $1 will contain the progid. Check: - ${If} "$1" != "method failed" - ${AndIf} "$1" != "method not available" - ; Read the actual command from the progid - ReadRegStr $0 HKCR "$1\shell\open\command" "" - ${EndIf} - ${EndIf} - ; If using the App Association Registry didn't happen or failed, fall back - ; to the effective http default: - ${If} "$0" == "" - ReadRegStr $0 HKCR "http\shell\open\command" "" - ${EndIf} - ; If we have something other than empty string now, write the value. - ${If} "$0" != "" - ClearErrors - WriteRegStr HKCU "Software\Mozilla\Pale Moon" "OldDefaultBrowserCommand" "$0" - ${EndIf} - - ${LogHeader} "Setting as the default browser" - ClearErrors - ${GetParameters} $0 - ${GetOptions} "$0" "/UAC:" $0 - ${If} ${Errors} - Call SetAsDefaultAppUserHKCU - ${Else} - GetFunctionAddress $0 SetAsDefaultAppUserHKCU - UAC::ExecCodeSegment $0 - ${EndIf} - ${ElseIfNot} ${Errors} - ${LogHeader} "Writing default-browser opt-out" - ClearErrors - WriteRegStr HKCU "Software\Mozilla\Pale Moon" "DefaultBrowserOptOut" "True" - ${If} ${Errors} - ${LogMsg} "Error writing default-browser opt-out" - ${EndIf} - ${EndIf} - ${EndUnless} - - ; Adds a pinned Task Bar shortcut (see MigrateTaskBarShortcut for details). - ${MigrateTaskBarShortcut} - - ; Add the Firewall entries during install - Call AddFirewallEntries - - ; Refresh desktop icons - System::Call "shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_DWORDFLUSH}, i 0, i 0)" - - ${InstallEndCleanupCommon} - - ${If} $PreventRebootRequired == "true" - SetRebootFlag false - ${EndIf} - - ${If} ${RebootFlag} - ; Admin is required to delete files on reboot so only add the moz-delete if - ; the user is an admin. After calling UAC::IsAdmin $0 will equal 1 if the - ; user is an admin. - UAC::IsAdmin - ${If} "$0" == "1" - ; When a reboot is required give SHChangeNotify time to finish the - ; refreshing the icons so the OS doesn't display the icons from helper.exe - Sleep 10000 - ${LogHeader} "Reboot Required To Finish Installation" - ; ${FileMainEXE}.moz-upgrade should never exist but just in case... - ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}.moz-upgrade" - Rename "$INSTDIR\${FileMainEXE}" "$INSTDIR\${FileMainEXE}.moz-upgrade" - ${EndUnless} - - ${If} ${FileExists} "$INSTDIR\${FileMainEXE}" - ClearErrors - Rename "$INSTDIR\${FileMainEXE}" "$INSTDIR\${FileMainEXE}.moz-delete" - ${Unless} ${Errors} - Delete /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-delete" - ${EndUnless} - ${EndIf} - - ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}" - CopyFiles /SILENT "$INSTDIR\uninstall\helper.exe" "$INSTDIR" - FileOpen $0 "$INSTDIR\${FileMainEXE}" w - FileWrite $0 "Will be deleted on restart" - Rename /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-upgrade" "$INSTDIR\${FileMainEXE}" - FileClose $0 - Delete "$INSTDIR\${FileMainEXE}" - Rename "$INSTDIR\helper.exe" "$INSTDIR\${FileMainEXE}" - ${EndUnless} - ${EndIf} - ${EndIf} -SectionEnd - -################################################################################ -# Install Abort Survey Functions - -Function CustomAbort - ${If} "${AB_CD}" == "en-US" - ${AndIf} "$PageName" != "" - ${AndIf} ${FileExists} "$EXEDIR\core\distribution\distribution.ini" - ReadINIStr $0 "$EXEDIR\core\distribution\distribution.ini" "Global" "about" - ClearErrors - ${WordFind} "$0" "Funnelcake" "E#" $1 - ${Unless} ${Errors} - ; Yes = fill out the survey and exit, No = don't fill out survey and exit, - ; Cancel = don't exit. - MessageBox MB_YESNO|MB_ICONEXCLAMATION \ - "Would you like to tell us why you are canceling this installation?" \ - IDYes +1 IDNO CustomAbort_finish - ${If} "$PageName" == "Welcome" - GetFunctionAddress $0 AbortSurveyWelcome - ${ElseIf} "$PageName" == "Options" - GetFunctionAddress $0 AbortSurveyOptions - ${ElseIf} "$PageName" == "Directory" - GetFunctionAddress $0 AbortSurveyDirectory - ${ElseIf} "$PageName" == "Shortcuts" - GetFunctionAddress $0 AbortSurveyShortcuts - ${ElseIf} "$PageName" == "Summary" - GetFunctionAddress $0 AbortSurveySummary - ${EndIf} - ClearErrors - ${GetParameters} $1 - ${GetOptions} "$1" "/UAC:" $2 - ${If} ${Errors} - Call $0 - ${Else} - UAC::ExecCodeSegment $0 - ${EndIf} - - CustomAbort_finish: - Return - ${EndUnless} - ${EndIf} - - MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(MOZ_MUI_TEXT_ABORTWARNING)" \ - IDYES +1 IDNO +2 - Return - Abort -FunctionEnd - -Function AbortSurveyWelcome - ExecShell "open" "${AbortSurveyURL}step1" -FunctionEnd - -Function AbortSurveyOptions - ExecShell "open" "${AbortSurveyURL}step2" -FunctionEnd - -Function AbortSurveyDirectory - ExecShell "open" "${AbortSurveyURL}step3" -FunctionEnd - -Function AbortSurveyShortcuts - ExecShell "open" "${AbortSurveyURL}step4" -FunctionEnd - -Function AbortSurveySummary - ExecShell "open" "${AbortSurveyURL}step5" -FunctionEnd - -################################################################################ -# Helper Functions - -Function AddQuickLaunchShortcut - CreateShortCut "$QUICKLAUNCH\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" - ${If} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk" - ShellLink::SetShortCutWorkingDirectory "$QUICKLAUNCH\${BrandFullName}.lnk" \ - "$INSTDIR" - ${EndIf} -FunctionEnd - -Function CheckExistingInstall - ; If there is a pending file copy from a previous upgrade don't allow - ; installing until after the system has rebooted. - IfFileExists "$INSTDIR\${FileMainEXE}.moz-upgrade" +1 +4 - MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(WARN_RESTART_REQUIRED_UPGRADE)" IDNO +2 - Reboot - Quit - - ; If there is a pending file deletion from a previous uninstall don't allow - ; installing until after the system has rebooted. - IfFileExists "$INSTDIR\${FileMainEXE}.moz-delete" +1 +4 - MessageBox MB_YESNO|MB_ICONEXCLAMATION "$(WARN_RESTART_REQUIRED_UNINSTALL)" IDNO +2 - Reboot - Quit - - ${If} ${FileExists} "$INSTDIR\${FileMainEXE}" - ; Disable the next, cancel, and back buttons - GetDlgItem $0 $HWNDPARENT 1 ; Next button - EnableWindow $0 0 - GetDlgItem $0 $HWNDPARENT 2 ; Cancel button - EnableWindow $0 0 - GetDlgItem $0 $HWNDPARENT 3 ; Back button - EnableWindow $0 0 - - Banner::show /NOUNLOAD "$(BANNER_CHECK_EXISTING)" - - ${If} "$TmpVal" == "FoundMessageWindow" - Sleep 5000 - ${EndIf} - - ${PushFilesToCheck} - - ; Store the return value in $TmpVal so it is less likely to be accidentally - ; overwritten elsewhere. - ${CheckForFilesInUse} $TmpVal - - Banner::destroy - - ; Enable the next, cancel, and back buttons - GetDlgItem $0 $HWNDPARENT 1 ; Next button - EnableWindow $0 1 - GetDlgItem $0 $HWNDPARENT 2 ; Cancel button - EnableWindow $0 1 - GetDlgItem $0 $HWNDPARENT 3 ; Back button - EnableWindow $0 1 - - ${If} "$TmpVal" == "true" - StrCpy $TmpVal "FoundMessageWindow" - ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_INSTALL)" - StrCpy $TmpVal "true" - ${EndIf} - ${EndIf} -FunctionEnd - -Function LaunchApp -!ifndef DEV_EDITION - ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)" -!endif - - ClearErrors - ${GetParameters} $0 - ${GetOptions} "$0" "/UAC:" $1 - ${If} ${Errors} - Exec "$\"$INSTDIR\${FileMainEXE}$\"" - ${Else} - GetFunctionAddress $0 LaunchAppFromElevatedProcess - UAC::ExecCodeSegment $0 - ${EndIf} -FunctionEnd - -Function LaunchAppFromElevatedProcess - ; Find the installation directory when launching using GetFunctionAddress - ; from an elevated installer since $INSTDIR will not be set in this installer - ${StrFilter} "${FileMainEXE}" "+" "" "" $R9 - ReadRegStr $0 HKLM "Software\Clients\StartMenuInternet\$R9\DefaultIcon" "" - ${GetPathFromString} "$0" $0 - ${GetParent} "$0" $1 - ; Set our current working directory to the application's install directory - ; otherwise the 7-Zip temp directory will be in use and won't be deleted. - SetOutPath "$1" - Exec "$\"$0$\"" -FunctionEnd - -################################################################################ -# Language - -!insertmacro MOZ_MUI_LANGUAGE 'baseLocale' -!verbose push -!verbose 3 -!include "overrideLocale.nsh" -!include "customLocale.nsh" -!verbose pop - -; Set this after the locale files to override it if it is in the locale -; using " " for BrandingText will hide the "Nullsoft Install System..." branding -BrandingText " " - -################################################################################ -# Page pre, show, and leave functions - -Function preWelcome - StrCpy $PageName "Welcome" - ${If} ${FileExists} "$EXEDIR\core\distribution\modern-wizard.bmp" - Delete "$PLUGINSDIR\modern-wizard.bmp" - CopyFiles /SILENT "$EXEDIR\core\distribution\modern-wizard.bmp" "$PLUGINSDIR\modern-wizard.bmp" - ${EndIf} -FunctionEnd - -Function preOptions - StrCpy $PageName "Options" - ${If} ${FileExists} "$EXEDIR\core\distribution\modern-header.bmp" - ${AndIf} $hHeaderBitmap == "" - Delete "$PLUGINSDIR\modern-header.bmp" - CopyFiles /SILENT "$EXEDIR\core\distribution\modern-header.bmp" "$PLUGINSDIR\modern-header.bmp" - ${ChangeMUIHeaderImage} "$PLUGINSDIR\modern-header.bmp" - ${EndIf} - !insertmacro MUI_HEADER_TEXT "$(OPTIONS_PAGE_TITLE)" "$(OPTIONS_PAGE_SUBTITLE)" - !insertmacro MUI_INSTALLOPTIONS_DISPLAY "options.ini" -FunctionEnd - -Function leaveOptions - ${MUI_INSTALLOPTIONS_READ} $0 "options.ini" "Settings" "State" - ${If} $0 != 0 - Abort - ${EndIf} - ${MUI_INSTALLOPTIONS_READ} $R0 "options.ini" "Field 2" "State" - StrCmp $R0 "1" +1 +2 - StrCpy $InstallType ${INSTALLTYPE_BASIC} - ${MUI_INSTALLOPTIONS_READ} $R0 "options.ini" "Field 3" "State" - StrCmp $R0 "1" +1 +2 - StrCpy $InstallType ${INSTALLTYPE_CUSTOM} - - ${LeaveOptionsCommon} - - ${If} $InstallType == ${INSTALLTYPE_BASIC} - Call CheckExistingInstall - ${EndIf} -FunctionEnd - -Function preDirectory - StrCpy $PageName "Directory" - ${PreDirectoryCommon} -FunctionEnd - -Function leaveDirectory - ${If} $InstallType == ${INSTALLTYPE_BASIC} - Call CheckExistingInstall - ${EndIf} - ${LeaveDirectoryCommon} "$(WARN_DISK_SPACE)" "$(WARN_WRITE_ACCESS)" -FunctionEnd - -Function preShortcuts - StrCpy $PageName "Shortcuts" - ${CheckCustomCommon} - !insertmacro MUI_HEADER_TEXT "$(SHORTCUTS_PAGE_TITLE)" "$(SHORTCUTS_PAGE_SUBTITLE)" - !insertmacro MUI_INSTALLOPTIONS_DISPLAY "shortcuts.ini" -FunctionEnd - -Function leaveShortcuts - ${MUI_INSTALLOPTIONS_READ} $0 "shortcuts.ini" "Settings" "State" - ${If} $0 != 0 - Abort - ${EndIf} - ${MUI_INSTALLOPTIONS_READ} $AddDesktopSC "shortcuts.ini" "Field 2" "State" - ${MUI_INSTALLOPTIONS_READ} $AddStartMenuSC "shortcuts.ini" "Field 3" "State" - - ; Don't install the quick launch shortcut on Windows 7 - ${Unless} ${AtLeastWin7} - ${MUI_INSTALLOPTIONS_READ} $AddQuickLaunchSC "shortcuts.ini" "Field 4" "State" - ${EndUnless} - - ${If} $InstallType == ${INSTALLTYPE_CUSTOM} - Call CheckExistingInstall - ${EndIf} -FunctionEnd - -Function preSummary - StrCpy $PageName "Summary" - ; Setup the summary.ini file for the Custom Summary Page - WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "3" - - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Type "label" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Text "$(SUMMARY_INSTALLED_TO)" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Left "0" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Right "-1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Top "5" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Bottom "15" - - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Type "text" - ; The contents of this control must be set as follows in the pre function - ; ${MUI_INSTALLOPTIONS_READ} $1 "summary.ini" "Field 2" "HWND" - ; SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" state "" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Left "0" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Right "-1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Top "17" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Bottom "30" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" flags "READONLY" - - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Type "label" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Left "0" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Right "-1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Top "130" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Bottom "150" - - ${If} ${FileExists} "$INSTDIR\${FileMainEXE}" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Text "$(SUMMARY_UPGRADE_CLICK)" - WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NextButtonText "$(UPGRADE_BUTTON)" - ${Else} - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Text "$(SUMMARY_INSTALL_CLICK)" - DeleteINIStr "$PLUGINSDIR\summary.ini" "Settings" NextButtonText - ${EndIf} - - - ; Remove the "Field 4" ini section in case the user hits back and changes the - ; installation directory which could change whether the make default checkbox - ; should be displayed. - DeleteINISec "$PLUGINSDIR\summary.ini" "Field 4" - - ; Check if it is possible to write to HKLM - ClearErrors - WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test" - ${Unless} ${Errors} - DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" - ; Check if Pale Moon is the http handler for this user. - SetShellVarContext current ; Set SHCTX to the current user - ${IsHandlerForInstallDir} "http" $R9 - ${If} $TmpVal == "HKLM" - SetShellVarContext all ; Set SHCTX to all users - ${EndIf} - ; If Pale Moon isn't the http handler for this user show the option to set - ; Pale Moon as the default browser. - ${If} "$R9" != "true" - ${AndIf} ${AtMostWin2008R2} - WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "4" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Type "checkbox" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Text "$(SUMMARY_TAKE_DEFAULTS)" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Left "0" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Right "-1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" State "1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Top "32" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Bottom "53" - ${EndIf} - ${EndUnless} - - ${If} "$TmpVal" == "true" - ; If there is already a Type entry in the "Field 4" section with a value of - ; checkbox then the set as the default browser checkbox is displayed and - ; this text must be moved below it. - ReadINIStr $0 "$PLUGINSDIR\summary.ini" "Field 4" "Type" - ${If} "$0" == "checkbox" - StrCpy $0 "5" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Top "53" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Bottom "68" - ${Else} - StrCpy $0 "4" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Top "35" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Bottom "50" - ${EndIf} - WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "$0" - - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Type "label" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Text "$(SUMMARY_REBOOT_REQUIRED_INSTALL)" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Left "0" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Right "-1" - ${EndIf} - - !insertmacro MUI_HEADER_TEXT "$(SUMMARY_PAGE_TITLE)" "$(SUMMARY_PAGE_SUBTITLE)" - - ; The Summary custom page has a textbox that will automatically receive - ; focus. This sets the focus to the Install button instead. - !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "summary.ini" - GetDlgItem $0 $HWNDPARENT 1 - System::Call "user32::SetFocus(i r0, i 0x0007, i,i)i" - ${MUI_INSTALLOPTIONS_READ} $1 "summary.ini" "Field 2" "HWND" - SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR" - !insertmacro MUI_INSTALLOPTIONS_SHOW -FunctionEnd - -Function leaveSummary - ; Try to delete the app executable and if we can't delete it try to find the - ; app's message window and prompt the user to close the app. This allows - ; running an instance that is located in another directory. If for whatever - ; reason there is no message window we will just rename the app's files and - ; then remove them on restart. - ClearErrors - ${DeleteFile} "$INSTDIR\${FileMainEXE}" - ${If} ${Errors} - ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_INSTALL)" - ${EndIf} -FunctionEnd - -; When we add an optional action to the finish page the cancel button is -; enabled. This disables it and leaves the finish button as the only choice. -Function preFinish - StrCpy $PageName "" - ${EndInstallLog} "${BrandFullName}" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "cancelenabled" "0" -FunctionEnd - -################################################################################ -# Initialization Functions - -Function .onInit - ; Remove the current exe directory from the search order. - ; This only effects LoadLibrary calls and not implicitly loaded DLLs. - System::Call 'kernel32::SetDllDirectoryW(w "")' - - StrCpy $PageName "" - StrCpy $LANGUAGE 0 - ${SetBrandNameVars} "$EXEDIR\core\distribution\setup.ini" - - ; Don't install on systems that don't support SSE2. The parameter value of - ; 10 is for PF_XMMI64_INSTRUCTIONS_AVAILABLE which will check whether the - ; SSE2 instruction set is available. Result returned in $R7. - System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" - - ; Windows NT 6.0 and lower are not supported on any architecture. - ${Unless} ${AtLeastWin7} - ${If} "$R7" == "0" - strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)" - ${Else} - strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_MSG)" - ${EndIf} - MessageBox MB_OKCANCEL|MB_ICONSTOP "$R7" IDCANCEL +2 - ExecShell "open" "${URLSystemRequirements}" - Quit - ${EndUnless} - - ; SSE2 support - ${If} "$R7" == "0" - MessageBox MB_OKCANCEL|MB_ICONSTOP "$(WARN_MIN_SUPPORTED_CPU_MSG)" IDCANCEL +2 - ExecShell "open" "${URLSystemRequirements}" - Quit - ${EndIf} - -!ifdef HAVE_64BIT_BUILD - ${Unless} ${RunningX64} - MessageBox MB_OKCANCEL|MB_ICONSTOP "$(WARN_MIN_SUPPORTED_OSVER_MSG)" IDCANCEL +2 - ExecShell "open" "${URLSystemRequirements}" - Quit - ${EndUnless} - SetRegView 64 -!endif - - ${InstallOnInitCommon} "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)" - -; The commands inside this ifndef are needed prior to NSIS 3.0a2 and can be -; removed after we require NSIS 3.0a2 or greater. -!ifndef NSIS_PACKEDVERSION - System::Call 'user32::SetProcessDPIAware()' -!endif - - !insertmacro InitInstallOptionsFile "options.ini" - !insertmacro InitInstallOptionsFile "shortcuts.ini" - !insertmacro InitInstallOptionsFile "summary.ini" - - WriteINIStr "$PLUGINSDIR\options.ini" "Settings" NumFields "5" - - WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Type "label" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Text "$(OPTIONS_SUMMARY)" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Left "0" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Right "-1" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Top "0" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Bottom "10" - - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Type "RadioButton" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Text "$(OPTION_STANDARD_RADIO)" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Left "0" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Right "-1" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Top "25" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Bottom "35" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" State "1" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Flags "GROUP" - - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Type "RadioButton" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Text "$(OPTION_CUSTOM_RADIO)" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Left "0" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Right "-1" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Top "55" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Bottom "65" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" State "0" - - WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Type "label" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Text "$(OPTION_STANDARD_DESC)" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Left "15" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Right "-1" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Top "37" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Bottom "57" - - WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Type "label" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Text "$(OPTION_CUSTOM_DESC)" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Left "15" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Right "-1" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Top "67" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Bottom "87" - - ; Setup the shortcuts.ini file for the Custom Shortcuts Page - ; Don't offer to install the quick launch shortcut on Windows 7 - ${If} ${AtLeastWin7} - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Settings" NumFields "3" - ${Else} - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Settings" NumFields "4" - ${EndIf} - - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Type "label" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Text "$(CREATE_ICONS_DESC)" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Left "0" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Right "-1" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Top "5" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Bottom "15" - - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Type "checkbox" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Text "$(ICONS_DESKTOP)" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Left "0" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Right "-1" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Top "20" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Bottom "30" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" State "1" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Flags "GROUP" - - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Type "checkbox" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Text "$(ICONS_STARTMENU)" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Left "0" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Right "-1" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Top "40" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Bottom "50" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" State "1" - - ; There must always be a core directory. - ${GetSize} "$EXEDIR\core\" "/S=0K" $R5 $R7 $R8 - SectionSetSize ${APP_IDX} $R5 - - ; Initialize $hHeaderBitmap to prevent redundant changing of the bitmap if - ; the user clicks the back button - StrCpy $hHeaderBitmap "" -FunctionEnd - -Function .onGUIEnd - ${OnEndCommon} -FunctionEnd diff --git a/webbrowser/installer/windows/nsis/shared.nsh b/webbrowser/installer/windows/nsis/shared.nsh deleted file mode 100644 index 385a411..0000000 --- a/webbrowser/installer/windows/nsis/shared.nsh +++ /dev/null @@ -1,1306 +0,0 @@ -# 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/. - -!macro PostUpdate - ; PostUpdate is called from both session 0 and from the user session - ; for service updates, make sure that we only register with the user session - ; Otherwise ApplicationID::Set can fail intermittently with a file in use error. - System::Call "kernel32::GetCurrentProcessId() i.r0" - System::Call "kernel32::ProcessIdToSessionId(i $0, *i ${NSIS_MAX_STRLEN} r9)" - - ; Determine if we're the protected UserChoice default or not. If so fix the - ; start menu tile. In case there are 2 PaleMoon installations, we only do - ; this if the application being updated is the default. - ReadRegStr $0 HKCU "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\http\UserChoice" "ProgId" - ${If} $0 == "PaleMoonURL" - ${AndIf} $9 != 0 ; We're not running in session 0 - ReadRegStr $0 HKCU "Software\Classes\PaleMoonURL\shell\open\command" "" - ${GetPathFromString} "$0" $0 - ${GetParent} "$0" $0 - ${If} ${FileExists} "$0" - ${GetLongPath} "$0" $0 - ${EndIf} - ${EndIf} - - ${CreateShortcutsLog} - - ; Remove registry entries for non-existent apps and for apps that point to our - ; install location in the Software\Mozilla key and uninstall registry entries - ; that point to our install location for both HKCU and HKLM. - SetShellVarContext current ; Set SHCTX to the current user (e.g. HKCU) - ${RegCleanMain} "Software\Mozilla" - ${RegCleanUninstall} - ${UpdateProtocolHandlers} - - ; setup the application model id registration value - ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs" - - ; Win7 taskbar and start menu link maintenance - Call FixShortcutAppModelIDs - - ClearErrors - WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test" - ${If} ${Errors} - StrCpy $TmpVal "HKCU" ; used primarily for logging - ${Else} - SetShellVarContext all ; Set SHCTX to all users (e.g. HKLM) - DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" - StrCpy $TmpVal "HKLM" ; used primarily for logging - ${RegCleanMain} "Software\Mozilla" - ${RegCleanUninstall} - ${UpdateProtocolHandlers} - ${FixShellIconHandler} "HKLM" - ${SetAppLSPCategories} ${LSP_CATEGORIES} - - ; Win7 taskbar and start menu link maintenance - Call FixShortcutAppModelIDs - - ; Add the Firewall entries after an update - Call AddFirewallEntries - - ; Only update the Clients\StartMenuInternet registry key values in HKLM if - ; they don't exist or this installation is the same as the one set in those - ; keys. - ${StrFilter} "${FileMainEXE}" "+" "" "" $1 - ReadRegStr $0 HKLM "Software\Clients\StartMenuInternet\$1\DefaultIcon" "" - ${GetPathFromString} "$0" $0 - ${GetParent} "$0" $0 - ${If} ${FileExists} "$0" - ${GetLongPath} "$0" $0 - ${EndIf} - ${If} "$0" == "$INSTDIR" - ${SetStartMenuInternet} "HKLM" - ${EndIf} - - ; Only update the Clients\StartMenuInternet registry key values in HKCU if - ; they don't exist or this installation is the same as the one set in those - ; keys. This is only done in Windows 8 to avoid a UAC prompt. - ${If} ${AtLeastWin8} - ReadRegStr $0 HKCU "Software\Clients\StartMenuInternet\$1\DefaultIcon" "" - ${GetPathFromString} "$0" $0 - ${GetParent} "$0" $0 - ${If} ${FileExists} "$0" - ${GetLongPath} "$0" $0 - ${EndIf} - ${If} "$0" == "$INSTDIR" - ${SetStartMenuInternet} "HKCU" - ${EndIf} - ${EndIf} - - ReadRegStr $0 HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" - ${If} "$0" != "${GREVersion}" - WriteRegStr HKLM "Software\mozilla.org\Mozilla" "CurrentVersion" "${GREVersion}" - ${EndIf} - ${EndIf} - - ; Migrate the application's Start Menu directory to a single shortcut in the - ; root of the Start Menu Programs directory. - ${MigrateStartMenuShortcut} - - ; Update lastwritetime of the Start Menu shortcut to clear the tile cache. - ${If} ${AtLeastWin8} - ${AndIf} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk" - FileOpen $0 "$SMPROGRAMS\${BrandFullName}.lnk" a - FileClose $0 - ${EndIf} - - ; Adds a pinned Task Bar shortcut (see MigrateTaskBarShortcut for details). - ${MigrateTaskBarShortcut} - - ${RemoveDeprecatedKeys} - - ${SetAppKeys} - ${FixClassKeys} - ${SetUninstallKeys} - - ; Remove files that may be left behind by the application in the - ; VirtualStore directory. - ${CleanVirtualStore} - - ${RemoveDeprecatedFiles} - - ; Fix the distribution.ini file if applicable - ${FixDistributionsINI} - - RmDir /r /REBOOTOK "$INSTDIR\${TO_BE_DELETED}" -!macroend -!define PostUpdate "!insertmacro PostUpdate" - -!macro SetAsDefaultAppGlobal - ${RemoveDeprecatedKeys} ; Does not use SHCTX - - SetShellVarContext all ; Set SHCTX to all users (e.g. HKLM) - ${SetHandlers} ; Uses SHCTX - ${SetStartMenuInternet} "HKLM" - ${FixShellIconHandler} "HKLM" - ${ShowShortcuts} - ${StrFilter} "${FileMainEXE}" "+" "" "" $R9 - WriteRegStr HKLM "Software\Clients\StartMenuInternet" "" "$R9" -!macroend -!define SetAsDefaultAppGlobal "!insertmacro SetAsDefaultAppGlobal" - -; Removes shortcuts for this installation. This should also remove the -; application from Open With for the file types the application handles -; (bug 370480). -!macro HideShortcuts - ${StrFilter} "${FileMainEXE}" "+" "" "" $0 - StrCpy $R1 "Software\Clients\StartMenuInternet\$0\InstallInfo" - WriteRegDWORD HKLM "$R1" "IconsVisible" 0 - ${If} ${AtLeastWin8} - WriteRegDWORD HKCU "$R1" "IconsVisible" 0 - ${EndIf} - - SetShellVarContext all ; Set $DESKTOP to All Users - ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk" - SetShellVarContext current ; Set $DESKTOP to the current user's desktop - ${EndUnless} - - ${If} ${FileExists} "$DESKTOP\${BrandFullName}.lnk" - ShellLink::GetShortCutArgs "$DESKTOP\${BrandFullName}.lnk" - Pop $0 - ${If} "$0" == "" - ShellLink::GetShortCutTarget "$DESKTOP\${BrandFullName}.lnk" - Pop $0 - ${GetLongPath} "$0" $0 - ${If} "$0" == "$INSTDIR\${FileMainEXE}" - Delete "$DESKTOP\${BrandFullName}.lnk" - ${EndIf} - ${EndIf} - ${EndIf} - - SetShellVarContext all ; Set $SMPROGRAMS to All Users - ${Unless} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk" - SetShellVarContext current ; Set $SMPROGRAMS to the current user's Start - ; Menu Programs directory - ${EndUnless} - - ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk" - ShellLink::GetShortCutArgs "$SMPROGRAMS\${BrandFullName}.lnk" - Pop $0 - ${If} "$0" == "" - ShellLink::GetShortCutTarget "$SMPROGRAMS\${BrandFullName}.lnk" - Pop $0 - ${GetLongPath} "$0" $0 - ${If} "$0" == "$INSTDIR\${FileMainEXE}" - Delete "$SMPROGRAMS\${BrandFullName}.lnk" - ${EndIf} - ${EndIf} - ${EndIf} - - ${If} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk" - ShellLink::GetShortCutArgs "$QUICKLAUNCH\${BrandFullName}.lnk" - Pop $0 - ${If} "$0" == "" - ShellLink::GetShortCutTarget "$QUICKLAUNCH\${BrandFullName}.lnk" - Pop $0 - ${GetLongPath} "$0" $0 - ${If} "$0" == "$INSTDIR\${FileMainEXE}" - Delete "$QUICKLAUNCH\${BrandFullName}.lnk" - ${EndIf} - ${EndIf} - ${EndIf} -!macroend -!define HideShortcuts "!insertmacro HideShortcuts" - -; Adds shortcuts for this installation. This should also add the application -; to Open With for the file types the application handles (bug 370480). -!macro ShowShortcuts - ${StrFilter} "${FileMainEXE}" "+" "" "" $0 - StrCpy $R1 "Software\Clients\StartMenuInternet\$0\InstallInfo" - WriteRegDWORD HKLM "$R1" "IconsVisible" 1 - ${If} ${AtLeastWin8} - WriteRegDWORD HKCU "$R1" "IconsVisible" 1 - ${EndIf} - - SetShellVarContext all ; Set $DESKTOP to All Users - ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk" - CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" - ${If} ${FileExists} "$DESKTOP\${BrandFullName}.lnk" - ShellLink::SetShortCutWorkingDirectory "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR" - ${If} ${AtLeastWin7} - ${AndIf} "$AppUserModelID" != "" - ApplicationID::Set "$DESKTOP\${BrandFullName}.lnk" "$AppUserModelID" "true" - ${EndIf} - ${Else} - SetShellVarContext current ; Set $DESKTOP to the current user's desktop - ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk" - CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" - ${If} ${FileExists} "$DESKTOP\${BrandFullName}.lnk" - ShellLink::SetShortCutWorkingDirectory "$DESKTOP\${BrandFullName}.lnk" \ - "$INSTDIR" - ${If} ${AtLeastWin7} - ${AndIf} "$AppUserModelID" != "" - ApplicationID::Set "$DESKTOP\${BrandFullName}.lnk" "$AppUserModelID" "true" - ${EndIf} - ${EndIf} - ${EndUnless} - ${EndIf} - ${EndUnless} - - SetShellVarContext all ; Set $SMPROGRAMS to All Users - ${Unless} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk" - CreateShortCut "$SMPROGRAMS\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" - ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk" - ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandFullName}.lnk" \ - "$INSTDIR" - ${If} ${AtLeastWin7} - ${AndIf} "$AppUserModelID" != "" - ApplicationID::Set "$SMPROGRAMS\${BrandFullName}.lnk" "$AppUserModelID" "true" - ${EndIf} - ${Else} - SetShellVarContext current ; Set $SMPROGRAMS to the current user's Start - ; Menu Programs directory - ${Unless} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk" - CreateShortCut "$SMPROGRAMS\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" - ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk" - ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandFullName}.lnk" \ - "$INSTDIR" - ${If} ${AtLeastWin7} - ${AndIf} "$AppUserModelID" != "" - ApplicationID::Set "$SMPROGRAMS\${BrandFullName}.lnk" "$AppUserModelID" "true" - ${EndIf} - ${EndIf} - ${EndUnless} - ${EndIf} - ${EndUnless} - - ; Windows 7 doesn't use the QuickLaunch directory - ${Unless} ${AtLeastWin7} - ${AndUnless} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk" - CreateShortCut "$QUICKLAUNCH\${BrandFullName}.lnk" \ - "$INSTDIR\${FileMainEXE}" - ${If} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk" - ShellLink::SetShortCutWorkingDirectory "$QUICKLAUNCH\${BrandFullName}.lnk" \ - "$INSTDIR" - ${EndIf} - ${EndUnless} -!macroend -!define ShowShortcuts "!insertmacro ShowShortcuts" - -!macro AddAssociationIfNoneExist FILE_TYPE - ClearErrors - EnumRegKey $7 HKCR "${FILE_TYPE}" 0 - ${If} ${Errors} - WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}" "" "PaleMoonHTML" - ${EndIf} - WriteRegStr SHCTX "SOFTWARE\Classes\${FILE_TYPE}\OpenWithProgids" "PaleMoonHTML" "" -!macroend -!define AddAssociationIfNoneExist "!insertmacro AddAssociationIfNoneExist" - -; Adds the protocol and file handler registry entries for making PaleMoon the -; default handler (uses SHCTX). -!macro SetHandlers - ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8 - - StrCpy $0 "SOFTWARE\Classes" - StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" - - ; Associate the file handlers with PaleMoonHTML - ReadRegStr $6 SHCTX "$0\.htm" "" - ${If} "$6" != "PaleMoonHTML" - WriteRegStr SHCTX "$0\.htm" "" "PaleMoonHTML" - ${EndIf} - - ReadRegStr $6 SHCTX "$0\.html" "" - ${If} "$6" != "PaleMoonHTML" - WriteRegStr SHCTX "$0\.html" "" "PaleMoonHTML" - ${EndIf} - - ReadRegStr $6 SHCTX "$0\.shtml" "" - ${If} "$6" != "PaleMoonHTML" - WriteRegStr SHCTX "$0\.shtml" "" "PaleMoonHTML" - ${EndIf} - - ReadRegStr $6 SHCTX "$0\.xht" "" - ${If} "$6" != "PaleMoonHTML" - WriteRegStr SHCTX "$0\.xht" "" "PaleMoonHTML" - ${EndIf} - - ReadRegStr $6 SHCTX "$0\.xhtml" "" - ${If} "$6" != "PaleMoonHTML" - WriteRegStr SHCTX "$0\.xhtml" "" "PaleMoonHTML" - ${EndIf} - - ${AddAssociationIfNoneExist} ".oga" - ${AddAssociationIfNoneExist} ".ogg" - ${AddAssociationIfNoneExist} ".ogv" - ${AddAssociationIfNoneExist} ".webm" - - ; An empty string is used for the 5th param because PaleMoonHTML is not a - ; protocol handler - ${AddDisabledDDEHandlerValues} "PaleMoonHTML" "$2" "$8,1" \ - "${AppRegName} HTML Document" "" - - ${AddDisabledDDEHandlerValues} "PaleMoonURL" "$2" "$8,1" "${AppRegName} URL" \ - "true" - ; An empty string is used for the 4th & 5th params because the following - ; protocol handlers already have a display name and the additional keys - ; required for a protocol handler. - ${AddDisabledDDEHandlerValues} "ftp" "$2" "$8,1" "" "" - ${AddDisabledDDEHandlerValues} "http" "$2" "$8,1" "" "" - ${AddDisabledDDEHandlerValues} "https" "$2" "$8,1" "" "" -!macroend -!define SetHandlers "!insertmacro SetHandlers" - -; Adds the HKLM\Software\Clients\StartMenuInternet\PALEMOON.EXE registry -; entries (does not use SHCTX). -; -; The values for StartMenuInternet are only valid under HKLM and there can only -; be one installation registerred under StartMenuInternet per application since -; the key name is derived from the main application executable. -; http://support.microsoft.com/kb/297878 -; -; In Windows 8 this changes slightly, you can store StartMenuInternet entries in -; HKCU. The icon in start menu for StartMenuInternet is deprecated as of Win7, -; but the subkeys are what's important. Control panel default programs looks -; for them only in HKLM pre win8. -; -; Note: we might be able to get away with using the full path to the -; application executable for the key name in order to support multiple -; installations. -!macro SetStartMenuInternet RegKey - ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8 - ${GetLongPath} "$INSTDIR\uninstall\helper.exe" $7 - - ${StrFilter} "${FileMainEXE}" "+" "" "" $R9 - - StrCpy $0 "Software\Clients\StartMenuInternet\$R9" - - WriteRegStr ${RegKey} "$0" "" "${BrandFullName}" - - WriteRegStr ${RegKey} "$0\DefaultIcon" "" "$8,0" - - ; The Reinstall Command is defined at - ; http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/programmersguide/shell_adv/registeringapps.asp - WriteRegStr ${RegKey} "$0\InstallInfo" "HideIconsCommand" "$\"$7$\" /HideShortcuts" - WriteRegStr ${RegKey} "$0\InstallInfo" "ShowIconsCommand" "$\"$7$\" /ShowShortcuts" - WriteRegStr ${RegKey} "$0\InstallInfo" "ReinstallCommand" "$\"$7$\" /SetAsDefaultAppGlobal" - - ClearErrors - ReadRegDWORD $1 ${RegKey} "$0\InstallInfo" "IconsVisible" - ; If the IconsVisible name value pair doesn't exist add it otherwise the - ; application won't be displayed in Set Program Access and Defaults. - ${If} ${Errors} - ${If} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk" - WriteRegDWORD ${RegKey} "$0\InstallInfo" "IconsVisible" 1 - ${Else} - WriteRegDWORD ${RegKey} "$0\InstallInfo" "IconsVisible" 0 - ${EndIf} - ${EndIf} - - WriteRegStr ${RegKey} "$0\shell\open\command" "" "$\"$8$\"" - - WriteRegStr ${RegKey} "$0\shell\properties" "" "$(CONTEXT_OPTIONS)" - WriteRegStr ${RegKey} "$0\shell\properties\command" "" "$\"$8$\" -preferences" - - WriteRegStr ${RegKey} "$0\shell\safemode" "" "$(CONTEXT_SAFE_MODE)" - WriteRegStr ${RegKey} "$0\shell\safemode\command" "" "$\"$8$\" -safe-mode" - - ; Vista Capabilities registry keys - WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationDescription" "$(REG_APP_DESC)" - WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationIcon" "$8,0" - WriteRegStr ${RegKey} "$0\Capabilities" "ApplicationName" "${BrandShortName}" - - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".htm" "PaleMoonHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".html" "PaleMoonHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".shtml" "PaleMoonHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xht" "PaleMoonHTML" - WriteRegStr ${RegKey} "$0\Capabilities\FileAssociations" ".xhtml" "PaleMoonHTML" - - WriteRegStr ${RegKey} "$0\Capabilities\StartMenu" "StartMenuInternet" "$R9" - - WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "ftp" "PaleMoonURL" - WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "http" "PaleMoonURL" - WriteRegStr ${RegKey} "$0\Capabilities\URLAssociations" "https" "PaleMoonURL" - - ; Vista Registered Application - WriteRegStr ${RegKey} "Software\RegisteredApplications" "${AppRegName}" "$0\Capabilities" -!macroend -!define SetStartMenuInternet "!insertmacro SetStartMenuInternet" - -; The IconHandler reference for PaleMoonHTML can end up in an inconsistent state -; due to changes not being detected by the IconHandler for side by side -; installs (see bug 268512). The symptoms can be either an incorrect icon or no -; icon being displayed for files associated with PaleMoon (does not use SHCTX). -!macro FixShellIconHandler RegKey - ClearErrors - ReadRegStr $1 ${RegKey} "Software\Classes\PaleMoonHTML\ShellEx\IconHandler" "" - ${Unless} ${Errors} - ReadRegStr $1 ${RegKey} "Software\Classes\PaleMoonHTML\DefaultIcon" "" - ${GetLongPath} "$INSTDIR\${FileMainEXE}" $2 - ${If} "$1" != "$2,1" - WriteRegStr ${RegKey} "Software\Classes\PaleMoonHTML\DefaultIcon" "" "$2,1" - ${EndIf} - ${EndUnless} -!macroend -!define FixShellIconHandler "!insertmacro FixShellIconHandler" - -; Add Software\Mozilla\ registry entries (uses SHCTX). -!macro SetAppKeys - ; Check if this is an ESR release and if so add registry values so it is - ; possible to determine that this is an ESR install (bug 726781). - ClearErrors - ${WordFind} "${UpdateChannel}" "esr" "E#" $3 - ${If} ${Errors} - StrCpy $3 "" - ${Else} - StrCpy $3 " ESR" - ${EndIf} - - ${GetLongPath} "$INSTDIR" $8 - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Main" - ${WriteRegStr2} $TmpVal "$0" "Install Directory" "$8" 0 - ${WriteRegStr2} $TmpVal "$0" "PathToExe" "$8\${FileMainEXE}" 0 - - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})\Uninstall" - ${WriteRegStr2} $TmpVal "$0" "Description" "${BrandFullNameInternal} ${AppVersion}$3 (${ARCH} ${AB_CD})" 0 - - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion}$3 (${ARCH} ${AB_CD})" - ${WriteRegStr2} $TmpVal "$0" "" "${AppVersion}$3 (${ARCH} ${AB_CD})" 0 - ${If} "$3" == "" - DeleteRegValue SHCTX "$0" "ESR" - ${Else} - ${WriteRegDWORD2} $TmpVal "$0" "ESR" 1 0 - ${EndIf} - - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}$3\bin" - ${WriteRegStr2} $TmpVal "$0" "PathToExe" "$8\${FileMainEXE}" 0 - - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}$3\extensions" - ${WriteRegStr2} $TmpVal "$0" "Components" "$8\components" 0 - ${WriteRegStr2} $TmpVal "$0" "Plugins" "$8\plugins" 0 - - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}$3" - ${WriteRegStr2} $TmpVal "$0" "GeckoVer" "${GREVersion}" 0 - ${If} "$3" == "" - DeleteRegValue SHCTX "$0" "ESR" - ${Else} - ${WriteRegDWORD2} $TmpVal "$0" "ESR" 1 0 - ${EndIf} - - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}$3" - ${WriteRegStr2} $TmpVal "$0" "" "${GREVersion}" 0 - ${WriteRegStr2} $TmpVal "$0" "CurrentVersion" "${AppVersion}$3 (${ARCH} ${AB_CD})" 0 -!macroend -!define SetAppKeys "!insertmacro SetAppKeys" - -; Add uninstall registry entries. This macro tests for write access to determine -; if the uninstall keys should be added to HKLM or HKCU. -!macro SetUninstallKeys - ; Check if this is an ESR release and if so add registry values so it is - ; possible to determine that this is an ESR install (bug 726781). - ClearErrors - ${WordFind} "${UpdateChannel}" "esr" "E#" $3 - ${If} ${Errors} - StrCpy $3 "" - ${Else} - StrCpy $3 " ESR" - ${EndIf} - - StrCpy $0 "Software\Microsoft\Windows\CurrentVersion\Uninstall\${BrandFullNameInternal} ${AppVersion}$3 (${ARCH} ${AB_CD})" - - StrCpy $2 "" - ClearErrors - WriteRegStr HKLM "$0" "${BrandShortName}InstallerTest" "Write Test" - ${If} ${Errors} - ; If the uninstall keys already exist in HKLM don't create them in HKCU - ClearErrors - ReadRegStr $2 "HKLM" $0 "DisplayName" - ${If} $2 == "" - ; Otherwise we don't have any keys for this product in HKLM so proceeed - ; to create them in HKCU. Better handling for this will be done in: - ; Bug 711044 - Better handling for 2 uninstall icons - StrCpy $1 "HKCU" - SetShellVarContext current ; Set SHCTX to the current user (e.g. HKCU) - ${EndIf} - ClearErrors - ${Else} - StrCpy $1 "HKLM" - SetShellVarContext all ; Set SHCTX to all users (e.g. HKLM) - DeleteRegValue HKLM "$0" "${BrandShortName}InstallerTest" - ${EndIf} - - ${If} $2 == "" - ${GetLongPath} "$INSTDIR" $8 - - ; Write the uninstall registry keys - ${WriteRegStr2} $1 "$0" "Comments" "${BrandFullNameInternal} ${AppVersion}$3 (${ARCH} ${AB_CD})" 0 - ${WriteRegStr2} $1 "$0" "DisplayIcon" "$8\${FileMainEXE},0" 0 - ${WriteRegStr2} $1 "$0" "DisplayName" "${BrandFullNameInternal} ${AppVersion}$3 (${ARCH} ${AB_CD})" 0 - ${WriteRegStr2} $1 "$0" "DisplayVersion" "${AppVersion}" 0 - ${WriteRegStr2} $1 "$0" "HelpLink" "${HelpLink}" 0 - ${WriteRegStr2} $1 "$0" "InstallLocation" "$8" 0 - ${WriteRegStr2} $1 "$0" "Publisher" "Moonchild Productions" 0 - ${WriteRegStr2} $1 "$0" "UninstallString" "$\"$8\uninstall\helper.exe$\"" 0 - DeleteRegValue SHCTX "$0" "URLInfoAbout" -; Don't add URLUpdateInfo which is the release notes url except for the release -; and esr channels since nightly, aurora, and beta do not have release notes. -; Note: URLUpdateInfo is only defined in the official branding.nsi. -!ifdef URLUpdateInfo -!ifndef BETA_UPDATE_CHANNEL - ${WriteRegStr2} $1 "$0" "URLUpdateInfo" "${URLUpdateInfo}" 0 -!endif -!endif - ${WriteRegStr2} $1 "$0" "URLInfoAbout" "${URLInfoAbout}" 0 - ${WriteRegDWORD2} $1 "$0" "NoModify" 1 0 - ${WriteRegDWORD2} $1 "$0" "NoRepair" 1 0 - - ${GetSize} "$8" "/S=0K" $R2 $R3 $R4 - ${WriteRegDWORD2} $1 "$0" "EstimatedSize" $R2 0 - - ${If} "$TmpVal" == "HKLM" - SetShellVarContext all ; Set SHCTX to all users (e.g. HKLM) - ${Else} - SetShellVarContext current ; Set SHCTX to the current user (e.g. HKCU) - ${EndIf} - ${EndIf} -!macroend -!define SetUninstallKeys "!insertmacro SetUninstallKeys" - -; Due to a bug when associating some file handlers, only SHCTX was checked for -; some file types such as ".pdf". SHCTX is set to HKCU or HKLM depending on -; whether the installer has write access to HKLM. The bug would happen when -; HCKU was checked and didn't exist since programs aren't required to set the -; HKCU Software\Classes keys when associating handlers. The fix uses the merged -; view in HKCR to check for existance of an existing association. This macro -; cleans affected installations by removing the HKLM and HKCU value if it is set -; to PaleMoonHTML when there is a value for PersistentHandler or by removing the -; HKCU value when the HKLM value has a value other than an empty string. -!macro FixBadFileAssociation FILE_TYPE - ; Only delete the default value in case the key has values for OpenWithList, - ; OpenWithProgids, PersistentHandler, etc. - ReadRegStr $0 HKCU "Software\Classes\${FILE_TYPE}" "" - ReadRegStr $1 HKLM "Software\Classes\${FILE_TYPE}" "" - ReadRegStr $2 HKCR "${FILE_TYPE}\PersistentHandler" "" - ${If} "$2" != "" - ; Since there is a persistent handler remove PaleMoonHTML as the default - ; value from both HKCU and HKLM if it set to PaleMoonHTML. - ${If} "$0" == "PaleMoonHTML" - DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" "" - ${EndIf} - ${If} "$1" == "PaleMoonHTML" - DeleteRegValue HKLM "Software\Classes\${FILE_TYPE}" "" - ${EndIf} - ${ElseIf} "$0" == "PaleMoonHTML" - ; Since KHCU is set to PaleMoonHTML remove PaleMoonHTML as the default value - ; from HKCU if HKLM is set to a value other than an empty string. - ${If} "$1" != "" - DeleteRegValue HKCU "Software\Classes\${FILE_TYPE}" "" - ${EndIf} - ${EndIf} -!macroend -!define FixBadFileAssociation "!insertmacro FixBadFileAssociation" - -; Add app specific handler registry entries under Software\Classes if they -; don't exist (does not use SHCTX). -!macro FixClassKeys - StrCpy $1 "SOFTWARE\Classes" - - ; File handler keys and name value pairs that may need to be created during - ; install or upgrade. - ReadRegStr $0 HKCR ".shtml" "Content Type" - ${If} "$0" == "" - StrCpy $0 "$1\.shtml" - ${WriteRegStr2} $TmpVal "$1\.shtml" "" "shtmlfile" 0 - ${WriteRegStr2} $TmpVal "$1\.shtml" "Content Type" "text/html" 0 - ${WriteRegStr2} $TmpVal "$1\.shtml" "PerceivedType" "text" 0 - ${EndIf} - - ReadRegStr $0 HKCR ".xht" "Content Type" - ${If} "$0" == "" - ${WriteRegStr2} $TmpVal "$1\.xht" "" "xhtfile" 0 - ${WriteRegStr2} $TmpVal "$1\.xht" "Content Type" "application/xhtml+xml" 0 - ${EndIf} - - ReadRegStr $0 HKCR ".xhtml" "Content Type" - ${If} "$0" == "" - ${WriteRegStr2} $TmpVal "$1\.xhtml" "" "xhtmlfile" 0 - ${WriteRegStr2} $TmpVal "$1\.xhtml" "Content Type" "application/xhtml+xml" 0 - ${EndIf} - - ; Remove possibly badly associated file types - ${FixBadFileAssociation} ".oga" - ${FixBadFileAssociation} ".ogg" - ${FixBadFileAssociation} ".ogv" - ${FixBadFileAssociation} ".webm" -!macroend -!define FixClassKeys "!insertmacro FixClassKeys" - -; Updates protocol handlers if their registry open command value is for this -; install location (uses SHCTX). -!macro UpdateProtocolHandlers - ; Store the command to open the app with an url in a register for easy access. - ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8 - StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" - - ; Only set the file and protocol handlers if the existing one under HKCR is - ; for this install location. - - ${IsHandlerForInstallDir} "PaleMoonHTML" $R9 - ${If} "$R9" == "true" - ; An empty string is used for the 5th param because PaleMoonHTML is not a - ; protocol handler. - ${AddDisabledDDEHandlerValues} "PaleMoonHTML" "$2" "$8,1" \ - "${AppRegName} HTML Document" "" - ${EndIf} - - ${IsHandlerForInstallDir} "PaleMoonURL" $R9 - ${If} "$R9" == "true" - ${AddDisabledDDEHandlerValues} "PaleMoonURL" "$2" "$8,1" \ - "${AppRegName} URL" "true" - ${EndIf} - - ; An empty string is used for the 4th & 5th params because the following - ; protocol handlers already have a display name and the additional keys - ; required for a protocol handler. - ${IsHandlerForInstallDir} "ftp" $R9 - ${If} "$R9" == "true" - ${AddDisabledDDEHandlerValues} "ftp" "$2" "$8,1" "" "" - ${EndIf} - - ${IsHandlerForInstallDir} "http" $R9 - ${If} "$R9" == "true" - ${AddDisabledDDEHandlerValues} "http" "$2" "$8,1" "" "" - ${EndIf} - - ${IsHandlerForInstallDir} "https" $R9 - ${If} "$R9" == "true" - ${AddDisabledDDEHandlerValues} "https" "$2" "$8,1" "" "" - ${EndIf} -!macroend -!define UpdateProtocolHandlers "!insertmacro UpdateProtocolHandlers" - -; Removes various registry entries for reasons noted below (does not use SHCTX). -!macro RemoveDeprecatedKeys - StrCpy $0 "SOFTWARE\Classes" - ; Remove support for launching gopher urls from the shell during install or - ; update if the DefaultIcon is from palemoon.exe. - ${RegCleanAppHandler} "gopher" - - ; Remove support for launching chrome urls from the shell during install or - ; update if the DefaultIcon is from palemoon.exe (Bug 301073). - ${RegCleanAppHandler} "chrome" - - ; Remove protocol handler registry keys added by the MS shim - DeleteRegKey HKLM "Software\Classes\PaleMoon.URL" - DeleteRegKey HKCU "Software\Classes\PaleMoon.URL" - - ; Delete gopher from Capabilities\URLAssociations if it is present. - ${StrFilter} "${FileMainEXE}" "+" "" "" $R9 - StrCpy $0 "Software\Clients\StartMenuInternet\$R9" - ClearErrors - ReadRegStr $2 HKLM "$0\Capabilities\URLAssociations" "gopher" - ${Unless} ${Errors} - DeleteRegValue HKLM "$0\Capabilities\URLAssociations" "gopher" - ${EndUnless} - - ; Delete gopher from the user's UrlAssociations if it points to PaleMoonURL. - StrCpy $0 "Software\Microsoft\Windows\Shell\Associations\UrlAssociations\gopher" - ReadRegStr $2 HKCU "$0\UserChoice" "Progid" - ${If} "$2" == "PaleMoonURL" - DeleteRegKey HKCU "$0" - ${EndIf} -!macroend -!define RemoveDeprecatedKeys "!insertmacro RemoveDeprecatedKeys" - -; Removes various directories and files for reasons noted below. -!macro RemoveDeprecatedFiles - ; Remove talkback if it is present (remove after bug 386760 is fixed) - ${If} ${FileExists} "$INSTDIR\extensions\talkback@mozilla.org" - RmDir /r /REBOOTOK "$INSTDIR\extensions\talkback@mozilla.org" - ${EndIf} - - ; Remove the Java Console extension (bug 1165156) - ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0031-ABCDEFFEDCBA}" - RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0031-ABCDEFFEDCBA}" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0034-ABCDEFFEDCBA}" - RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0034-ABCDEFFEDCBA}" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0039-ABCDEFFEDCBA}" - RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0039-ABCDEFFEDCBA}" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0045-ABCDEFFEDCBA}" - RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0016-0000-0045-ABCDEFFEDCBA}" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0000-ABCDEFFEDCBA}" - RmDir /r /REBOOTOK "$INSTDIR\extensions\{CAFEEFAC-0017-0000-0000-ABCDEFFEDCBA}" - ${EndIf} -!macroend -!define RemoveDeprecatedFiles "!insertmacro RemoveDeprecatedFiles" - -; Converts specific partner distribution.ini from ansi to utf-8 (bug 882989) -!macro FixDistributionsINI - StrCpy $1 "$INSTDIR\distribution\distribution.ini" - StrCpy $2 "$INSTDIR\distribution\utf8fix" - StrCpy $0 "0" ; Default to not attempting to fix - - ; Check if the distribution.ini settings are for a partner build that needs - ; to have its distribution.ini converted from ansi to utf-8. - ${If} ${FileExists} "$1" - ${Unless} ${FileExists} "$2" - ReadINIStr $3 "$1" "Preferences" "app.distributor" - ${If} "$3" == "yahoo" - ReadINIStr $3 "$1" "Preferences" "app.distributor.channel" - ${If} "$3" == "de" - ${OrIf} "$3" == "es" - ${OrIf} "$3" == "e1" - ${OrIf} "$3" == "mx" - StrCpy $0 "1" - ${EndIf} - ${EndIf} - ; Create the utf8fix so this only runs once - FileOpen $3 "$2" w - FileClose $3 - ${EndUnless} - ${EndIf} - - ${If} "$0" == "1" - StrCpy $0 "0" - ClearErrors - ReadINIStr $3 "$1" "Global" "version" - ${Unless} ${Errors} - StrCpy $4 "$3" 2 - ${If} "$4" == "1." - StrCpy $4 "$3" "" 2 ; Everything after "1." - ${If} $4 < 23 - StrCpy $0 "1" - ${EndIf} - ${EndIf} - ${EndUnless} - ${EndIf} - - ${If} "$0" == "1" - ClearErrors - FileOpen $3 "$1" r - ${If} ${Errors} - FileClose $3 - ${Else} - StrCpy $2 "$INSTDIR\distribution\distribution.new" - ClearErrors - FileOpen $4 "$2" w - ${If} ${Errors} - FileClose $3 - FileClose $4 - ${Else} - StrCpy $0 "0" ; Default to not replacing the original distribution.ini - ${Do} - FileReadByte $3 $5 - ${If} $5 == "" - ${Break} - ${EndIf} - ${If} $5 == 233 ; ansi é - StrCpy $0 "1" - FileWriteByte $4 195 - FileWriteByte $4 169 - ${ElseIf} $5 == 241 ; ansi ñ - StrCpy $0 "1" - FileWriteByte $4 195 - FileWriteByte $4 177 - ${ElseIf} $5 == 252 ; ansi ü - StrCpy $0 "1" - FileWriteByte $4 195 - FileWriteByte $4 188 - ${ElseIf} $5 < 128 - FileWriteByte $4 $5 - ${EndIf} - ${Loop} - FileClose $3 - FileClose $4 - ${If} "$0" == "1" - ClearErrors - Rename "$1" "$1.bak" - ${Unless} ${Errors} - Rename "$2" "$1" - Delete "$1.bak" - ${EndUnless} - ${Else} - Delete "$2" - ${EndIf} - ${EndIf} - ${EndIf} - ${EndIf} -!macroend -!define FixDistributionsINI "!insertmacro FixDistributionsINI" - -; Adds a pinned shortcut to Task Bar on update for Windows 7 and above if this -; macro has never been called before and the application is default (see -; PinToTaskBar for more details). -; Since defaults handling is handled by Windows in Win8 and later, we always -; attempt to pin a taskbar on that OS. If Windows sets the defaults at -; installation time, then we don't get the opportunity to run this code at -; that time. -!macro MigrateTaskBarShortcut - ${GetShortcutsLogPath} $0 - ${If} ${FileExists} "$0" - ClearErrors - ReadINIStr $1 "$0" "TASKBAR" "Migrated" - ${If} ${Errors} - ClearErrors - WriteIniStr "$0" "TASKBAR" "Migrated" "true" - ${If} ${AtLeastWin7} - ; No need to check the default on Win8 and later - ${If} ${AtMostWin2008R2} - ; Check if the Pale Moon is the http handler for this user - SetShellVarContext current ; Set SHCTX to the current user - ${IsHandlerForInstallDir} "http" $R9 - ${If} $TmpVal == "HKLM" - SetShellVarContext all ; Set SHCTX to all users - ${EndIf} - ${EndIf} - ${If} "$R9" == "true" - ${OrIf} ${AtLeastWin8} - ${PinToTaskBar} - ${EndIf} - ${EndIf} - ${EndIf} - ${EndIf} -!macroend -!define MigrateTaskBarShortcut "!insertmacro MigrateTaskBarShortcut" - -; Adds a pinned Task Bar shortcut on Windows 7 if there isn't one for the main -; application executable already. Existing pinned shortcuts for the same -; application model ID must be removed first to prevent breaking the pinned -; item's lists but multiple installations with the same application model ID is -; an edgecase. If removing existing pinned shortcuts with the same application -; model ID removes a pinned pinned Start Menu shortcut this will also add a -; pinned Start Menu shortcut. -!macro PinToTaskBar - ${If} ${AtLeastWin7} - StrCpy $8 "false" ; Whether a shortcut had to be created - ${IsPinnedToTaskBar} "$INSTDIR\${FileMainEXE}" $R9 - ${If} "$R9" == "false" - ; Find an existing Start Menu shortcut or create one to use for pinning - ${GetShortcutsLogPath} $0 - ${If} ${FileExists} "$0" - ClearErrors - ReadINIStr $1 "$0" "STARTMENU" "Shortcut0" - ${Unless} ${Errors} - SetShellVarContext all ; Set SHCTX to all users - ${Unless} ${FileExists} "$SMPROGRAMS\$1" - SetShellVarContext current ; Set SHCTX to the current user - ${Unless} ${FileExists} "$SMPROGRAMS\$1" - StrCpy $8 "true" - CreateShortCut "$SMPROGRAMS\$1" "$INSTDIR\${FileMainEXE}" - ${If} ${FileExists} "$SMPROGRAMS\$1" - ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\$1" \ - "$INSTDIR" - ${If} "$AppUserModelID" != "" - ApplicationID::Set "$SMPROGRAMS\$1" "$AppUserModelID" "true" - ${EndIf} - ${EndIf} - ${EndUnless} - ${EndUnless} - - ${If} ${FileExists} "$SMPROGRAMS\$1" - ; Count of Start Menu pinned shortcuts before unpinning. - ${PinnedToStartMenuLnkCount} $R9 - - ; Having multiple shortcuts pointing to different installations with - ; the same AppUserModelID (e.g. side by side installations of the - ; same version) will make the TaskBar shortcut's lists into an bad - ; state where the lists are not shown. To prevent this first - ; uninstall the pinned item. - ApplicationID::UninstallPinnedItem "$SMPROGRAMS\$1" - - ; Count of Start Menu pinned shortcuts after unpinning. - ${PinnedToStartMenuLnkCount} $R8 - - ; If there is a change in the number of Start Menu pinned shortcuts - ; assume that unpinning unpinned a side by side installation from - ; the Start Menu and pin this installation to the Start Menu. - ${Unless} $R8 == $R9 - ; Pin the shortcut to the Start Menu. 5381 is the shell32.dll - ; resource id for the "Pin to Start Menu" string. - InvokeShellVerb::DoIt "$SMPROGRAMS" "$1" "5381" - ${EndUnless} - - ; Pin the shortcut to the TaskBar. 5386 is the shell32.dll resource - ; id for the "Pin to Taskbar" string. - InvokeShellVerb::DoIt "$SMPROGRAMS" "$1" "5386" - - ; Delete the shortcut if it was created - ${If} "$8" == "true" - Delete "$SMPROGRAMS\$1" - ${EndIf} - ${EndIf} - - ${If} $TmpVal == "HKCU" - SetShellVarContext current ; Set SHCTX to the current user - ${Else} - SetShellVarContext all ; Set SHCTX to all users - ${EndIf} - ${EndUnless} - ${EndIf} - ${EndIf} - ${EndIf} -!macroend -!define PinToTaskBar "!insertmacro PinToTaskBar" - -; Adds a shortcut to the root of the Start Menu Programs directory if the -; application's Start Menu Programs directory exists with a shortcut pointing to -; this installation directory. This will also remove the old shortcuts and the -; application's Start Menu Programs directory by calling the RemoveStartMenuDir -; macro. -!macro MigrateStartMenuShortcut - ${GetShortcutsLogPath} $0 - ${If} ${FileExists} "$0" - ClearErrors - ReadINIStr $5 "$0" "SMPROGRAMS" "RelativePathToDir" - ${Unless} ${Errors} - ClearErrors - ReadINIStr $1 "$0" "STARTMENU" "Shortcut0" - ${If} ${Errors} - ; The STARTMENU ini section doesn't exist. - ${LogStartMenuShortcut} "${BrandFullName}.lnk" - ${GetLongPath} "$SMPROGRAMS" $2 - ${GetLongPath} "$2\$5" $1 - ${If} "$1" != "" - ClearErrors - ReadINIStr $3 "$0" "SMPROGRAMS" "Shortcut0" - ${Unless} ${Errors} - ${If} ${FileExists} "$1\$3" - ShellLink::GetShortCutTarget "$1\$3" - Pop $4 - ${If} "$INSTDIR\${FileMainEXE}" == "$4" - CreateShortCut "$SMPROGRAMS\${BrandFullName}.lnk" \ - "$INSTDIR\${FileMainEXE}" - ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk" - ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandFullName}.lnk" \ - "$INSTDIR" - ${If} ${AtLeastWin7} - ${AndIf} "$AppUserModelID" != "" - ApplicationID::Set "$SMPROGRAMS\${BrandFullName}.lnk" \ - "$AppUserModelID" "true" - ${EndIf} - ${EndIf} - ${EndIf} - ${EndIf} - ${EndUnless} - ${EndIf} - ${EndIf} - ; Remove the application's Start Menu Programs directory, shortcuts, and - ; ini section. - ${RemoveStartMenuDir} - ${EndUnless} - ${EndIf} -!macroend -!define MigrateStartMenuShortcut "!insertmacro MigrateStartMenuShortcut" - -; Removes the application's start menu directory along with its shortcuts if -; they exist and if they exist creates a start menu shortcut in the root of the -; start menu directory (bug 598779). If the application's start menu directory -; is not empty after removing the shortucts the directory will not be removed -; since these additional items were not created by the installer (uses SHCTX). -!macro RemoveStartMenuDir - ${GetShortcutsLogPath} $0 - ${If} ${FileExists} "$0" - ; Delete Start Menu Programs shortcuts, directory if it is empty, and - ; parent directories if they are empty up to but not including the start - ; menu directory. - ${GetLongPath} "$SMPROGRAMS" $1 - ClearErrors - ReadINIStr $2 "$0" "SMPROGRAMS" "RelativePathToDir" - ${Unless} ${Errors} - ${GetLongPath} "$1\$2" $2 - ${If} "$2" != "" - ; Delete shortucts in the Start Menu Programs directory. - StrCpy $3 0 - ${Do} - ClearErrors - ReadINIStr $4 "$0" "SMPROGRAMS" "Shortcut$3" - ; Stop if there are no more entries - ${If} ${Errors} - ${ExitDo} - ${EndIf} - ${If} ${FileExists} "$2\$4" - ShellLink::GetShortCutTarget "$2\$4" - Pop $5 - ${If} "$INSTDIR\${FileMainEXE}" == "$5" - Delete "$2\$4" - ${EndIf} - ${EndIf} - IntOp $3 $3 + 1 ; Increment the counter - ${Loop} - ; Delete Start Menu Programs directory and parent directories - ${Do} - ; Stop if the current directory is the start menu directory - ${If} "$1" == "$2" - ${ExitDo} - ${EndIf} - ClearErrors - RmDir "$2" - ; Stop if removing the directory failed - ${If} ${Errors} - ${ExitDo} - ${EndIf} - ${GetParent} "$2" $2 - ${Loop} - ${EndIf} - DeleteINISec "$0" "SMPROGRAMS" - ${EndUnless} - ${EndIf} -!macroend -!define RemoveStartMenuDir "!insertmacro RemoveStartMenuDir" - -; Creates the shortcuts log ini file with the appropriate entries if it doesn't -; already exist. -!macro CreateShortcutsLog - ${GetShortcutsLogPath} $0 - ${Unless} ${FileExists} "$0" - ${LogStartMenuShortcut} "${BrandFullName}.lnk" - ${LogQuickLaunchShortcut} "${BrandFullName}.lnk" - ${LogDesktopShortcut} "${BrandFullName}.lnk" - ${EndUnless} -!macroend -!define CreateShortcutsLog "!insertmacro CreateShortcutsLog" - -; The files to check if they are in use during (un)install so the restart is -; required message is displayed. All files must be located in the $INSTDIR -; directory. -!macro PushFilesToCheck - ; The first string to be pushed onto the stack MUST be "end" to indicate - ; that there are no more files to check in $INSTDIR and the last string - ; should be ${FileMainEXE} so if it is in use the CheckForFilesInUse macro - ; returns after the first check. - Push "end" - Push "AccessibleMarshal.dll" - Push "IA2Marshal.dll" - Push "freebl3.dll" - Push "nssckbi.dll" - Push "nspr4.dll" - Push "nssdbm3.dll" - Push "mozsqlite3.dll" - Push "xpcom.dll" - Push "crashreporter.exe" - Push "minidump-analyzer.exe" - Push "updater.exe" - Push "${FileMainEXE}" -!macroend -!define PushFilesToCheck "!insertmacro PushFilesToCheck" - - -; Pushes the string "true" to the top of the stack if the Firewall service is -; running and pushes the string "false" to the top of the stack if it isn't. -!define SC_MANAGER_ALL_ACCESS 0x3F -!define SERVICE_QUERY_CONFIG 0x0001 -!define SERVICE_QUERY_STATUS 0x0004 -!define SERVICE_RUNNING 0x4 - -!macro IsFirewallSvcRunning - Push $R9 - Push $R8 - Push $R7 - Push $R6 - Push "false" - - System::Call 'advapi32::OpenSCManagerW(n, n, i ${SC_MANAGER_ALL_ACCESS}) i.R6' - ${If} $R6 != 0 - ; MpsSvc is the Firewall service on Windows Vista and above. - ; When opening the service with SERVICE_QUERY_CONFIG the return value will - ; be 0 if the service is not installed. - System::Call 'advapi32::OpenServiceW(i R6, t "MpsSvc", i ${SERVICE_QUERY_CONFIG}) i.R7' - ${If} $R7 != 0 - System::Call 'advapi32::CloseServiceHandle(i R7) n' - ; Open the service with SERVICE_QUERY_CONFIG so its status can be queried. - System::Call 'advapi32::OpenServiceW(i R6, t "MpsSvc", i ${SERVICE_QUERY_STATUS}) i.R7' - ${Else} - ; SharedAccess is the Firewall service on Windows XP. - ; When opening the service with SERVICE_QUERY_CONFIG the return value will - ; be 0 if the service is not installed. - System::Call 'advapi32::OpenServiceW(i R6, t "SharedAccess", i ${SERVICE_QUERY_CONFIG}) i.R7' - ${If} $R7 != 0 - System::Call 'advapi32::CloseServiceHandle(i R7) n' - ; Open the service with SERVICE_QUERY_CONFIG so its status can be - ; queried. - System::Call 'advapi32::OpenServiceW(i R6, t "SharedAccess", i ${SERVICE_QUERY_STATUS}) i.R7' - ${EndIf} - ${EndIf} - ; Did the calls to OpenServiceW succeed? - ${If} $R7 != 0 - System::Call '*(i,i,i,i,i,i,i) i.R9' - ; Query the current status of the service. - System::Call 'advapi32::QueryServiceStatus(i R7, i $R9) i' - System::Call '*$R9(i, i.R8)' - System::Free $R9 - System::Call 'advapi32::CloseServiceHandle(i R7) n' - IntFmt $R8 "0x%X" $R8 - ${If} $R8 == ${SERVICE_RUNNING} - Pop $R9 - Push "true" - ${EndIf} - ${EndIf} - System::Call 'advapi32::CloseServiceHandle(i R6) n' - ${EndIf} - - Exch 1 - Pop $R6 - Exch 1 - Pop $R7 - Exch 1 - Pop $R8 - Exch 1 - Pop $R9 -!macroend -!define IsFirewallSvcRunning "!insertmacro IsFirewallSvcRunning" -!define un.IsFirewallSvcRunning "!insertmacro IsFirewallSvcRunning" - -; Sets this installation as the default browser by setting the registry keys -; under HKEY_CURRENT_USER via registry calls and using the AppAssocReg NSIS -; plugin for Vista and above. This is a function instead of a macro so it is -; easily called from an elevated instance of the binary. Since this can be -; called by an elevated instance logging is not performed in this function. -Function SetAsDefaultAppUserHKCU - ; Only set as the user's StartMenuInternet browser if the StartMenuInternet - ; registry keys are for this install. - ${StrFilter} "${FileMainEXE}" "+" "" "" $R9 - ClearErrors - ReadRegStr $0 HKCU "Software\Clients\StartMenuInternet\$R9\DefaultIcon" "" - ${If} ${Errors} - ${OrIf} ${AtMostWin2008R2} - ClearErrors - ReadRegStr $0 HKLM "Software\Clients\StartMenuInternet\$R9\DefaultIcon" "" - ${EndIf} - ${Unless} ${Errors} - ${GetPathFromString} "$0" $0 - ${GetParent} "$0" $0 - ${If} ${FileExists} "$0" - ${GetLongPath} "$0" $0 - ${If} "$0" == "$INSTDIR" - WriteRegStr HKCU "Software\Clients\StartMenuInternet" "" "$R9" - ${EndIf} - ${EndIf} - ${EndUnless} - - SetShellVarContext current ; Set SHCTX to the current user (e.g. HKCU) - - ${If} ${AtLeastWin8} - ${SetStartMenuInternet} "HKCU" - ${FixShellIconHandler} "HKCU" - ${FixClassKeys} ; Does not use SHCTX - ${EndIf} - - ${SetHandlers} - - ${If} ${AtLeastWinVista} - ; Only register as the handler on Vista and above if the app registry name - ; exists under the RegisteredApplications registry key. The protocol and - ; file handlers set previously at the user level will associate this install - ; as the default browser. - ClearErrors - ReadRegStr $0 HKLM "Software\RegisteredApplications" "${AppRegName}" - ${Unless} ${Errors} - ; This is all protected by a user choice hash in Windows 8 so it won't - ; help, but it also won't hurt. - AppAssocReg::SetAppAsDefaultAll "${AppRegName}" - ${EndUnless} - ${EndIf} - ${RemoveDeprecatedKeys} - ${MigrateTaskBarShortcut} -FunctionEnd - -; Helper for updating the shortcut application model IDs. -Function FixShortcutAppModelIDs - ${If} ${AtLeastWin7} - ${AndIf} "$AppUserModelID" != "" - ${UpdateShortcutAppModelIDs} "$INSTDIR\${FileMainEXE}" "$AppUserModelID" $0 - ${EndIf} -FunctionEnd - -; Helper for adding Firewall exceptions during install and after app update. -Function AddFirewallEntries - ${IsFirewallSvcRunning} - Pop $0 - ${If} "$0" == "true" - liteFirewallW::AddRule "$INSTDIR\${FileMainEXE}" "${BrandShortName} ($INSTDIR)" - ${EndIf} -FunctionEnd - -; The !ifdef NO_LOG prevents warnings when compiling the installer.nsi due to -; this function only being used by the uninstaller.nsi. -!ifdef NO_LOG - -Function SetAsDefaultAppUser - ; On Win8, we want to avoid having a UAC prompt since we'll already have - ; another action for control panel default browser selection popping up - ; to the user. Win8 is the first OS where the start menu keys can be - ; added into HKCU. The call to SetAsDefaultAppUserHKCU will have already - ; set the HKCU keys for SetStartMenuInternet. - ${If} ${AtLeastWin8} - ; Check if this is running in an elevated process - ClearErrors - ${GetParameters} $0 - ${GetOptions} "$0" "/UAC:" $0 - ${If} ${Errors} ; Not elevated - Call SetAsDefaultAppUserHKCU - ${Else} ; Elevated - execute the function in the unelevated process - GetFunctionAddress $0 SetAsDefaultAppUserHKCU - UAC::ExecCodeSegment $0 - ${EndIf} - Return ; Nothing more needs to be done - ${EndIf} - - ; Before Win8, it is only possible to set this installation of the application - ; as the StartMenuInternet handler if it was added to the HKLM - ; StartMenuInternet registry keys. - ; http://support.microsoft.com/kb/297878 - - ; Check if this install location registered as the StartMenuInternet client - ${StrFilter} "${FileMainEXE}" "+" "" "" $R9 - ClearErrors - ReadRegStr $0 HKCU "Software\Clients\StartMenuInternet\$R9\DefaultIcon" "" - ${If} ${Errors} - ${OrIf} ${AtMostWin2008R2} - ClearErrors - ReadRegStr $0 HKLM "Software\Clients\StartMenuInternet\$R9\DefaultIcon" "" - ${EndIf} - - ${Unless} ${Errors} - ${GetPathFromString} "$0" $0 - ${GetParent} "$0" $0 - ${If} ${FileExists} "$0" - ${GetLongPath} "$0" $0 - ${If} "$0" == "$INSTDIR" - ; Check if this is running in an elevated process - ClearErrors - ${GetParameters} $0 - ${GetOptions} "$0" "/UAC:" $0 - ${If} ${Errors} ; Not elevated - Call SetAsDefaultAppUserHKCU - ${Else} ; Elevated - execute the function in the unelevated process - GetFunctionAddress $0 SetAsDefaultAppUserHKCU - UAC::ExecCodeSegment $0 - ${EndIf} - Return ; Nothing more needs to be done - ${EndIf} - ${EndIf} - ${EndUnless} - - ; The code after ElevateUAC won't be executed on Vista and above when the - ; user: - ; a) is a member of the administrators group (e.g. elevation is required) - ; b) is not a member of the administrators group and chooses to elevate - ${ElevateUAC} - - ${SetStartMenuInternet} "HKLM" - - SetShellVarContext all ; Set SHCTX to all users (e.g. HKLM) - - ${FixClassKeys} ; Does not use SHCTX - ${FixShellIconHandler} "HKLM" - ${RemoveDeprecatedKeys} ; Does not use SHCTX - - ClearErrors - ${GetParameters} $0 - ${GetOptions} "$0" "/UAC:" $0 - ${If} ${Errors} - Call SetAsDefaultAppUserHKCU - ${Else} - GetFunctionAddress $0 SetAsDefaultAppUserHKCU - UAC::ExecCodeSegment $0 - ${EndIf} -FunctionEnd -!define SetAsDefaultAppUser "Call SetAsDefaultAppUser" - -!endif ; NO_LOG diff --git a/webbrowser/installer/windows/nsis/uninstaller.nsi b/webbrowser/installer/windows/nsis/uninstaller.nsi deleted file mode 100644 index 44b7c06..0000000 --- a/webbrowser/installer/windows/nsis/uninstaller.nsi +++ /dev/null @@ -1,557 +0,0 @@ -# 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/. - -# Required Plugins: -# AppAssocReg http://nsis.sourceforge.net/Application_Association_Registration_plug-in -# CityHash http://dxr.mozilla.org/mozilla-central/source/other-licenses/nsis/Contrib/CityHash -# ShellLink http://nsis.sourceforge.net/ShellLink_plug-in -# UAC http://nsis.sourceforge.net/UAC_plug-in - -; Set verbosity to 3 (e.g. no script) to lessen the noise in the build logs -!verbose 3 - -; 7-Zip provides better compression than the lzma from NSIS so we add the files -; uncompressed and use 7-Zip to create a SFX archive of it -SetDatablockOptimize on -SetCompress off -CRCCheck on - -RequestExecutionLevel user - -; The commands inside this ifdef require NSIS 3.0a2 or greater so the ifdef can -; be removed after we require NSIS 3.0a2 or greater. -!ifdef NSIS_PACKEDVERSION - Unicode true - ManifestSupportedOS all - ManifestDPIAware true -!endif - -!addplugindir ./ - -; On Vista and above attempt to elevate Standard Users in addition to users that -; are a member of the Administrators group. -!define NONADMIN_ELEVATE - -; prevents compiling of the reg write logging. -!define NO_LOG - -!define MaintUninstallKey \ - "Software\Microsoft\Windows\CurrentVersion\Uninstall\MozillaMaintenanceService" - -Var TmpVal -Var MaintCertKey - -; Other included files may depend upon these includes! -; The following includes are provided by NSIS. -!include FileFunc.nsh -!include LogicLib.nsh -!include MUI.nsh -!include WinMessages.nsh -!include WinVer.nsh -!include WordFunc.nsh - -!insertmacro GetSize -!insertmacro StrFilter -!insertmacro WordReplace - -!insertmacro un.GetParent - -; The following includes are custom. -!include branding.nsi -!include defines.nsi -!include common.nsh -!include locales.nsi - -; This is named BrandShortName helper because we use this for software update -; post update cleanup. -VIAddVersionKey "FileDescription" "${BrandShortName} Helper" -VIAddVersionKey "OriginalFilename" "helper.exe" - -!insertmacro AddDisabledDDEHandlerValues -!insertmacro CleanVirtualStore -!insertmacro ElevateUAC -!insertmacro GetLongPath -!insertmacro GetPathFromString -!insertmacro InitHashAppModelId -!insertmacro IsHandlerForInstallDir -!insertmacro IsPinnedToTaskBar -!insertmacro LogDesktopShortcut -!insertmacro LogQuickLaunchShortcut -!insertmacro LogStartMenuShortcut -!insertmacro PinnedToStartMenuLnkCount -!insertmacro RegCleanAppHandler -!insertmacro RegCleanMain -!insertmacro RegCleanUninstall -!insertmacro SetAppLSPCategories -!insertmacro SetBrandNameVars -!insertmacro UpdateShortcutAppModelIDs -!insertmacro UnloadUAC -!insertmacro WriteRegDWORD2 -!insertmacro WriteRegStr2 - -!insertmacro un.ChangeMUIHeaderImage -!insertmacro un.CheckForFilesInUse -!insertmacro un.CleanUpdateDirectories -!insertmacro un.CleanVirtualStore -!insertmacro un.DeleteShortcuts -!insertmacro un.GetLongPath -!insertmacro un.GetSecondInstallPath -!insertmacro un.InitHashAppModelId -!insertmacro un.ManualCloseAppPrompt -!insertmacro un.RegCleanAppHandler -!insertmacro un.RegCleanFileHandler -!insertmacro un.RegCleanMain -!insertmacro un.RegCleanUninstall -!insertmacro un.RegCleanProtocolHandler -!insertmacro un.RemoveQuotesFromPath -!insertmacro un.RemovePrecompleteEntries -!insertmacro un.SetAppLSPCategories -!insertmacro un.SetBrandNameVars - -!include shared.nsh - -; Helper macros for ui callbacks. Insert these after shared.nsh -!insertmacro OnEndCommon -!insertmacro UninstallOnInitCommon - -!insertmacro un.OnEndCommon -!insertmacro un.UninstallUnOnInitCommon - -Name "${BrandFullName}" -OutFile "helper.exe" -!ifdef HAVE_64BIT_BUILD - InstallDir "$PROGRAMFILES64\${BrandFullName}\" -!else - InstallDir "$PROGRAMFILES32\${BrandFullName}\" -!endif -ShowUnInstDetails nevershow - -################################################################################ -# Modern User Interface - MUI - -!define MUI_ABORTWARNING -!define MUI_ICON setup.ico -!define MUI_UNICON setup.ico -!define MUI_WELCOMEPAGE_TITLE_3LINES -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_RIGHT -!define MUI_UNWELCOMEFINISHPAGE_BITMAP wizWatermark.bmp - -; Use a right to left header image when the language is right to left -!ifdef ${AB_CD}_rtl -!define MUI_HEADERIMAGE_BITMAP_RTL wizHeaderRTL.bmp -!else -!define MUI_HEADERIMAGE_BITMAP wizHeader.bmp -!endif - -/** - * Uninstall Pages - */ -; Welcome Page -!define MUI_PAGE_CUSTOMFUNCTION_PRE un.preWelcome -!define MUI_PAGE_CUSTOMFUNCTION_LEAVE un.leaveWelcome -!insertmacro MUI_UNPAGE_WELCOME - -; Custom Uninstall Confirm Page -UninstPage custom un.preConfirm - -; Remove Files Page -!insertmacro MUI_UNPAGE_INSTFILES - -; Finish Page - -!insertmacro MUI_UNPAGE_FINISH - -; Use the default dialog for IDD_VERIFY for a simple Banner -ChangeUI IDD_VERIFY "${NSISDIR}\Contrib\UIs\default.exe" - -################################################################################ -# Install Sections -; Empty section required for the installer to compile as an uninstaller -Section "" -SectionEnd - -################################################################################ -# Uninstall Sections - -Section "Uninstall" - SetDetailsPrint textonly - DetailPrint $(STATUS_UNINSTALL_MAIN) - SetDetailsPrint none - - ; Delete the app exe to prevent launching the app while we are uninstalling. - ClearErrors - ${DeleteFile} "$INSTDIR\${FileMainEXE}" - ${If} ${Errors} - ; If the user closed the application it can take several seconds for it to - ; shut down completely. If the application is being used by another user we - ; can still delete the files when the system is restarted. - Sleep 5000 - ${DeleteFile} "$INSTDIR\${FileMainEXE}" - ClearErrors - ${EndIf} - - ; setup the application model id registration value - ${un.InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs" - - SetShellVarContext current ; Set SHCTX to HKCU - ${un.RegCleanMain} "Software\Mozilla" - ${un.RegCleanUninstall} - ${un.DeleteShortcuts} - - ; Unregister resources associated with Win7 taskbar jump lists. - ${If} ${AtLeastWin7} - ${AndIf} "$AppUserModelID" != "" - ApplicationID::UninstallJumpLists "$AppUserModelID" - ${EndIf} - - ; Remove the updates directory for Vista and above - ${un.CleanUpdateDirectories} "Mozilla\PaleMoon" "Mozilla\updates" - - ; Remove any app model id's stored in the registry for this install path - DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR" - DeleteRegValue HKLM "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR" - - ClearErrors - WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test" - ${If} ${Errors} - StrCpy $TmpVal "HKCU" ; used primarily for logging - ${Else} - SetShellVarContext all ; Set SHCTX to HKLM - DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" - StrCpy $TmpVal "HKLM" ; used primarily for logging - ${un.RegCleanMain} "Software\Mozilla" - ${un.RegCleanUninstall} - ${un.DeleteShortcuts} - ${un.SetAppLSPCategories} - ${EndIf} - - ${un.RegCleanAppHandler} "PaleMoonURL" - ${un.RegCleanAppHandler} "PaleMoonHTML" - ${un.RegCleanProtocolHandler} "ftp" - ${un.RegCleanProtocolHandler} "http" - ${un.RegCleanProtocolHandler} "https" - - ClearErrors - ReadRegStr $R9 HKCR "PaleMoonHTML" "" - ; Don't clean up the file handlers if the PaleMoonHTML key still exists since - ; there should be a second installation that may be the default file handler - ${If} ${Errors} - ${un.RegCleanFileHandler} ".htm" "PaleMoonHTML" - ${un.RegCleanFileHandler} ".html" "PaleMoonHTML" - ${un.RegCleanFileHandler} ".shtml" "PaleMoonHTML" - ${un.RegCleanFileHandler} ".xht" "PaleMoonHTML" - ${un.RegCleanFileHandler} ".xhtml" "PaleMoonHTML" - ${un.RegCleanFileHandler} ".oga" "PaleMoonHTML" - ${un.RegCleanFileHandler} ".ogg" "PaleMoonHTML" - ${un.RegCleanFileHandler} ".ogv" "PaleMoonHTML" - ${un.RegCleanFileHandler} ".webm" "PaleMoonHTML" - ${EndIf} - - SetShellVarContext all ; Set SHCTX to HKLM - ${un.GetSecondInstallPath} "Software\Mozilla" $R9 - ${If} $R9 == "false" - SetShellVarContext current ; Set SHCTX to HKCU - ${un.GetSecondInstallPath} "Software\Mozilla" $R9 - ${EndIf} - - StrCpy $0 "Software\Clients\StartMenuInternet\${FileMainEXE}\shell\open\command" - ReadRegStr $R1 HKLM "$0" "" - ${un.RemoveQuotesFromPath} "$R1" $R1 - ${un.GetParent} "$R1" $R1 - - ; Only remove the StartMenuInternet key if it refers to this install location. - ; The StartMenuInternet registry key is independent of the default browser - ; settings. The XPInstall base un-installer always removes this key if it is - ; uninstalling the default browser and it will always replace the keys when - ; installing even if there is another install of PaleMoon that is set as the - ; default browser. Now the key is always updated on install but it is only - ; removed if it refers to this install location. - ${If} "$INSTDIR" == "$R1" - DeleteRegKey HKLM "Software\Clients\StartMenuInternet\${FileMainEXE}" - DeleteRegValue HKLM "Software\RegisteredApplications" "${AppRegName}" - ${EndIf} - - ReadRegStr $R1 HKCU "$0" "" - ${un.RemoveQuotesFromPath} "$R1" $R1 - ${un.GetParent} "$R1" $R1 - - ; Only remove the StartMenuInternet key if it refers to this install location. - ; The StartMenuInternet registry key is independent of the default browser - ; settings. The XPInstall base un-installer always removes this key if it is - ; uninstalling the default browser and it will always replace the keys when - ; installing even if there is another install of PaleMoon that is set as the - ; default browser. Now the key is always updated on install but it is only - ; removed if it refers to this install location. - ${If} "$INSTDIR" == "$R1" - DeleteRegKey HKCU "Software\Clients\StartMenuInternet\${FileMainEXE}" - DeleteRegValue HKCU "Software\RegisteredApplications" "${AppRegName}" - ${EndIf} - - StrCpy $0 "Software\Microsoft\Windows\CurrentVersion\App Paths\${FileMainEXE}" - ${If} $R9 == "false" - DeleteRegKey HKLM "$0" - DeleteRegKey HKCU "$0" - StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\${FileMainEXE}" - DeleteRegKey HKLM "$0" - DeleteRegKey HKCU "$0" - StrCpy $0 "Software\Microsoft\MediaPlayer\ShimInclusionList\plugin-container.exe" - DeleteRegKey HKLM "$0" - DeleteRegKey HKCU "$0" - StrCpy $0 "Software\Classes\MIME\Database\Content Type\application/x-xpinstall;app=PaleMoon" - DeleteRegKey HKLM "$0" - DeleteRegKey HKCU "$0" - ${Else} - ReadRegStr $R1 HKLM "$0" "" - ${un.RemoveQuotesFromPath} "$R1" $R1 - ${un.GetParent} "$R1" $R1 - ${If} "$INSTDIR" == "$R1" - WriteRegStr HKLM "$0" "" "$R9" - ${un.GetParent} "$R9" $R1 - WriteRegStr HKLM "$0" "Path" "$R1" - ${EndIf} - ${EndIf} - - ; Remove directories and files we always control before parsing the uninstall - ; log so empty directories can be removed. - ${If} ${FileExists} "$INSTDIR\updates" - RmDir /r /REBOOTOK "$INSTDIR\updates" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\updated" - RmDir /r /REBOOTOK "$INSTDIR\updated" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\defaults\shortcuts" - RmDir /r /REBOOTOK "$INSTDIR\defaults\shortcuts" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\distribution" - RmDir /r /REBOOTOK "$INSTDIR\distribution" - ${EndIf} - - ; Remove files that may be left behind by the application in the - ; VirtualStore directory. - ${un.CleanVirtualStore} - - ; Only unregister the dll if the registration points to this installation - ReadRegStr $R1 HKCR "CLSID\{0D68D6D0-D93D-4D08-A30D-F00DD1F45B24}\InProcServer32" "" - ${If} "$INSTDIR\AccessibleMarshal.dll" == "$R1" - ${UnregisterDLL} "$INSTDIR\AccessibleMarshal.dll" - ${EndIf} - - ${un.RemovePrecompleteEntries} "false" - - ${If} ${FileExists} "$INSTDIR\defaults\pref\channel-prefs.js" - Delete /REBOOTOK "$INSTDIR\defaults\pref\channel-prefs.js" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\defaults\pref" - RmDir /REBOOTOK "$INSTDIR\defaults\pref" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\defaults" - RmDir /REBOOTOK "$INSTDIR\defaults" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\uninstall" - ; Remove the uninstall directory that we control - RmDir /r /REBOOTOK "$INSTDIR\uninstall" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\install.log" - Delete /REBOOTOK "$INSTDIR\install.log" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\update-settings.ini" - Delete /REBOOTOK "$INSTDIR\update-settings.ini" - ${EndIf} - - ; Explicitly remove empty webapprt dir in case it exists (bug 757978). - RmDir "$INSTDIR\webapprt\components" - RmDir "$INSTDIR\webapprt" - - ; Remove the installation directory if it is empty - RmDir "$INSTDIR" - - ; If PaleMoon.exe was successfully deleted yet we still need to restart to - ; remove other files create a dummy PaleMoon.exe.moz-delete to prevent the - ; installer from allowing an install without restart when it is required - ; to complete an uninstall. - ${If} ${RebootFlag} - ; Admin is required to delete files on reboot so only add the moz-delete if - ; the user is an admin. After calling UAC::IsAdmin $0 will equal 1 if the - ; user is an admin. - UAC::IsAdmin - ${If} "$0" == "1" - ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}.moz-delete" - FileOpen $0 "$INSTDIR\${FileMainEXE}.moz-delete" w - FileWrite $0 "Will be deleted on restart" - Delete /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-delete" - FileClose $0 - ${EndUnless} - ${EndIf} - ${EndIf} - - ; Refresh desktop icons otherwise the start menu internet item won't be - ; removed and other ugly things will happen like recreation of the app's - ; clients registry key by the OS under some conditions. - System::Call "shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i 0, i 0, i 0)" - - ; Users who uninstall then reinstall expecting PaleMoon to use a clean profile - ; may be surprised during first-run. This key is checked during startup of PaleMoon and - ; subsequently deleted after checking. If the value is found during startup - ; the browser will offer to Reset PaleMoon. We use the UpdateChannel to match - ; uninstalls of PaleMoon-release with reinstalls of PaleMoon-release, for example. - WriteRegStr HKCU "Software\Mozilla\PaleMoon" "Uninstalled-${UpdateChannel}" "True" - - ${un.IsFirewallSvcRunning} - Pop $0 - ${If} "$0" == "true" - liteFirewallW::RemoveRule "$INSTDIR\${FileMainEXE}" "${BrandShortName} ($INSTDIR)" - ${EndIf} -SectionEnd - -################################################################################ -# Language - -!insertmacro MOZ_MUI_LANGUAGE 'baseLocale' -!verbose push -!verbose 3 -!include "overrideLocale.nsh" -!include "customLocale.nsh" -!verbose pop - -; Set this after the locale files to override it if it is in the locale. Using -; " " for BrandingText will hide the "Nullsoft Install System..." branding. -BrandingText " " - -################################################################################ -# Page pre, show, and leave functions - -Function un.preWelcome - ${If} ${FileExists} "$INSTDIR\distribution\modern-wizard.bmp" - Delete "$PLUGINSDIR\modern-wizard.bmp" - CopyFiles /SILENT "$INSTDIR\distribution\modern-wizard.bmp" "$PLUGINSDIR\modern-wizard.bmp" - ${EndIf} -FunctionEnd - -Function un.leaveWelcome - ${If} ${FileExists} "$INSTDIR\${FileMainEXE}" - Banner::show /NOUNLOAD "$(BANNER_CHECK_EXISTING)" - - ; If the message window has been found previously give the app an additional - ; five seconds to close. - ${If} "$TmpVal" == "FoundMessageWindow" - Sleep 5000 - ${EndIf} - - ${PushFilesToCheck} - - ${un.CheckForFilesInUse} $TmpVal - - Banner::destroy - - ; If there are files in use $TmpVal will be "true" - ${If} "$TmpVal" == "true" - ; If the message window is found the call to ManualCloseAppPrompt will - ; abort leaving the value of $TmpVal set to "FoundMessageWindow". - StrCpy $TmpVal "FoundMessageWindow" - ${un.ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_UNINSTALL)" - ; If the message window is not found set $TmpVal to "true" so the restart - ; required message is displayed. - StrCpy $TmpVal "true" - ${EndIf} - ${EndIf} -FunctionEnd - -Function un.preConfirm - ${If} ${FileExists} "$INSTDIR\distribution\modern-header.bmp" - ${AndIf} $hHeaderBitmap == "" - Delete "$PLUGINSDIR\modern-header.bmp" - CopyFiles /SILENT "$INSTDIR\distribution\modern-header.bmp" "$PLUGINSDIR\modern-header.bmp" - ${un.ChangeMUIHeaderImage} "$PLUGINSDIR\modern-header.bmp" - ${EndIf} - - ; Setup the unconfirm.ini file for the Custom Uninstall Confirm Page - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Settings" NumFields "3" - - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Type "label" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Text "$(UN_CONFIRM_UNINSTALLED_FROM)" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Left "0" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Right "-1" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Top "5" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Bottom "15" - - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Type "text" - ; The contents of this control must be set as follows in the pre function - ; ${MUI_INSTALLOPTIONS_READ} $1 "unconfirm.ini" "Field 2" "HWND" - ; SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" State "" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Left "0" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Right "-1" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Top "17" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Bottom "30" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" flags "READONLY" - - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Type "label" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Text "$(UN_CONFIRM_CLICK)" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Left "0" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Right "-1" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Top "130" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Bottom "150" - - ${If} "$TmpVal" == "true" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Type "label" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Text "$(SUMMARY_REBOOT_REQUIRED_UNINSTALL)" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Left "0" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Right "-1" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Top "35" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Bottom "45" - - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Settings" NumFields "4" - ${EndIf} - - !insertmacro MUI_HEADER_TEXT "$(UN_CONFIRM_PAGE_TITLE)" "$(UN_CONFIRM_PAGE_SUBTITLE)" - ; The Summary custom page has a textbox that will automatically receive - ; focus. This sets the focus to the Install button instead. - !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "unconfirm.ini" - GetDlgItem $0 $HWNDPARENT 1 - System::Call "user32::SetFocus(i r0, i 0x0007, i,i)i" - ${MUI_INSTALLOPTIONS_READ} $1 "unconfirm.ini" "Field 2" "HWND" - SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR" - !insertmacro MUI_INSTALLOPTIONS_SHOW -FunctionEnd - -################################################################################ -# Initialization Functions - -Function .onInit - ; Remove the current exe directory from the search order. - ; This only effects LoadLibrary calls and not implicitly loaded DLLs. - System::Call 'kernel32::SetDllDirectoryW(w "")' - - ; We need this set up for most of the helper.exe operations. - ${UninstallOnInitCommon} -FunctionEnd - -Function un.onInit - ; Remove the current exe directory from the search order. - ; This only effects LoadLibrary calls and not implicitly loaded DLLs. - System::Call 'kernel32::SetDllDirectoryW(w "")' - - StrCpy $LANGUAGE 0 - - ${un.UninstallUnOnInitCommon} - -; The commands inside this ifndef are needed prior to NSIS 3.0a2 and can be -; removed after we require NSIS 3.0a2 or greater. -!ifndef NSIS_PACKEDVERSION - ${If} ${AtLeastWinVista} - System::Call 'user32::SetProcessDPIAware()' - ${EndIf} -!endif - - !insertmacro InitInstallOptionsFile "unconfirm.ini" -FunctionEnd - -Function .onGUIEnd - ${OnEndCommon} -FunctionEnd - -Function un.onGUIEnd - ${un.OnEndCommon} -FunctionEnd diff --git a/webbrowser/installer/windows/nsis/updater_append.ini b/webbrowser/installer/windows/nsis/updater_append.ini deleted file mode 100644 index af7742c..0000000 --- a/webbrowser/installer/windows/nsis/updater_append.ini +++ /dev/null @@ -1,12 +0,0 @@ - -; IMPORTANT: This file should always start with a newline in case a locale -; provided updater.ini does not end with a newline. -; Application to launch after an update has been successfully applied. This -; must be in the same directory or a sub-directory of the directory of the -; application executable that initiated the software update. -[PostUpdateWin] -; ExeRelPath is the path to the PostUpdateWin executable relative to the -; application executable. -ExeRelPath=uninstall\helper.exe -; ExeArg is the argument to pass to the PostUpdateWin exe -ExeArg=/PostUpdate diff --git a/webbrowser/locales/Makefile.in b/webbrowser/locales/Makefile.in index 12df669..459272a 100644 --- a/webbrowser/locales/Makefile.in +++ b/webbrowser/locales/Makefile.in @@ -78,7 +78,7 @@ DIST_SUBDIRS = $(DIST_SUBDIR) include $(topsrcdir)/config/rules.mk -include $(topsrcdir)/toolkit/locales/l10n.mk +include $(MOZILLA_SRCDIR)/toolkit/locales/l10n.mk $(STAGEDIST): $(DIST)/branding @@ -120,14 +120,14 @@ searchplugins: $(addprefix $(FINAL_TARGET)/searchplugins/,$(SEARCHPLUGINS)) libs-%: $(NSINSTALL) -D $(DIST)/install - @$(MAKE) -C ../../../toolkit/locales libs-$* + @$(MAKE) -C $(DEPTH)/toolkit/locales libs-$* ifdef MOZ_SERVICES_SYNC - @$(MAKE) -C ../../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C $(DEPTH)/services/sync/locales AB_CD=$* XPI_NAME=locale-$* endif - @$(MAKE) -C ../../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* - @$(MAKE) -C ../../../intl/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C $(DEPTH)/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C $(DEPTH)/intl/locales AB_CD=$* XPI_NAME=locale-$* ifdef MOZ_DEVTOOLS - @$(MAKE) -C ../../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -C $(DEPTH)/devtools/client/locales AB_CD=$* XPI_NAME=locale-$* endif @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* @@ -218,5 +218,5 @@ l10n-check:: $(NSINSTALL) -D x-test/toolkit echo "#define MOZ_LANG_TITLE Just testing" > x-test/toolkit/defines.inc $(MAKE) installers-x-test L10NBASEDIR="$(PWD)" LOCALE_MERGEDIR="$(PWD)/mergedir" - $(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/unpack.py $(DIST)/l10n-stage/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) + $(PYTHON) $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/unpack.py $(DIST)/l10n-stage/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) cd $(DIST)/l10n-stage && test $$(cat $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/update.locale) = x-test diff --git a/webbrowser/moz.configure b/webbrowser/moz.configure index 7223625..bd82877 100644 --- a/webbrowser/moz.configure +++ b/webbrowser/moz.configure @@ -4,4 +4,4 @@ # 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/. -include('../../toolkit/moz.configure') +include('../platform/toolkit/moz.configure') diff --git a/webbrowser/themes/linux/browser.css b/webbrowser/themes/linux/browser.css index 4933b40..d7344a2 100644 --- a/webbrowser/themes/linux/browser.css +++ b/webbrowser/themes/linux/browser.css @@ -2162,8 +2162,8 @@ toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon { } %ifdef MOZ_DEVTOOLS -%include ../../../../devtools/client/themes/responsivedesign.inc.css -%include ../../../../devtools/client/themes/commandline.inc.css +%include ../../../platform/devtools/client/themes/responsivedesign.inc.css +%include ../../../platform/devtools/client/themes/commandline.inc.css %endif %include ../shared/plugin-doorhanger.inc.css diff --git a/webbrowser/themes/osx/browser.css b/webbrowser/themes/osx/browser.css index 20e453d..66f4fd0 100644 --- a/webbrowser/themes/osx/browser.css +++ b/webbrowser/themes/osx/browser.css @@ -2694,8 +2694,8 @@ toolbar[brighttext] #addonbar-closebutton { } %ifdef MOZ_DEVTOOLS -%include ../../../../devtools/client/themes/responsivedesign.inc.css -%include ../../../../devtools/client/themes/commandline.inc.css +%include ../../../platform/devtools/client/themes/responsivedesign.inc.css +%include ../../../platform/devtools/client/themes/commandline.inc.css %endif %include ../shared/plugin-doorhanger.inc.css diff --git a/webbrowser/themes/windows/Geolocation-16.png b/webbrowser/themes/windows/Geolocation-16.png deleted file mode 100644 index d710e73..0000000 Binary files a/webbrowser/themes/windows/Geolocation-16.png and /dev/null differ diff --git a/webbrowser/themes/windows/Geolocation-64.png b/webbrowser/themes/windows/Geolocation-64.png deleted file mode 100644 index 1bd46ba..0000000 Binary files a/webbrowser/themes/windows/Geolocation-64.png and /dev/null differ diff --git a/webbrowser/themes/windows/Info.png b/webbrowser/themes/windows/Info.png deleted file mode 100644 index f9c6ef2..0000000 Binary files a/webbrowser/themes/windows/Info.png and /dev/null differ diff --git a/webbrowser/themes/windows/KUI-background.png b/webbrowser/themes/windows/KUI-background.png deleted file mode 100644 index 104a49f..0000000 Binary files a/webbrowser/themes/windows/KUI-background.png and /dev/null differ diff --git a/webbrowser/themes/windows/KUI-close.png b/webbrowser/themes/windows/KUI-close.png deleted file mode 100644 index 08eeb81..0000000 Binary files a/webbrowser/themes/windows/KUI-close.png and /dev/null differ diff --git a/webbrowser/themes/windows/Makefile.in b/webbrowser/themes/windows/Makefile.in deleted file mode 100644 index 173ca68..0000000 --- a/webbrowser/themes/windows/Makefile.in +++ /dev/null @@ -1,7 +0,0 @@ -# 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/. - -ICON_FILES := icon.png -ICON_DEST = $(FINAL_TARGET)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -INSTALL_TARGETS += ICON diff --git a/webbrowser/themes/windows/Privacy-16.png b/webbrowser/themes/windows/Privacy-16.png deleted file mode 100644 index f801bfe..0000000 Binary files a/webbrowser/themes/windows/Privacy-16.png and /dev/null differ diff --git a/webbrowser/themes/windows/Privacy-32.png b/webbrowser/themes/windows/Privacy-32.png deleted file mode 100644 index 41ecd5d..0000000 Binary files a/webbrowser/themes/windows/Privacy-32.png and /dev/null differ diff --git a/webbrowser/themes/windows/Privacy-48.png b/webbrowser/themes/windows/Privacy-48.png deleted file mode 100644 index 372b823..0000000 Binary files a/webbrowser/themes/windows/Privacy-48.png and /dev/null differ diff --git a/webbrowser/themes/windows/Privacy-64.png b/webbrowser/themes/windows/Privacy-64.png deleted file mode 100644 index bd8d191..0000000 Binary files a/webbrowser/themes/windows/Privacy-64.png and /dev/null differ diff --git a/webbrowser/themes/windows/Push-16.png b/webbrowser/themes/windows/Push-16.png deleted file mode 100644 index d710e73..0000000 Binary files a/webbrowser/themes/windows/Push-16.png and /dev/null differ diff --git a/webbrowser/themes/windows/Push-64.png b/webbrowser/themes/windows/Push-64.png deleted file mode 100644 index 27fecb8..0000000 Binary files a/webbrowser/themes/windows/Push-64.png and /dev/null differ diff --git a/webbrowser/themes/windows/Secure24.png b/webbrowser/themes/windows/Secure24.png deleted file mode 100644 index 265d79b..0000000 Binary files a/webbrowser/themes/windows/Secure24.png and /dev/null differ diff --git a/webbrowser/themes/windows/Toolbar-glass.png b/webbrowser/themes/windows/Toolbar-glass.png deleted file mode 100644 index f8aac24..0000000 Binary files a/webbrowser/themes/windows/Toolbar-glass.png and /dev/null differ diff --git a/webbrowser/themes/windows/Toolbar-glass.svg b/webbrowser/themes/windows/Toolbar-glass.svg deleted file mode 100644 index 9feaac2..0000000 --- a/webbrowser/themes/windows/Toolbar-glass.svg +++ /dev/null @@ -1,3218 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webbrowser/themes/windows/Toolbar-inverted.png b/webbrowser/themes/windows/Toolbar-inverted.png deleted file mode 100644 index 54d83bf..0000000 Binary files a/webbrowser/themes/windows/Toolbar-inverted.png and /dev/null differ diff --git a/webbrowser/themes/windows/Toolbar-inverted.svg b/webbrowser/themes/windows/Toolbar-inverted.svg deleted file mode 100644 index ce59313..0000000 --- a/webbrowser/themes/windows/Toolbar-inverted.svg +++ /dev/null @@ -1,302 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webbrowser/themes/windows/Toolbar.png b/webbrowser/themes/windows/Toolbar.png deleted file mode 100644 index 8ec756e..0000000 Binary files a/webbrowser/themes/windows/Toolbar.png and /dev/null differ diff --git a/webbrowser/themes/windows/Toolbar.svg b/webbrowser/themes/windows/Toolbar.svg deleted file mode 100644 index 7a68c06..0000000 --- a/webbrowser/themes/windows/Toolbar.svg +++ /dev/null @@ -1,1356 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/webbrowser/themes/windows/aboutCertError.css b/webbrowser/themes/windows/aboutCertError.css deleted file mode 100644 index dbb3530..0000000 --- a/webbrowser/themes/windows/aboutCertError.css +++ /dev/null @@ -1,73 +0,0 @@ -/* 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/. */ - - -html { - background: #833; -} - -body { - margin: 0; - padding: 0 1em; - color: -moz-FieldText; - font: message-box; -} - -h1 { - margin: 0 0 .6em 0; - border-bottom: 1px solid ThreeDLightShadow; - font-size: 160%; -} - -h2 { - font-size: 130%; -} - -#errorPageContainer { - position: relative; - min-width: 13em; - max-width: 52em; - margin: 4em auto; - border: 2px solid #DD0D09; - border-radius: 10px; - box-shadow: 0px 0px 8px red; - padding: 3em; - -moz-padding-start: 30px; - background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field; - background-origin: content-box; -} - -#errorPageContainer:-moz-dir(rtl) { - background-position: right 0; -} - -#errorTitle { - -moz-margin-start: 80px; -} - -#errorLongContent { - -moz-margin-start: 80px; -} - -.expander > button { - -moz-padding-start: 20px; - -moz-margin-start: -20px; - background: url("chrome://browser/skin/aboutCertError_sectionExpanded.png") left center no-repeat; - border: none; - font: inherit; - color: inherit; - cursor: pointer; -} - -.expander > button:-moz-dir(rtl) { - background-position: right center; -} - -.expander[collapsed] > button { - background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed.png"); -} - -.expander[collapsed] > button:-moz-dir(rtl) { - background-image: url("chrome://browser/skin/aboutCertError_sectionCollapsed-rtl.png"); -} diff --git a/webbrowser/themes/windows/aboutCertError_sectionCollapsed-rtl.png b/webbrowser/themes/windows/aboutCertError_sectionCollapsed-rtl.png deleted file mode 100644 index 84ba18c..0000000 Binary files a/webbrowser/themes/windows/aboutCertError_sectionCollapsed-rtl.png and /dev/null differ diff --git a/webbrowser/themes/windows/aboutCertError_sectionCollapsed.png b/webbrowser/themes/windows/aboutCertError_sectionCollapsed.png deleted file mode 100644 index c9805f6..0000000 Binary files a/webbrowser/themes/windows/aboutCertError_sectionCollapsed.png and /dev/null differ diff --git a/webbrowser/themes/windows/aboutCertError_sectionExpanded.png b/webbrowser/themes/windows/aboutCertError_sectionExpanded.png deleted file mode 100644 index 128cef9..0000000 Binary files a/webbrowser/themes/windows/aboutCertError_sectionExpanded.png and /dev/null differ diff --git a/webbrowser/themes/windows/aboutPrivateBrowsing.css b/webbrowser/themes/windows/aboutPrivateBrowsing.css deleted file mode 100644 index cd6026b..0000000 --- a/webbrowser/themes/windows/aboutPrivateBrowsing.css +++ /dev/null @@ -1,47 +0,0 @@ -%if 0 -/* 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/. */ -%endif - -body.private > #errorPageContainer { - background-image: url("chrome://browser/skin/Privacy-48.png"); -} - -body.normal > #errorPageContainer { - background-image: url("chrome://global/skin/icons/question-48.png"); -} - -#clearRecentHistoryDesc { - margin-top: 2em; -} - -#clearRecentHistoryDesc > p { - font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */ -} - -#startPrivateBrowsingDesc > button { - -moz-margin-start: 0; -} - -#footerDesc > p { - font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */ -} - -#moreInfo { - font-size: 110%; /* to match the value set in chrome://global/skin/netError.css */ - -moz-padding-start: 25px; - background: url("chrome://global/skin/icons/information-16.png") no-repeat top left; -} - -#moreInfo:-moz-dir(rtl) { - background-position: top right; -} - -#moreInfoText { - margin-bottom: 0; -} - -#moreInfoLinkContainer { - margin-top: 0.5em; -} diff --git a/webbrowser/themes/windows/aboutSessionRestore-window-icon.png b/webbrowser/themes/windows/aboutSessionRestore-window-icon.png deleted file mode 100644 index 0077405..0000000 Binary files a/webbrowser/themes/windows/aboutSessionRestore-window-icon.png and /dev/null differ diff --git a/webbrowser/themes/windows/aboutSessionRestore.css b/webbrowser/themes/windows/aboutSessionRestore.css deleted file mode 100644 index 4fa4907..0000000 --- a/webbrowser/themes/windows/aboutSessionRestore.css +++ /dev/null @@ -1,73 +0,0 @@ -%if 0 -/* 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/. */ -%endif - -html { - background: #f8ffd0; - height: 100%; -} - -body { - height: 100%; - text-align: center; -} - -#errorPageContainer { - background-image: url("chrome://global/skin/icons/warning-large.png"); - display: -moz-box; - width: -moz-available; - max-width: 85%; - height: 75%; - max-height: 85%; - -moz-box-orient: vertical; - text-align: start; - border: 2px solid #efc; - box-shadow: 0px 0px 8px #aaa; -} - -#errorShortDesc > p { - margin-top: 0.4em; - margin-bottom: 0; -} - -#errorLongContent, #errorTrailerDesc { - display: -moz-box; - -moz-box-flex: 1; - -moz-box-orient: vertical; -} - -#tabList { - margin-top: 2.5em; - width: 100%; - min-height: 12em; -} - -treechildren::-moz-tree-image(icon), -treechildren::-moz-tree-image(noicon) { - padding-right: 2px; - margin: 0px 2px; - width: 16px; - height: 16px; -} - -treechildren::-moz-tree-image(noicon) { - list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); -} -treechildren::-moz-tree-image(container, noicon) { - list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png"); -} -treechildren::-moz-tree-image(checked) { - list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif"); -} -treechildren::-moz-tree-image(partial) { - list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif"); -} - -#buttons { - width: 100%; -} -#buttons > button { - margin-top: 2em; -} diff --git a/webbrowser/themes/windows/aboutSyncTabs.css b/webbrowser/themes/windows/aboutSyncTabs.css deleted file mode 100644 index 4f21a9d..0000000 --- a/webbrowser/themes/windows/aboutSyncTabs.css +++ /dev/null @@ -1,101 +0,0 @@ -/* 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/. */ - -#tabs-display, -#tabsList { - background-color: transparent; - -moz-appearance: none; - margin: 0; -} - -#tabsList { - width: 100%; -} - -#tabs-display { - background: #fff url(chrome://browser/skin/sync-bg.png) repeat-x center -80px; -} - -#headers { - background: url(chrome://browser/skin/sync-32.png) no-repeat; - margin-top: 4px; - width: 45em; - height: 32px; - -moz-margin-start: 2em; - -moz-margin-end: 2em; -} - -#tabsListHeading { - font-size: 140%; - font-weight: bold; - -moz-margin-start: 40px; -} - -richlistitem { - -moz-margin-end: 2em; -} - -richlistitem[selected="true"], -richlistitem:focus { - outline-style: none; -} - -richlistitem[type="tab"] { - min-height: 3em; - border: #999999 1px solid !important; - padding: 2px 5px; - margin-bottom: 4px; - -moz-margin-start: 4em; - border-radius: 6px; - background-color: menu; - width: 44em; - opacity: 0.9; - box-shadow: - inset rgba(255, 255, 255, 0.5) 0 1px 0px, - inset rgba(0, 0, 0, 0.1) 0 -2px 0px, - rgba(0, 0, 0, 0.1) 0px 1px 0px; -} - -richlistitem[type="tab"][selected="true"] { - background-color: -moz-MenuHover; -} - -richlistitem[type="client"] { - min-height: 2em; - color: #000000; - -moz-margin-start: 2em; - margin-top: 2px; - margin-bottom: 3px; - width: 42em; - border-radius: 6px; - background-color: transparent; - -moz-user-focus: ignore !important; -} -richlistitem.mobile[type="client"] { - list-style-image: url("chrome://browser/skin/sync-mobileIcon.png"); -} -richlistitem.desktop[type="client"] { - list-style-image: url("chrome://browser/skin/sync-desktopIcon.png"); -} - -.title, -.clientName { - color: #000000; - font-size: 1.1em; -} - -.title[selected="true"], -.url[selected="true"] { - color: inherit; -} - -.url { - color: -moz-nativehyperlinktext; - font-size: 0.95em; -} - -.tabIcon { - -moz-padding-start: 2px; - padding-top: 2px; -} diff --git a/webbrowser/themes/windows/actionicon-tab.png b/webbrowser/themes/windows/actionicon-tab.png deleted file mode 100644 index ced958e..0000000 Binary files a/webbrowser/themes/windows/actionicon-tab.png and /dev/null differ diff --git a/webbrowser/themes/windows/appmenu-dropmarker.png b/webbrowser/themes/windows/appmenu-dropmarker.png deleted file mode 100644 index 27deaff..0000000 Binary files a/webbrowser/themes/windows/appmenu-dropmarker.png and /dev/null differ diff --git a/webbrowser/themes/windows/appmenu-icons.png b/webbrowser/themes/windows/appmenu-icons.png deleted file mode 100644 index 78f3658..0000000 Binary files a/webbrowser/themes/windows/appmenu-icons.png and /dev/null differ diff --git a/webbrowser/themes/windows/autocomplete.css b/webbrowser/themes/windows/autocomplete.css deleted file mode 100644 index b3cab44..0000000 --- a/webbrowser/themes/windows/autocomplete.css +++ /dev/null @@ -1,238 +0,0 @@ -/* 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/. */ - -/* ===== autocomplete.css ================================================= - == Styles used by the autocomplete widget. - ======================================================================= */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -@namespace html url("http://www.w3.org/1999/xhtml"); - -/* ::::: autocomplete ::::: */ - -/* .padded is used by autocomplete widgets that don't have an icon. Gross. -dwh */ -textbox:not(.padded) { - cursor: default; - padding: 0; -} - -textbox[nomatch="true"][highlightnonmatches="true"] { - color: red; -} - -.private-autocomplete-textbox-container { - -moz-box-align: center; -} - -textbox:not(.padded) .textbox-input-box { - margin: 0 3px; -} - -.textbox-input-box { - -moz-box-align: center; -} - -/* ::::: autocomplete popups ::::: */ - -panel[type="private-autocomplete"], -panel[type="private-autocomplete-richlistbox"], -.private-autocomplete-history-popup { - -moz-appearance: none; - border-width: 1px; - -moz-border-top-colors: ThreeDShadow; - -moz-border-right-colors: ThreeDShadow; - -moz-border-bottom-colors: ThreeDShadow; - -moz-border-left-colors: ThreeDShadow; - padding: 0; - color: -moz-FieldText; - background-color: -moz-Field; -} - -.private-autocomplete-history-popup { - max-height: 180px; -} - -/* ::::: tree ::::: */ - -.private-autocomplete-tree { - -moz-appearance: none !important; - border: none !important; - background-color: transparent !important; -} - -.private-autocomplete-treecol { - -moz-appearance: none !important; - margin: 0 !important; - border: none !important; - padding: 0 !important; -} - -/* GTK calculates space for a sort arrow */ -.private-autocomplete-treecol > .treecol-sortdirection { - -moz-appearance: none !important; -} - -.private-autocomplete-treebody::-moz-tree-cell-text { - -moz-padding-start: 8px; -} - -treechildren.private-autocomplete-treebody::-moz-tree-row(selected) { - background-color: Highlight; -} - -treechildren.private-autocomplete-treebody::-moz-tree-cell-text(selected) { - color: HighlightText !important; -} - -.private-autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue) { - max-width: 16px; - height: 16px; -} - -/* ::::: richlistbox autocomplete ::::: */ - -.private-autocomplete-richlistbox { - -moz-appearance: none; - margin: 0; -} - -.private-autocomplete-richlistitem { - padding: 1px; -} - -.private-autocomplete-richlistitem[selected="true"] { - background-color: Highlight; - color: HighlightText; -} - -%ifdef XP_WIN -@media (-moz-os-version: windows-vista) and (-moz-windows-default-theme), - (-moz-os-version: windows-win7) and (-moz-windows-default-theme) { - .private-autocomplete-richlistitem[selected="true"] { - color: inherit; - background-color: transparent; - /* four gradients for the bevel highlights on each edge, one for blue background */ - background-image: - linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, transparent 3px), - linear-gradient(to right, rgba(255,255,255,0.5) 3px, transparent 3px), - linear-gradient(to left, rgba(255,255,255,0.5) 3px, transparent 3px), - linear-gradient(to top, rgba(255,255,255,0.4) 3px, transparent 3px), - linear-gradient(to bottom, rgba(163,196,247,0.3), rgba(122,180,246,0.3)); - background-clip: content-box; - border-radius: 6px; - outline: 1px solid rgb(124,163,206); - -moz-outline-radius: 3px; - outline-offset: -2px; - } -} -%endif - -.ac-title-box { - margin-top: 4px; -} - -.ac-url-box { - /* When setting a vertical margin here, half of that needs to be added - .ac-title-box's translateY for when .ac-url-box is hidden (see below). */ - margin: 1px 0 4px; -} - -.private-autocomplete-richlistitem[actiontype="keyword"] .ac-url-box, -.private-autocomplete-richlistitem[actiontype="searchengine"] .ac-url-box, -.private-autocomplete-richlistitem[actiontype="visiturl"] .ac-url-box, -.private-autocomplete-richlistitem[type~="autofill"] .ac-url-box { - visibility: hidden; -} - -.private-autocomplete-richlistitem[actiontype="keyword"] .ac-title-box, -.private-autocomplete-richlistitem[actiontype="searchengine"] .ac-title-box, -.private-autocomplete-richlistitem[actiontype="visiturl"] .ac-title-box, -.private-autocomplete-richlistitem[type~="autofill"] .ac-title-box { - /* Center the title by moving it down by half of .ac-url-box's height, - including vertical margins (if any). */ - transform: translateY(calc(.5em + 2px)); -} - -.ac-site-icon { - width: 16px; - height: 16px; - margin: 0 5px -2px; -} - -.ac-type-icon { - width: 16px; - height: 16px; - -moz-margin-start: 6px; - -moz-margin-end: 4px; - margin-bottom: -1px; -} - -.ac-url-box > .ac-site-icon, -.ac-url-box > .ac-type-icon { - /* Otherwise the spacer is big enough to stretch its container */ - height: auto; -} - -.ac-extra > .ac-result-type-tag { - margin: 0 4px; -} - -.ac-extra > .ac-comment { - padding-right: 4px; -} - -.ac-ellipsis-after { - margin: 0 !important; - padding: 0; - min-width: 1em; -} - -.ac-normal-text { - margin: 0 !important; - padding: 0; -} - -.ac-normal-text > html|span { - margin: 0 !important; - padding: 0; -} - -html|span.ac-emphasize-text { - box-shadow: inset 0 0 1px 1px rgba(208,208,208,0.5); - background-color: rgba(208,208,208,0.3); - border-radius: 2px; - text-shadow: 0 0 currentColor; -} - -@media (-moz-windows-default-theme) { - @media not all and (-moz-os-version: windows-xp) { - html|span.ac-emphasize-text { - box-shadow: inset 0 0 1px 1px rgba(0,0,0,0.1); - background-color: rgba(0,0,0,0.05); - } - } - - @media (-moz-os-version: windows-xp) { - .ac-url-text > html|span.ac-emphasize-text, - .ac-action-text > html|span.ac-emphasize-text { - box-shadow: inset 0 0 1px 1px rgba(202,214,201,0.3); - background-color: rgba(202,214,201,0.2); - } - } -} - -.ac-title, .ac-url { - overflow: hidden; -} - -/* ::::: textboxes inside toolbarpaletteitems ::::: */ - -toolbarpaletteitem > toolbaritem > textbox > hbox > hbox > html|*.textbox-input { - visibility: hidden; -} - -toolbarpaletteitem > toolbaritem > * > textbox > hbox > hbox > html|*.textbox-input { - visibility: hidden; -} - diff --git a/webbrowser/themes/windows/browser.css b/webbrowser/themes/windows/browser.css deleted file mode 100644 index 88c3087..0000000 --- a/webbrowser/themes/windows/browser.css +++ /dev/null @@ -1,3856 +0,0 @@ -/* 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/. */ - -@import url("chrome://global/skin/"); - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -@namespace html url("http://www.w3.org/1999/xhtml"); - -%include ../shared/browser.inc -%filter substitution -%define toolbarShadowColor rgba(10%,10%,10%,.4) -%define toolbarShadowOnTab linear-gradient(to top, rgba(10%,10%,10%,.4) 1px, transparent 1px) -%define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32); -%define navbarLargeIcons #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar -%define forwardTransitionLength 150ms -%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button"],#nav-bar:not([currentset])) > #unified-back-forward-button -%define conditionalForwardWithUrlbar2 window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button"]:not([currentset*="unified-back-forward-button,urlbar-container"]),#nav-bar:not([currentset])) > #unified-back-forward-button -%define conditionalForwardWithUrlbarWidth 27 -%define glassActiveBorderColor rgb(37, 44, 51) -%define glassInactiveBorderColor rgb(102, 102, 102) - -%ifdef MOZ_OFFICIAL_BRANDING -%define appMenuButtonBorderColor rgba(255,255,255,.5) rgba(6,42,83,.9) -%else -%if MOZ_UPDATE_CHANNEL == aurora -%define appMenuButtonBorderColor hsla(0,0%,100%,.5) hsla(214,89%,21%,.9) -%else -%define appMenuButtonBorderColor hsla(0,0%,100%,.5) hsla(210,59%,13%,.9) -%endif -%endif - -:root { - --toolbox-after-color: ThreeDShadow; - - --toolbar-custom-color: hsl(210,75%,92%); - --toolbar-highlight-top: rgba(255,255,255,.5); - --toolbar-highlight-bottom: transparent; - - --toolbarbutton-background-color: hsla(210,32%,93%,.3); - --toolbarbutton-border-radius: 2.5px; - --toolbarbutton-border-color: hsla(210,54%,20%,.2); - - --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png"); - --toolbarbutton-glass-image: url("chrome://browser/skin/Toolbar-glass.png"); - --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.png"); - - --tab-background: linear-gradient(transparent, hsla(0,0%,45%,.1) 1px, hsla(0,0%,32%,.2) 80%, hsla(0,0%,0%,.2)); - --tab-background-hover: linear-gradient(hsla(0,0%,100%,.3) 1px, hsla(0,0%,75%,.2) 80%, hsla(0,0%,60%,.2)); - --tab-border-radius: 6px; - --tab-box-shadow: inset 0.5px 1px 1px var(--tab-selected-highlight); - --tab-selected-highlight: rgba(255,255,255,.7); - - --window-text-color: currentColor; -} - -/* Use SVG for HiDPI 133%+ */ -@media (min-resolution: 1.33dppx) { - :root { - --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg"); - --toolbarbutton-glass-image: url("chrome://browser/skin/Toolbar-glass.svg"); - --toolbarbutton-inverted-image: url("chrome://browser/skin/Toolbar-inverted.svg"); - } -} - -:root:-moz-lwtheme-brighttext { - --toolbar-highlight-top: rgba(32,32,32,.8); - --toolbar-highlight-bottom: rgba(32,32,32,0); -} - -:root:-moz-lwtheme-darktext { - --toolbar-highlight-top: rgba(255,255,255,.8); - - --tab-selected-highlight: rgba(255,255,255,.6); -} - -#menubar-items { - -moz-box-orient: vertical; /* for flex hack */ -} - -#main-menubar { - -moz-box-flex: 1; /* make menu items expand to fill toolbar height */ -} - -#navigator-toolbox { - -moz-appearance: none; - background-color: transparent; - border-top: none; -} - -#navigator-toolbox::after { - content: ""; - display: -moz-box; - -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */ - height: 1px; - background-color: var(--toolbox-after-color); -} -#navigator-toolbox[tabsontop=false]::after, -#main-window[disablechrome] #navigator-toolbox::after { - visibility: collapse; -} - -#navigator-toolbox > toolbar:not(:-moz-lwtheme) { - -moz-appearance: none; - border-style: none; - background-color: -moz-Dialog; -} - -@media not all and (-moz-windows-compositor) { - #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) { - background: linear-gradient(to top, @toolbarShadowColor@ 1px, transparent 1px), - linear-gradient(rgba(50%,50%,50%,0), ActiveCaption 85%); - color: CaptionText; - } - #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive { - background: linear-gradient(to top, @toolbarShadowColor@ 1px, transparent 1px), - linear-gradient(rgba(50%,50%,50%,0), InactiveCaption 85%); - color: InactiveCaptionText; - } - - #main-window[tabsintitlebar] #titlebar:-moz-lwtheme { - visibility: hidden; - } - #main-window[tabsintitlebar] #titlebar-content:-moz-lwtheme { - -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox"); - visibility: visible; - } - - #main-menubar > menu:not(:-moz-lwtheme) { - color: inherit; /* allow menubar items to be styled */ - } -} - -#nav-bar[tabsontop=true], -#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar, -#nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar { - background-image: linear-gradient(var(--toolbar-highlight-top), var(--toolbar-highlight-bottom)); -} - -#personal-bookmarks { - min-height: 24px; -} - -#print-preview-toolbar:not(:-moz-lwtheme) { - -moz-appearance: toolbox; -} - -#browser-bottombox:not(:-moz-lwtheme) { - background-color: -moz-dialog; -} - -/* ::::: app menu button ::::: */ - -#appmenu-button { - -moz-appearance: none; - background-clip: padding-box; - border: 1px solid; - border-top: none; - color: white; - text-shadow: 0 0 1px rgba(0,0,0,.7), - 0 1px 1.5px rgba(0,0,0,.5); - font-weight: bold; - padding: 0 1.5em .05em; - margin: 0 0 2px; -} - -@media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { - #appmenu-button { - border-radius: 0 0 4px 4px; - } -} - -@media (-moz-windows-classic) { - #appmenu-button { - margin-bottom: 1px; - } -} - -#appmenu-button:hover:active, -#appmenu-button[open] { - border-radius: 0; -} - -%ifdef MOZ_OFFICIAL_BRANDING -#appmenu-button { - background-image: linear-gradient(rgb(82,182,247), rgb(10,98,215) 95%); - border-color: rgba(6,42,83,.9); - box-shadow: 0 1px 0 rgba(255,255,255,.25) inset, - 0 0 0 1px rgba(255,255,255,.25) inset; -} -#appmenu-button:hover:not(:active):not([open]) { - background-image: radial-gradient(farthest-side at bottom, rgba(89,240,252,.5) 10%, rgba(89,240,252,0) 70%), - radial-gradient(farthest-side at bottom, rgb(60,68,236), rgba(172,229,255,0)), - linear-gradient(rgb(69,170,246), rgb(30,40,209) 95%); - border-color: rgba(6,42,83,.9); - box-shadow: 0 1px 0 rgba(255,255,255,.1) inset, - 0 0 2px 1px rgba(169,234,250,.7) inset, - 0 -1px 0 rgba(169,234,250,.5) inset; -} -#appmenu-button:hover:active, -#appmenu-button[open] { - background-image: linear-gradient(rgb(69,170,246), rgb(0,74,209) 95%); - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset; -} -%else -%if MOZ_UPDATE_CHANNEL == aurora -#appmenu-button { - background-image: linear-gradient(hsl(208,99%,37%), hsl(214,90%,23%) 95%); - border-color: hsla(214,89%,21%,.9); - box-shadow: 0 1px 0 hsla(205,100%,72%,.2) inset, - 0 0 2px 1px hsla(205,100%,72%,.25) inset; -} -#appmenu-button:hover:not(:active):not([open]) { - background-image: radial-gradient(farthest-side at bottom, hsla(202,100%,85%,.5) 10%, hsla(202,100%,85%,0) 70%), - radial-gradient(farthest-side at bottom, hsla(205,100%,72%,.7), hsla(205,100%,72%,0)), - linear-gradient(hsl(208,98%,34%), hsl(213,87%,20%) 95%); - border-color: hsla(214,89%,21%,.9); - box-shadow: 0 1px 0 hsla(205,100%,72%,.15) inset, - 0 0 2px 1px hsla(205,100%,72%,.5) inset, - 0 -1px 0 hsla(205,100%,72%,.2) inset; -} -#appmenu-button:hover:active, -#appmenu-button[open] { - background-image: linear-gradient(hsl(208,95%,30%), hsl(214,85%,17%) 95%); - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset; -} -%else -#appmenu-button { - background-image: linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%); - border-color: hsla(210,59%,13%,.9); - box-shadow: 0 1px 0 hsla(210,48%,90%,.15) inset, - 0 0 2px 1px hsla(211,65%,85%,.15) inset; -} -#appmenu-button:hover:not(:active):not([open]) { - background-image: radial-gradient(farthest-side at bottom, hsla(210,48%,90%,.5) 10%, hsla(210,48%,90%,0) 70%), - radial-gradient(farthest-side at bottom, hsla(211,70%,83%,.5), hsla(211,70%,83%,0)), - linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%); - border-color: hsla(210,59%,13%,.9); - box-shadow: 0 1px 0 hsla(210,48%,90%,.15) inset, - 0 0 2px 1px hsla(210,48%,90%,.4) inset, - 0 -1px 0 hsla(210,48%,90%,.2) inset; -} -#appmenu-button:hover:active, -#appmenu-button[open] { - background-image: linear-gradient(hsl(211,33%,26%), hsl(209,53%,6%) 95%); - box-shadow: 0 2px 3px rgba(0,0,0,.4) inset, - 0 1px 1px rgba(0,0,0,.2) inset; -} -%endif -%endif - -#main-window[privatebrowsingmode=temporary] #appmenu-button { - background-image: linear-gradient(rgb(153,38,211), rgb(105,19,163) 95%); - border-color: rgba(43,8,65,.9); -} - -#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:not(:active):not([open]) { - background-image: radial-gradient(farthest-side at bottom, rgba(240,193,255,.5) 10%, rgba(240,193,255,0) 70%), - radial-gradient(farthest-side at bottom, rgb(192,81,247), rgba(236,172,255,0)), - linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%); - border-color: rgba(43,8,65,.9); - box-shadow: 0 1px 0 rgba(255,255,255,.1) inset, - 0 0 2px 1px rgba(240,193,255,.7) inset, - 0 -1px 0 rgba(240,193,255,.5) inset; -} - -#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:active, -#main-window[privatebrowsingmode=temporary] #appmenu-button[open] { - background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%); -} - - - -#appmenu-button > .button-box { - border-style: none; - padding: 0; -} - -#appmenu-button > .button-box > .button-menu-dropmarker { - list-style-image: url(appmenu-dropmarker.png); - width: auto; - height: auto; - padding: 0; - margin: 0; - -moz-margin-start: .5em; -} - -.splitmenu-menuitem { - -moz-margin-end: 1px; - -moz-padding-end: 0.5em; -} - -.splitmenu-menu { - -moz-box-pack: end; -} - -.appmenu-edit-button { - -moz-appearance: none; - border: 1px solid transparent; - padding: 2px; - background: transparent; - border-radius: 3px; -} - -.appmenu-edit-button[disabled="true"] { - opacity: .3; -} - -#appmenuPrimaryPane { - -moz-border-end: 1px solid ThreeDShadow; -} - -@media (-moz-windows-default-theme) { - #appmenu-popup { - -moz-appearance: none; - background: white; - border: 1px solid ThreeDShadow; - } - #appmenuPrimaryPane { - background-color: rgba(255,255,255,0.5); - padding: 2px; - -moz-border-end: none; - } - #appmenuSecondaryPane { - background-color: #f1f5fb; - box-shadow: 1px 0 2px rgb(204,214,234) inset; - -moz-padding-start: 3px; - -moz-padding-end: 2px; - padding-top: 2px; - padding-bottom: 2px; - font-family: "Segoe UI Semibold", "Segoe UI", sans-serif; - } - #appmenuSecondaryPane:-moz-locale-dir(rtl) { - box-shadow: -1px 0 2px rgb(204,214,234) inset; - } - - #appmenuPrimaryPane menupopup { - -moz-appearance: none; - background-image: linear-gradient(to right, white 26px, ThreeDLightShadow 26px, - ThreeDLightShadow 27px, ThreeDHighlight 27px, - ThreeDHighlight 28px, white 28px); - border: 3px solid; - -moz-border-top-colors: ThreeDShadow white; - -moz-border-bottom-colors: ThreeDShadow white; - -moz-border-left-colors: ThreeDShadow white; - -moz-border-right-colors: ThreeDShadow white; - } - - #appmenuSecondaryPane menupopup { - -moz-appearance: none; - background-image: linear-gradient(to right, #f1f5fb 26px, ThreeDLightShadow 26px, - ThreeDLightShadow 27px, ThreeDHighlight 27px, - ThreeDHighlight 28px, #f1f5fb 28px); - border: 3px solid; - -moz-border-top-colors: ThreeDShadow #f1f5fb; - -moz-border-bottom-colors: ThreeDShadow #f1f5fb; - -moz-border-left-colors: ThreeDShadow #f1f5fb; - -moz-border-right-colors: ThreeDShadow #f1f5fb; - } - - #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) { - background-image: linear-gradient(to left, white 26px, ThreeDLightShadow 26px, - ThreeDLightShadow 27px, ThreeDHighlight 27px, - ThreeDHighlight 28px, white 28px); - } - #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) { - background-image: linear-gradient(to left, #f1f5fb 26px, ThreeDLightShadow 26px, - ThreeDLightShadow 27px, ThreeDHighlight 27px, - ThreeDHighlight 28px, #f1f5fb 28px); - } - - /* Hi-DPI overrides of the menu backgrounds, to adjust where the gutter line falls */ - @media (min-resolution: 1.25dppx) { - #appmenuPrimaryPane menupopup { - background-image: linear-gradient(to right, white 22.4px, ThreeDLightShadow 22.4px, - ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px, - ThreeDHighlight 24px, white 24px); - } - #appmenuSecondaryPane menupopup { - background-image: linear-gradient(to right, #f1f5fb 22.4px, ThreeDLightShadow 22.4px, - ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px, - ThreeDHighlight 24px, #f1f5fb 24px); - } - #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) { - background-image: linear-gradient(to left, white 22.4px, ThreeDLightShadow 22.4px, - ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px, - ThreeDHighlight 24px, white 24px); - } - #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) { - background-image: linear-gradient(to left, #f1f5fb 22.4px, ThreeDLightShadow 22.4px, - ThreeDLightShadow 23.2px, ThreeDHighlight 23.2px, - ThreeDHighlight 24px, #f1f5fb 24px); - } - } - - @media (min-resolution: 1.5dppx) { - #appmenuPrimaryPane menupopup { - background-image: linear-gradient(to right, white 20.6667px, ThreeDLightShadow 20.6667px, - ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px, - ThreeDHighlight 22px, white 22px); - } - #appmenuSecondaryPane menupopup { - background-image: linear-gradient(to right, #f1f5fb 20.6667px, ThreeDLightShadow 20.6667px, - ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px, - ThreeDHighlight 22px, #f1f5fb 22px); - } - #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) { - background-image: linear-gradient(to left, white 20.6667px, ThreeDLightShadow 20.6667px, - ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px, - ThreeDHighlight 22px, white 22px); - } - #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) { - background-image: linear-gradient(to left, #f1f5fb 20.6667px, ThreeDLightShadow 20.6667px, - ThreeDLightShadow 21.3333px, ThreeDHighlight 21.3333px, - ThreeDHighlight 22px, #f1f5fb 22px); - } - } - - @media (min-resolution: 2dppx) { - #appmenuPrimaryPane menupopup { - background-image: linear-gradient(to right, white 19.5px, ThreeDLightShadow 19.5px, - ThreeDLightShadow 20px, ThreeDHighlight 20px, - ThreeDHighlight 20.5px, white 20.5px); - } - #appmenuSecondaryPane menupopup { - background-image: linear-gradient(to right, #f1f5fb 19.5px, ThreeDLightShadow 19.5px, - ThreeDLightShadow 20px, ThreeDHighlight 20px, - ThreeDHighlight 20.5px, #f1f5fb 20.5px); - } - #appmenuPrimaryPane menupopup:-moz-locale-dir(rtl) { - background-image: linear-gradient(to left, white 19.5px, ThreeDLightShadow 19.5px, - ThreeDLightShadow 20px, ThreeDHighlight 20px, - ThreeDHighlight 20.5px, white 20.5px); - } - #appmenuSecondaryPane menupopup:-moz-locale-dir(rtl) { - background-image: linear-gradient(to left, #f1f5fb 19.5px, ThreeDLightShadow 19.5px, - ThreeDLightShadow 20px, ThreeDHighlight 20px, - ThreeDHighlight 20.5px, #f1f5fb 20.5px); - } - } - - .appmenu-menuseparator { - -moz-appearance: none; - margin-top: 3px; - margin-bottom: 3px; - -moz-margin-start: 30px; - padding: 0; - border-top: 1px solid #d6e5f5; - border-bottom: none; - } - - @media (min-resolution: 1.25dppx) { - .appmenu-menuseparator { - -moz-margin-start: 25px; - } - } - @media (min-resolution: 1.5dppx) { - .appmenu-menuseparator { - -moz-margin-start: 24px; - } - } - @media (min-resolution: 2dppx) { - .appmenu-menuseparator { - -moz-margin-start: 22px; - } - } - - .appmenu-edit-button:not([disabled]):hover { - border: 1px solid #b8d6fb; - box-shadow: inset 0 0 1px white; - background: linear-gradient(#fafbfd, #ebf3fd); - transition: .2s ease-in; - } -} - -#appmenuSecondaryPane-spacer { - min-height: 1em; -} - -#appmenu-editmenu { - -moz-box-pack: end; -} - -#appmenu_print, -#appmenu_print_popup, -.appmenu-edit-button, -#appmenu-editmenu-cut, -#appmenu-editmenu-copy, -#appmenu-editmenu-paste, -#appmenu-quit { - list-style-image: url("appmenu-icons.png"); -} - -#appmenu-cut, -#appmenu-editmenu-cut { - -moz-image-region: rect(0 16px 16px 0); -} - -#appmenu-copy, -#appmenu-editmenu-copy { - -moz-image-region: rect(0 32px 16px 16px); -} - -#appmenu-paste, -#appmenu-editmenu-paste { - -moz-image-region: rect(0 48px 16px 32px); -} - -#appmenu_print, -#appmenu_print_popup { - -moz-image-region: rect(0 64px 16px 48px); -} - -#appmenu-quit { - -moz-image-region: rect(0 80px 16px 64px); -} - -#appmenu-edit-label { - -moz-appearance: none; - background: transparent; - font-style: italic; -} - -#appmenu_bookmarks { - list-style-image: url("chrome://browser/skin/places/bookmark.png"); - -moz-image-region: rect(0px 48px 16px 32px); -} - -#appmenu_privateBrowsing, -#appmenu_newPrivateWindow { - list-style-image: url("chrome://browser/skin/Privacy-16.png"); -} - -@media (min-resolution: 1.25dppx) { - #appmenu_privateBrowsing, - #appmenu_newPrivateWindow { - list-style-image: url("chrome://browser/skin/Privacy-32.png"); - } -} - -#appmenu_addons { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png"); -} - -@media (min-resolution: 1.25dppx) { - #appmenu_addons { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); - } -} - -#appmenu_showAllBookmarks, -#bookmarksShowAll, -#BMB_bookmarksShowAll { - list-style-image: url("chrome://browser/skin/places/allBookmarks.png"); -} - -#appmenu_bookmarkThisPage, -#menu_bookmarkThisPage, -#BMB_bookmarkThisPage { - list-style-image: url("chrome://browser/skin/places/bookmark.png"); - -moz-image-region: rect(0 16px 16px 0); -} - -#appmenu_showAllHistory, -#menu_showAllHistory, -#HMB_showAllHistory { - list-style-image: url("chrome://browser/skin/places/history.png"); -} - -#appmenu_sanitizeHistory, -#sanitizeItem, -#HMB_sanitizeItem { - list-style-image: url("chrome://browser/skin/sanitize.png"); -} - -/* ::::: titlebar ::::: */ - -#main-window[sizemode="normal"] > #titlebar { - -moz-appearance: -moz-window-titlebar; -} - -#main-window[sizemode="maximized"] > #titlebar { - -moz-appearance: -moz-window-titlebar-maximized; -} - -@media (-moz-windows-classic) { - #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container { - margin-top: 4px; - } -} - -#titlebar-buttonbox { - -moz-appearance: -moz-window-button-box; -} - -#main-window[sizemode="maximized"] #titlebar-buttonbox { - -moz-appearance: -moz-window-button-box-maximized; -} - -.titlebar-placeholder[type="appmenu-button"] { - margin-left: 4px; -} - -.titlebar-placeholder[type="caption-buttons"] { - margin-left: 22px; /* additional space for Aero Snap */ -} - -/* titlebar command buttons */ - -#titlebar-min { - -moz-appearance: -moz-window-button-minimize; -} - -#titlebar-max { - -moz-appearance: -moz-window-button-maximize; -} - -#main-window[sizemode="maximized"] #titlebar-max { - -moz-appearance: -moz-window-button-restore; -} - -#titlebar-close { - -moz-appearance: -moz-window-button-close; -} - -@media not all and (-moz-windows-classic) { - #titlebar-min { - -moz-margin-end: 2px; - } -} - -/* ::::: bookmark buttons ::::: */ - -toolbarbutton.bookmark-item { - margin: 0; - padding: 2px 3px; -} - -toolbarbutton.bookmark-item:hover:active:not([disabled="true"]), -toolbarbutton.bookmark-item[open="true"] { - padding-top: 3px; - padding-bottom: 1px; - -moz-padding-start: 4px; - -moz-padding-end: 2px; -} - -.bookmark-item:not(#bookmarks-menu-button) > .toolbarbutton-icon { - width: 16px; - height: 16px; -} - -/* Prevent [mode="icons"] from hiding the label */ -.bookmark-item > .toolbarbutton-text { - display: -moz-box !important; -} - -.bookmark-item > .toolbarbutton-menu-dropmarker { - display: none; -} - -#wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box { - background: url("chrome://browser/skin/places/bookmarksToolbar.png") no-repeat center; -} - -.bookmarks-toolbar-customize { - max-width: 15em !important; - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important; -} - -/* ::::: bookmark menus ::::: */ - -menu.bookmark-item, -menuitem.bookmark-item { - min-width: 0; - max-width: 32em; -} - -.bookmark-item > .menu-iconic-left { - margin-top: 0; - margin-bottom: 0; -} - -.bookmark-item > .menu-iconic-left > .menu-iconic-icon { - -moz-padding-start: 0px; -} - -/* ::::: bookmark items ::::: */ - -.bookmark-item { - list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); -} - -.bookmark-item[container] { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 32px, 16px, 16px); -} - -.bookmark-item[container][open] { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} - -.bookmark-item[container][livemark] { - list-style-image: url("chrome://browser/skin/livemark-folder.png"); - -moz-image-region: auto; -} - -.bookmark-item[container][livemark] .bookmark-item { - list-style-image: url("chrome://browser/skin/places/livemark-item.png"); - -moz-image-region: rect(0px, 16px, 16px, 0px); -} - -.bookmark-item[container][livemark] .bookmark-item[visited] { - -moz-image-region: rect(0px, 32px, 16px, 16px); -} - -.bookmark-item[container][query] { - list-style-image: url("chrome://browser/skin/places/query.png"); - -moz-image-region: auto; -} - -.bookmark-item[query][tagContainer] { - list-style-image: url("chrome://browser/skin/places/tag.png"); - -moz-image-region: auto; -} - -.bookmark-item[query][dayContainer] { - list-style-image: url("chrome://browser/skin/places/calendar.png"); - -moz-image-region: auto; -} - -.bookmark-item[query][hostContainer] { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 32px, 16px, 16px); -} - -.bookmark-item[query][hostContainer][open] { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(16px, 32px, 32px, 16px); -} - -.bookmark-item[cutting] > .toolbarbutton-icon, -.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-icon { - opacity: 0.5; -} - -.bookmark-item[cutting] > .toolbarbutton-text, -.bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text { - opacity: 0.7; -} - -/* ::::: primary toolbar buttons ::::: */ - -.toolbarbutton-1 { - list-style-image: var(--toolbarbutton-image); -} - -toolbar[brighttext] .toolbarbutton-1 { - list-style-image: var(--toolbarbutton-inverted-image); -} - -.toolbarbutton-1:not(:-moz-lwtheme) { - list-style-image: var(--toolbarbutton-glass-image); -} - -.toolbarbutton-1[disabled=true] > .toolbarbutton-icon, -.toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker, -.toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker, -.toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon, -.toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled] > .toolbarbutton-icon { - opacity: .4; -} - -.toolbarbutton-1 > .toolbarbutton-menu-dropmarker, -.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png"); -} - -toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menu-dropmarker, -toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png"); -} - -.toolbarbutton-1 > .toolbarbutton-icon, -.toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - -moz-margin-end: 0; -} - -toolbar[mode=full] .toolbarbutton-1:not([type=menu-button]) { - -moz-box-orient: vertical; -} - -toolbar[mode=full] .toolbarbutton-1, -toolbar[mode=full] .toolbarbutton-1 > .toolbarbutton-menubutton-button { - min-width: 57px; -} - -#nav-bar { - /* force iconsize="small" on this toolbar */ - counter-reset: smallicons; -} - -@navbarLargeIcons@ .toolbarbutton-1, -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button { - -moz-appearance: none; - border: none; - padding: 0; - background: none; -} - -@navbarLargeIcons@ .toolbarbutton-1:not([type=menu-button]), -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button, -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { - padding: 5px 2px; - -moz-box-pack: center; -} - -@navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button) { - padding-left: 5px; - padding-right: 5px; -} - -@navbarLargeIcons@ .toolbarbutton-1 > menupopup { - margin-top: -3px; -} - -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button { - -moz-padding-end: 0; -} - -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { - -moz-padding-start: 0; - -moz-box-align: center; -} - -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-icon, -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-badge-stack, -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon, -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { - padding: 2px 6px; - background: var(--toolbarbutton-background-color) padding-box; - background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,100%,.1)); - background-clip: padding-box; - border-radius: var(--toolbarbutton-border-radius); - border: 1px solid; - border-color: var(--toolbarbutton-border-color) var(--toolbarbutton-border-color) var(--toolbarbutton-border-color); - box-shadow: 0 1px hsla(0,0%,100%,.05) inset, - 0 1px hsla(210,54%,20%,.05), - 0 0 2px hsla(210,54%,20%,.05); -} - -@media (-moz-os-version: windows-win10) { - /* Square is the new round, courtesy of microsoft */ - :root { - --toolbarbutton-border-radius: 0px; - } -} - -@navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon, -@navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-badge-stack, -@navbarLargeIcons@ .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - padding: 3px 7px; -} - -@navbarLargeIcons@ .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button) > .toolbarbutton-icon, -@navbarLargeIcons@ .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ { - -moz-padding-end: 17px; -} - -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menu-dropmarker { - -moz-margin-start: -15px; -} - -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - -moz-border-end: none; -} - -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { - padding: 8px 5px 7px; -} - -@navbarLargeIcons@ .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before { - content: ""; - display: -moz-box; - width: 1px; - height: 18px; - -moz-margin-end: -1px; - background-image: linear-gradient(var(--toolbarbutton-border-color) 0, var(--toolbarbutton-border-color) 18px); - background-clip: padding-box; - background-position: center; - background-repeat: no-repeat; - background-size: 1px 18px; - box-shadow: 0 0 0 1px hsla(0,0%,100%,.2); -} - -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(ltr), -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(rtl) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon:-moz-locale-dir(rtl), -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-locale-dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} - -@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon, -@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack, -@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon, -@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):hover > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { - background-image: linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.5)); - border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.3) hsla(210,54%,20%,.35); - box-shadow: 0 1px hsla(0,0%,100%,.3) inset, - 0 1px hsla(210,54%,20%,.03), - 0 0 2px hsla(210,54%,20%,.1); -} - -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):not([open]):not(:active):hover > .toolbarbutton-icon, -@navbarLargeIcons@ .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon { - background-color: hsla(210,48%,96%,.75); - border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4); - box-shadow: 0 0 1px hsla(210,54%,20%,.03), - 0 0 2px hsla(210,54%,20%,.1); -} - -@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon, -@navbarLargeIcons@ .toolbarbutton-1:not([disabled]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack, -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover:active > .toolbarbutton-icon, -@navbarLargeIcons@ .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon { - background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)); - background-color: hsla(210,54%,20%,.15); - border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4); - box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset, - 0 0 1px var(--toolbarbutton-border-color) inset, - /* allows windows-keyhole-forward-clip-path to be used for non-hover as well as hover: */ - 0 1px 0 hsla(210,54%,20%,0), - 0 0 2px hsla(210,54%,20%,0); - text-shadow: none; -} - -@navbarLargeIcons@ .toolbarbutton-1:-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker:not([disabled]) > .dropmarker-icon { - -moz-border-start-color: hsla(210,54%,20%,.35); -} - -@navbarLargeIcons@ .toolbarbutton-1[checked]:not(:active):hover > .toolbarbutton-icon { - background-color: rgba(90%,90%,90%,.4); - transition: background-color .4s; -} - -:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1, -:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button, -.tabbrowser-arrowscrollbox > .scrollbutton-up, -.tabbrowser-arrowscrollbox > .scrollbutton-down { - -moz-appearance: none; - border-style: none; - padding: 0 3px; -} - -#TabsToolbar .toolbarbutton-1:not([disabled]):hover, -#TabsToolbar .toolbarbutton-1[open], -#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover, -.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover, -.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover { - background-image: linear-gradient(var(--toolbar-highlight-bottom), var(--toolbar-highlight-top)), - linear-gradient(transparent, rgba(0,0,0,.25) 30%), - linear-gradient(transparent, rgba(0,0,0,.25) 30%); - background-position: 1px -1px, 0 -1px, 100% -1px; - background-size: calc(100% - 2px) 100%, 1px 100%, 1px 100%; - background-repeat: no-repeat; -} - -#addon-bar .toolbarbutton-1:not([disabled]):hover, -#addon-bar .toolbarbutton-1[open], -#addon-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled]):hover { - background-image: linear-gradient(to top, transparent, rgba(0,0,0,.15)), - linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%), - linear-gradient(to top, transparent, rgba(0,0,0,.15) 30%); - background-position: left, left, right; - background-size: auto, 1px 100%, 1px 100%; - background-repeat: no-repeat; -} - -/* unified back/forward button */ - -#back-button { - -moz-image-region: rect(0, 18px, 18px, 0); -} - -#forward-button { - -moz-image-region: rect(0, 36px, 18px, 18px); -} - -#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, -#forward-button:-moz-locale-dir(rtl), -#forward-button:-moz-locale-dir(rtl) > .toolbarbutton-text { - transform: scaleX(-1); -} - -@conditionalForwardWithUrlbar@ { - -moz-box-align: center; -} - -@conditionalForwardWithUrlbar@ > .toolbarbutton-1:-moz-any([disabled],:not([disabled]):not([open]):not(:active)) > .toolbarbutton-icon { - border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.3) hsla(210,54%,20%,.35); - box-shadow: 0 1px hsla(0,0%,100%,.3) inset, - 0 1px hsla(210,54%,20%,.03), - 0 0 2px hsla(210,54%,20%,.1); -} - -@conditionalForwardWithUrlbar@ > #forward-button { - padding: 0; -} - -@conditionalForwardWithUrlbar@ > #forward-button > menupopup { - margin-top: 1px; -} - -@conditionalForwardWithUrlbar@ > #forward-button > .toolbarbutton-icon { - clip-path: url(chrome://browser/content/browser.xul#windows-keyhole-forward-clip-path); - -moz-margin-start: -6px !important; - border-left-style: none; - border-radius: 0; - padding-left: 7px; - padding-right: 3px; -} - -@conditionalForwardWithUrlbar2@ > #forward-button:-moz-locale-dir(ltr) > .toolbarbutton-icon { - border-top-right-radius: var(--toolbarbutton-border-radius); - border-bottom-right-radius: var(--toolbarbutton-border-radius); -} - -@conditionalForwardWithUrlbar2@ > #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { - border-top-left-radius: var(--toolbarbutton-border-radius); - border-bottom-left-radius: var(--toolbarbutton-border-radius); -} - -@conditionalForwardWithUrlbar@ > #forward-button:not([disabled]):not([open]):not(:active):hover > .toolbarbutton-icon { - background-color: hsla(210,48%,96%,.75); - border-color: hsla(210,54%,20%,.3) hsla(210,54%,20%,.35) hsla(210,54%,20%,.4); - box-shadow: 0 0 1px hsla(210,54%,20%,.03), - 0 0 2px hsla(210,54%,20%,.1); -} - -@conditionalForwardWithUrlbar@ > #back-button { - -moz-image-region: rect(18px, 20px, 38px, 0); - padding-top: 3px; - padding-bottom: 3px; - -moz-padding-start: 5px; - -moz-padding-end: 0; - position: relative; - z-index: 1; - border-radius: 0 10000px 10000px 0; -} - -@conditionalForwardWithUrlbar@ > #back-button:-moz-locale-dir(rtl) { - border-radius: 10000px 0 0 10000px; -} - -@conditionalForwardWithUrlbar@ > #back-button > menupopup { - margin-top: -1px; -} - -@conditionalForwardWithUrlbar@ > #back-button > .toolbarbutton-icon { - border-radius: 10000px; - padding: 5px; - border: none; - box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, - 0 0 0 1px hsla(0,0%,100%,.3) inset, - 0 0 0 1px hsla(210,54%,20%,.25), - 0 1px 0 hsla(210,54%,20%,.35); -} - -@conditionalForwardWithUrlbar@ > #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon { - background-color: hsla(210,48%,96%,.75); - box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, - 0 0 0 1px hsla(0,0%,100%,.3) inset, - 0 0 0 1px hsla(210,54%,20%,.3), - 0 1px 0 hsla(210,54%,20%,.4), - 0 0 4px var(--toolbarbutton-border-color); -} - -@conditionalForwardWithUrlbar@ > #back-button:not([disabled="true"]):hover:active > .toolbarbutton-icon, -@conditionalForwardWithUrlbar@ > #back-button[open="true"] > .toolbarbutton-icon { - background-color: hsla(210,54%,20%,.15); - box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset, - 0 0 1px var(--toolbarbutton-border-color) inset, - 0 0 0 1px hsla(210,54%,20%,.4), - 0 1px 0 var(--toolbarbutton-border-color); -} - -@conditionalForwardWithUrlbar@ > #back-button[disabled] > .toolbarbutton-icon { - box-shadow: 0 0 0 1px hsla(210,54%,20%,.55), - 0 1px 0 hsla(210,54%,20%,.65); -} - -.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr), -.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) { - list-style-image: url("chrome://browser/skin/menu-back.png") !important; -} - -.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr), -.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) { - list-style-image: url("chrome://browser/skin/menu-forward.png") !important; -} - -#stop-button { - -moz-image-region: rect(0, 54px, 18px, 36px); -} - -#reload-button { - -moz-image-region: rect(0, 72px, 18px, 54px); -} - -#home-button.bookmark-item { - list-style-image: var(--toolbarbutton-image); -} -toolbar[brighttext] #home-button.bookmark-item { - list-style-image: var(--toolbarbutton-inverted-image); -} - -#home-button.bookmark-item:not(:-moz-lwtheme) { - list-style-image: var(--toolbarbutton-glass-image); -} - -#home-button { - -moz-image-region: rect(0, 90px, 18px, 72px); -} - -#downloads-button { - -moz-image-region: rect(0, 108px, 18px, 90px); -} - -#history-button, -#history-menu-button { - -moz-image-region: rect(0, 126px, 18px, 108px); -} - -#bookmarks-button, -#bookmarks-menu-button { - -moz-image-region: rect(0, 144px, 18px, 126px); -} - -#bookmarks-menu-button.bookmark-item { - list-style-image: var(--toolbarbutton-image); -} - -toolbar[brighttext] #bookmarks-menu-button.bookmark-item { - list-style-image: var(--toolbarbutton-inverted-image); -} - -#bookmarks-menu-button.bookmark-item:not(:-moz-lwtheme) { - list-style-image: var(--toolbarbutton-glass-image); -} - -#print-button { - -moz-image-region: rect(0, 162px, 18px, 144px); -} - -#new-tab-button { - -moz-image-region: rect(0, 180px, 18px, 162px); -} - -#new-window-button { - -moz-image-region: rect(0, 198px, 18px, 180px); -} - -#cut-button { - -moz-image-region: rect(0, 216px, 18px, 198px); -} - -#copy-button { - -moz-image-region: rect(0, 234px, 18px, 216px); -} - -#paste-button { - -moz-image-region: rect(0, 252px, 18px, 234px); -} - -#fullscreen-button { - -moz-image-region: rect(0, 270px, 18px, 252px); -} - -#zoom-out-button { - -moz-image-region: rect(0, 288px, 18px, 270px); -} - -#zoom-in-button { - -moz-image-region: rect(0, 306px, 18px, 288px); -} - -#sync-button { - -moz-image-region: rect(0, 324px, 18px, 306px); -} -#sync-button[status="active"] { - list-style-image: url("chrome://browser/skin/sync-throbber.png"); - -moz-image-region: rect(0, 18px, 18px, 0); -} - -#feed-button { - -moz-image-region: rect(0, 342px, 18px, 324px); -} - -%ifdef MOZ_WEBRTC -#webrtc-status-button { - -moz-image-region: rect(0, 360px, 18px, 342px); -} -%endif - -/* ::::: fullscreen window controls ::::: */ - -#window-controls { - -moz-margin-start: 4px; -} - -#minimize-button, -#restore-button, -#close-button { - list-style-image: url("chrome://global/skin/icons/windowControls.png"); - padding: 0; -} - -#minimize-button { - -moz-image-region: rect(0, 16px, 16px, 0); -} -#minimize-button:hover { - -moz-image-region: rect(16px, 16px, 32px, 0); -} -#minimize-button:hover:active { - -moz-image-region: rect(32px, 16px, 48px, 0); -} -#restore-button { - -moz-image-region: rect(0, 32px, 16px, 16px); -} -#restore-button:hover { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} -#restore-button:hover:active { - -moz-image-region: rect(32px, 32px, 48px, 16px); -} -#close-button { - -moz-image-region: rect(0, 48px, 16px, 32px); - -moz-appearance: none; - border-style: none; - margin: 2px; -} -#close-button:hover { - -moz-image-region: rect(16px, 48px, 32px, 32px); -} -#close-button:hover:active { - -moz-image-region: rect(32px, 48px, 48px, 32px); -} - -/* ::::: Location Bar ::::: */ - -#urlbar, -.searchbar-textbox { - -moz-appearance: none; - margin: 1px 3px; - padding: 0; - background-clip: padding-box; - border: 1px solid ThreeDShadow; - border-radius: 2px; -} - -#urlbar { - width: 7em; - -moz-padding-end: 2px; -} - -@media (-moz-windows-default-theme) { - #urlbar, - .searchbar-textbox { - @navbarTextboxCustomBorder@ - } -} - -#urlbar:-moz-lwtheme, -.searchbar-textbox:-moz-lwtheme { - background-color: rgba(255,255,255,.8); - @navbarTextboxCustomBorder@ - color: black; -} - -@conditionalForwardWithUrlbar@ + #urlbar-container { - padding-left: @conditionalForwardWithUrlbarWidth@px; - -moz-margin-start: -@conditionalForwardWithUrlbarWidth@px; - position: relative; - pointer-events: none; -} - -@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar { - -moz-border-start: none; - margin-left: 0; - pointer-events: all; -} - -@conditionalForwardWithUrlbar@:not([switchingtabs]) + #urlbar-container > #urlbar { - transition: margin-left @forwardTransitionLength@ ease-out; -} - -@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} - -@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container { - clip-path: url("chrome://browser/content/browser.xul#windows-urlbar-back-button-clip-path"); -} - -@conditionalForwardWithUrlbar@ + #urlbar-container:-moz-locale-dir(rtl), -@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) { - /* let windows-urlbar-back-button-mask clip the urlbar's right side for RTL */ - transform: scaleX(-1); -} - -html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, -.searchbar-textbox:-moz-lwtheme > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input::-moz-placeholder { - opacity: 1.0; - color: #777; -} - -#urlbar:-moz-lwtheme[focused="true"], -.searchbar-textbox:-moz-lwtheme[focused="true"] { - background-color: white; -} - -#urlbar-container { - -moz-box-orient: horizontal; - -moz-box-align: stretch; -} - -.urlbar-textbox-container { - -moz-box-align: stretch; -} - -.urlbar-input-box { - -moz-margin-start: 0; - min-width: 4em; -} - -#urlbar-icons { - -moz-box-align: center; -} - -.urlbar-icon { - padding: 0 3px; -} - -.searchbar-engine-button, -.search-go-container { - padding: 2px 2px; -} - -.urlbar-icon:hover { - background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.3), hsla(200,100%,70%,0)); -} - -.urlbar-icon[open="true"], -.urlbar-icon:hover:active { - background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.1), hsla(200,100%,70%,0)); -} - -#urlbar-search-splitter { - min-width: 6px; - -moz-margin-start: -3px; - border: none; - background: transparent; -} - -#urlbar-search-splitter + #urlbar-container > #urlbar , -#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox { - -moz-margin-start: 0; -} - -#urlbar-display-box { - -moz-border-end: 1px solid #AAA; - -moz-margin-end: 3px; -} - -#urlbar-display { - margin-top: 0; - margin-bottom: 0; - -moz-margin-start: 0; - color: GrayText; -} - -/* identity box */ - -#identity-box { - padding: 2px; - font-size: .9em; -} - -#identity-box:-moz-locale-dir(ltr) { - border-top-left-radius: 1.5px; - border-bottom-left-radius: 1.5px; -} - -#identity-box:-moz-locale-dir(rtl) { - border-top-right-radius: 1.5px; - border-bottom-right-radius: 1.5px; -} - -#notification-popup-box:not([hidden]) + #identity-box { - -moz-padding-start: 10px; - border-radius: 0; -} - -@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box { - border-radius: 0; -} - -#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - color: hsl(92,100%,20%); - -moz-margin-end: 4px; - background-image: -moz-linear-gradient(hsla(92,81%,16%,0), - hsla(92,81%,16%,.08) 25%, - hsla(92,81%,16%,.08) 75%, - hsla(92,81%,16%,0)); - background-position: right; - background-repeat: no-repeat; - border-right: 1px solid hsla(92,100%,20%,0.5); -} - -#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain { - color: rgb(0,79,168); - -moz-margin-end: 4px; - background-image: -moz-linear-gradient(rgba(0,79,168,0), - rgba(0,79,168,.08) 25%, - rgba(0,79,168,.08) 75%, - rgba(0,79,168,0)); - background-position: right; - background-repeat: no-repeat; - border-right: 1px solid rgba(0,79,168,0.5); -} - -#identity-box.verifiedIdentity:-moz-locale-dir(rtl) { - background-position: left; - border-right: none; - border-left: 1px solid hsla(92,100%,20%,0.5); -} - -#identity-box.verifiedDomain:-moz-locale-dir(rtl) { - background-position: left; - border-right: none; - border-left: 1px solid rgba(0,79,168,0.5); -} - -#identity-box:-moz-focusring { - outline: 1px dotted #000; - outline-offset: -3px; -} - -#identity-icon-labels { - -moz-padding-start: 2px; - -moz-padding-end: 5px; -} - -/* Address bar shading for SSL */ - -#urlbar[https_color="all"][security_level="broken"], -#urlbar[https_color="all"][security_level="low"] { - box-shadow: inset 0 0 2px rgb(168,0,0); -} - -#urlbar[https_color="all"][security_level="mixed"], -#urlbar[https_color="secure-mixed"][security_level="mixed"] { - box-shadow: inset 0 0 2px rgb(168,79,0); -} - -#urlbar[https_color="all"][security_level="high"], -#urlbar[https_color="secure-mixed"][security_level="high"], -#urlbar[https_color="secure-only"][security_level="high"] { - box-shadow: inset 0 0 2px rgb(0,79,168); -} - -#urlbar[https_color="all"][security_level="ev"], -#urlbar[https_color="secure-mixed"][security_level="ev"], -#urlbar[https_color="secure-only"][security_level="ev"] { - box-shadow: inset 0 0 2px rgb(0,168,0); -} - -#urlbar[https_color="all"][security_level="broken"]:not(:-moz-lwtheme), -#urlbar[https_color="all"][security_level="low"]:not(:-moz-lwtheme) { - box-shadow: inset 0 0 3px rgba(168,0,0,0.8); -} - -#urlbar[https_color="all"][security_level="mixed"]:not(:-moz-lwtheme), -#urlbar[https_color="secure-mixed"][security_level="mixed"]:not(:-moz-lwtheme) { - box-shadow: inset 0 0 3px rgba(168,79,0,0.8); -} - -#urlbar[https_color="all"][security_level="high"]:not(:-moz-lwtheme), -#urlbar[https_color="secure-mixed"][security_level="high"]:not(:-moz-lwtheme), -#urlbar[https_color="secure-only"][security_level="high"]:not(:-moz-lwtheme) { - box-shadow: inset 0 0 3px rgba(0,79,168,0.8); -} - -#urlbar[https_color="all"][security_level="ev"]:not(:-moz-lwtheme), -#urlbar[https_color="secure-mixed"][security_level="ev"]:not(:-moz-lwtheme), -#urlbar[https_color="secure-only"][security_level="ev"]:not(:-moz-lwtheme) { - box-shadow: inset 0 0 3px rgba(0,168,0,0.8); -} - -/* Location bar dropmarker */ - -.urlbar-history-dropmarker { - -moz-appearance: none; - padding: 0 3px; - background-color: transparent; - border: none; - width: auto; - list-style-image: url("chrome://browser/skin/urlbar-history-dropmarker.png"); - -moz-image-region: rect(0px, 11px, 14px, 0px); -} - -.urlbar-history-dropmarker:hover { - background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.3), hsla(205,100%,70%,0)); - -moz-image-region: rect(0px, 22px, 14px, 11px); -} - -.urlbar-history-dropmarker:hover:active, -.urlbar-history-dropmarker[open="true"] { - background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.1), hsla(205,100%,70%,0)); - -moz-image-region: rect(0px, 33px, 14px, 22px); -} - -/* page proxy icon */ - -#page-proxy-favicon { - width: 16px; - height: 16px; - margin-top: 1px; - margin-bottom: 1px; - -moz-margin-start: 3px; - -moz-margin-end: 2px; - list-style-image: url(chrome://browser/skin/identity-icons-generic.png); - -moz-image-region: rect(0, 16px, 16px, 0); -} - -@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box > #page-proxy-favicon { - -moz-margin-end: 1px; -} - -/* Since we already have a padlock, always use the generic icon until the favicon loads -.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https.png); -} - -.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png); -} - -.mixedActiveContent > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png); -} -*/ - -#identity-box:hover > #page-proxy-favicon { - -moz-image-region: rect(0, 32px, 16px, 16px); -} - -#identity-box:hover:active > #page-proxy-favicon, -#identity-box[open=true] > #page-proxy-favicon { - -moz-image-region: rect(0, 48px, 16px, 32px); -} - -#page-proxy-favicon[pageproxystate="invalid"] { - opacity: 0.3; -} - -/* autocomplete */ - -#treecolAutoCompleteImage { - max-width: 36px; -} - -.ac-result-type-bookmark, -.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/bookmark.png"); - -moz-image-region: rect(0px 48px 16px 32px); - width: 16px; - height: 16px; -} - -.ac-result-type-keyword, -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) { - list-style-image: url(chrome://global/skin/icons/Search-glass.png); - -moz-image-region: rect(0px 32px 16px 16px); - width: 16px; - height: 16px; -} - -.ac-result-type-tag, -.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/tag.png"); - width: 16px; - height: 16px; -} - -.ac-comment { - font-size: 1.06em; -} - -.ac-extra > .ac-comment { - font-size: 1em; -} - -.ac-url-text, -.ac-action-text { - font-size: 1em; - color: -moz-nativehyperlinktext; -} - -richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon { - list-style-image: url("chrome://browser/skin/actionicon-tab.png"); - -moz-image-region: rect(0, 16px, 11px, 0); - padding: 0 3px; -} - -@media not all and (-moz-os-version: windows-vista), - not all and (-moz-windows-default-theme) { - @media not all and (-moz-os-version: windows-win7), - not all and (-moz-windows-default-theme) { - richlistitem[type~="action"][actiontype$="tab"][selected="true"] > .ac-url-box > .ac-action-icon { - -moz-image-region: rect(11px, 16px, 22px, 0); - } - - .ac-comment[selected="true"], - .ac-url-text[selected="true"], - .ac-action-text[selected="true"] { - color: inherit !important; - } - } -} - -.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) { - color: GrayText; -} - -.autocomplete-treebody::-moz-tree-cell-text(suggesthint, treecolAutoCompleteComment), -.autocomplete-treebody::-moz-tree-cell-text(suggestfirst, treecolAutoCompleteComment) -{ - color: GrayText; - font-size: smaller; -} - -.autocomplete-treebody::-moz-tree-cell(suggesthint) { - border-top: 1px solid GrayText; -} - -/* combined go/reload/stop button in location bar */ - -#go-button, -#urlbar > toolbarbutton { - -moz-appearance: none; - padding: 0 2px; - background-origin: border-box; - border: none; - list-style-image: url("chrome://browser/skin/reload-stop-go.png"); -} - -#go-button { - padding: 0 3px; -} - -#urlbar-reload-button { - -moz-image-region: rect(0, 14px, 14px, 0); -} - -#urlbar-reload-button:not([disabled]):hover { - background-image: radial-gradient(circle closest-side, hsla(200,100%,70%,.2), hsla(200,100%,70%,0)); - -moz-image-region: rect(14px, 14px, 28px, 0); -} - -#urlbar-reload-button:not([disabled]):hover:active { - background-image: radial-gradient(circle closest-side, hsla(200,100%,60%,.1), hsla(200,100%,60%,0)); - -moz-image-region: rect(28px, 14px, 42px, 0); -} - -#urlbar-reload-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { - transform: scaleX(-1); -} - -#go-button, -#urlbar-go-button { - -moz-image-region: rect(0, 42px, 14px, 28px); -} - -#go-button:hover, -#urlbar-go-button:hover { - background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.2), hsla(110,70%,50%,0)); - -moz-image-region: rect(14px, 42px, 28px, 28px); -} - -#go-button:hover:active, -#urlbar-go-button:hover:active { - background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.1), hsla(110,70%,50%,0)); - -moz-image-region: rect(28px, 42px, 42px, 28px); -} - -#go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, -#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { - transform: scaleX(-1); -} - -#urlbar-stop-button { - -moz-image-region: rect(0, 28px, 14px, 14px); -} - -#urlbar-stop-button:not([disabled]):hover { - background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.3), hsla(5,100%,75%,0)); - -moz-image-region: rect(14px, 28px, 28px, 14px); -} - -#urlbar-stop-button:hover:active { - background-image: radial-gradient(circle closest-side, hsla(5,100%,75%,.1), hsla(5,100%,75%,0)); - -moz-image-region: rect(28px, 28px, 42px, 14px); -} - -/* popup blocker button */ - -#page-report-button { - list-style-image: url("chrome://browser/skin/urlbar-popup-blocked.png"); - -moz-image-region: rect(0, 16px, 16px, 0); -} - -#page-report-button:hover { - -moz-image-region: rect(0, 32px, 16px, 16px); -} - -#page-report-button:hover:active, -#page-report-button[open="true"] { - -moz-image-region: rect(0, 48px, 16px, 32px); -} - -/* star button */ - -#star-button { - list-style-image: url("chrome://browser/skin/places/bookmark.png"); - -moz-image-region: rect(0px 16px 16px 0px); -} - -#star-button:hover { - background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.3), hsla(45,100%,73%,0)); - -moz-image-region: rect(0px 32px 16px 16px); -} - -#star-button:hover:active { - background-image: radial-gradient(circle closest-side, hsla(45,100%,73%,.1), hsla(45,100%,73%,0)); - -moz-image-region: rect(0px 48px 16px 32px); -} - -#star-button[starred] { - list-style-image: url("chrome://browser/skin/places/editBookmark.png"); -} - -/* bookmarking panel */ - -#editBookmarkPanelStarIcon { - list-style-image: url("chrome://browser/skin/places/starred48.png"); - width: 48px; - height: 48px; -} - -#editBookmarkPanelStarIcon[unstarred] { - list-style-image: url("chrome://browser/skin/places/unstarred48.png"); -} - -#editBookmarkPanelTitle { - font-size: 130%; -} - -#editBookmarkPanelHeader, -#editBookmarkPanelContent { - margin-bottom: .5em; -} - -/* Implements editBookmarkPanel resizing on folderTree un-collapse. */ -#editBMPanel_folderTree { - min-width: 27em; -} - -/* ::::: content area ::::: */ - -#sidebar { - background-color: Window; -} - -#sidebar-title { - -moz-padding-start: 0px; -} - -/* ::::: throbber ::::: */ - -#navigator-throbber { - width: 16px; - min-height: 16px; - margin: 0 3px; -} - -#navigator-throbber[busy="true"] { - list-style-image: url("chrome://global/skin/icons/loading_16.png"); -} - -#navigator-throbber, -#wrapper-navigator-throbber > #navigator-throbber { - list-style-image: url("chrome://global/skin/icons/notloading_16.png"); -} - -/* Tabstrip */ - -#TabsToolbar { - min-height: 0; - padding: 0; -} - -/* Make sure the Navigation toolbar buttons are more or less - vertically centered between the tabs and the AppMenu button - when the tabs are not on top and the Bookmarks toolbar is - disabled */ -#nav-bar + #customToolbars + #PersonalToolbar:-moz-any([collapsed=true],[moz-collapsed=true]) + #TabsToolbar[tabsontop=false] { - margin-top: 1px; -} - -/* Make sure the elements on the Tab bar are not "glued" right - up against the AppMenu button / the caption when the tabs are - on top and the window is unmaximized */ -#main-window[sizemode="normal"] #TabsToolbar[tabsontop=true] { - margin-top: 1px; -} - -#TabsToolbar:not(:-moz-lwtheme), -#TabsToolbar[tabsontop=false] { - background-image: linear-gradient(to top, @toolbarShadowColor@ 1px, rgba(0,0,0,.05) 1px, transparent 50%); -} - -/* When the tab bar is collapsed, show a 1px border in its place. */ -#TabsToolbar[tabsontop="false"][collapsed="true"]:not([customizing="true"]) { - visibility: visible; - height: 1px; - border-bottom-width: 1px; - /* !important here to override border-style: none on the toolbar */ - border-bottom-style: solid !important; - border-bottom-color: var(--toolbox-after-color); - overflow: hidden; -} - -.tabbrowser-tab, -.tabs-newtab-button { - -moz-appearance: none; - background: @toolbarShadowOnTab@, var(--tab-background), - linear-gradient(-moz-dialog, -moz-dialog); - background-clip: padding-box; - padding: 3px 1px 4px; - /* Setting a transparent outer border allows us to have a 1px gap - between the tabs and the top edge of the screen, even when the - tabs have a top margin of 0, which is important for Fitts' law - compliance */ - border: 1.6px solid; - border-bottom: none; - border-radius: var(--tab-border-radius) var(--tab-border-radius) 0px 0px; - -moz-border-top-colors: transparent #929292; - -moz-border-left-colors: transparent #929292; - -moz-border-right-colors: transparent #929292; - /* Hide the transparent top border by default */ - margin-top: -1px; - /* Reduce the gap between the tabs */ - -moz-margin-start: -1px; - box-shadow: var(--tab-box-shadow); -} - -.tabbrowser-tab { - -moz-padding-end: 3px; -} - -/* Override the default (globally-set) tab width values; increase - by 2px to compensate for the transparent outer border of the tabs */ -.tabbrowser-tab:not([pinned]) { - max-width: 252px; - min-width: 102px; -} - -/* When the tabs are on top and the window is maximized or in full- - screen mode, unhide the transparent top border of the tabs so we - have a 1px gap between the tabs and the top edge of the screen */ -#main-window[sizemode="maximized"][tabsontop=true] .tabbrowser-tab, -#main-window[sizemode="maximized"][tabsontop=true] .tabs-newtab-button, -#main-window[sizemode="fullscreen"][tabsontop=true] .tabbrowser-tab, -#main-window[sizemode="fullscreen"][tabsontop=true] .tabs-newtab-button { - margin-top: 0px; -} - -@media (-moz-os-version: windows-win8) { - /* Square is the new round, courtesy of microsoft */ - /* We keep the hinting at round here because that's the hybrid in use - on our other controls in the navigation toolbars */ - :root { - --tab-border-radius: 3.5px; - } -} - -@media (-moz-os-version: windows-win10) { - /* Square is the new round, courtesy of microsoft */ - :root { - --tab-border-radius: 0px; - --tab-box-shadow: none; - } -} - -.tabbrowser-tab:hover, -.tabs-newtab-button:hover { - background-image: @toolbarShadowOnTab@, var(--tab-background-hover), - linear-gradient(-moz-dialog, -moz-dialog); -} - -.tabbrowser-tab[selected="true"] { - background-image: linear-gradient(var(--tab-selected-highlight), var(--toolbar-highlight-top) 50%), - linear-gradient(-moz-dialog, -moz-dialog); -} - -#main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) { - background-image: @toolbarShadowOnTab@, - linear-gradient(var(--tab-selected-highlight), var(--toolbar-highlight-top) 50%), - linear-gradient(-moz-dialog, -moz-dialog); -} - -.tabbrowser-tab:-moz-lwtheme { - color: inherit; - /* 0.99 opacity rquired to force an active layer, see bug #1028369 */ - opacity: 0.99; -} - -.tabbrowser-tab:-moz-lwtheme:not([selected="true"]) { - opacity: 0.9; -} - -/* Remove highlight fuzz on dark themes */ -.tabbrowser-tab:-moz-lwtheme-brighttext, -.tabs-newtab-button:-moz-lwtheme-brighttext { - box-shadow:none; - -moz-border-top-colors: transparent #707070; - -moz-border-left-colors: transparent #707070; - -moz-border-right-colors: transparent #707070; -} - -.tabbrowser-tab[selected="true"]:-moz-lwtheme { - background-image: linear-gradient(var(--tab-selected-highlight), var(--toolbar-highlight-top) 50%); -} - -.tabbrowser-tab[selected="true"]:-moz-lwtheme-brighttext { - background-image: linear-gradient(rgba(128,128,128,.9), rgba(32,32,32,.9) 50%, rgba(32,32,32,.9) 80%, var(--toolbar-highlight-top) 100%); - -moz-border-top-colors: transparent #D0D0D0; - -moz-border-left-colors: transparent #D0D0D0; - -moz-border-right-colors: transparent #D0D0D0; -} - -.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]), -.tabs-newtab-button:-moz-lwtheme-brighttext { - background-image: linear-gradient(hsla(0,0%,25%,.4), hsla(0,0%,15%,.6) 80%); -} - -.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]):hover, -.tabs-newtab-button:-moz-lwtheme-brighttext:hover { - background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,10%,.8) 80%); -} - -.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]), -.tabs-newtab-button:-moz-lwtheme-darktext { - background-image: linear-gradient(hsla(0,0%,75%,.4), hsla(0,0%,85%,.6) 80%); -} - -.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]):hover, -.tabs-newtab-button:-moz-lwtheme-darktext:hover { - background-image: linear-gradient(hsla(0,0%,60%,.4), hsla(0,0%,90%,.8) 80%); -} - -.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) { - background-image: radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25)); -} -.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover { - background-image: linear-gradient(hsla(0,0%,100%,.4), hsla(0,0%,75%,.4) 80%), - radial-gradient(circle farthest-corner at 50% 3px, rgba(255,255,255,1) 3%, rgba(186,221,251,.75) 40%, rgba(127,179,255,.5) 80%, rgba(127,179,255,.25)); -} - -.tab-throbber, -.tab-icon-image { - width: 16px; - height: 16px; - list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); - -moz-margin-start: 2px; - -moz-margin-end: 3px; -} - -.tab-throbber { - list-style-image: url("chrome://browser/skin/tabbrowser/connecting.png"); -} - -.tab-throbber[progress] { - list-style-image: url("chrome://browser/skin/tabbrowser/loading.png"); -} - -.tab-throbber[pinned], -.tab-icon-image[pinned] { - -moz-margin-start: 5px; - -moz-margin-end: 5px; -} - -/* tabbrowser-tab focus ring */ -.tabbrowser-tab:focus > .tab-stack { - outline: 1px dotted; -} - -/* Tab DnD indicator */ -.tab-drop-indicator { - list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png); - margin-bottom: -11px; -} - -/* Tab close button */ -.tab-close-button { - -moz-appearance: none; - border: none; - padding: 0px; -} - -.tab-close-button:not([selected]):not(:hover):not(:active) { - -moz-image-region: rect(0, 64px, 16px, 48px); -} - -.tab-close-button:-moz-lwtheme-brighttext { - list-style-image: url("chrome://global/skin/icons/close-inverted.svg"); -} - -/* Tab sound indicator */ -.tab-icon-sound { - -moz-margin-start: 4px; - width: 16px; - height: 16px; - padding: 0; -} - -.allTabs-endimage[soundplaying], -.tab-icon-sound[soundplaying] { - list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio"); -} - -.allTabs-endimage[muted], -.tab-icon-sound[muted] { - list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted"); -} - -.allTabs-endimage[blocked], -.tab-icon-sound[blocked] { - list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked"); -} - -#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[soundplaying], -#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[blocked], -#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-sound[muted] { - filter: invert(1); -} - -.tab-icon-sound[soundplaying-scheduledremoval]:not([muted]):not(:hover), -.tab-icon-overlay[soundplaying-scheduledremoval]:not([muted]):not(:hover) { - transition: opacity .3s linear var(--soundplaying-removal-delay); - opacity: 0; -} - -/* Tab icon overlay */ -.tab-icon-overlay { - width: 16px; - height: 16px; - margin-top: -8px; - margin-inline-start: -15px; - margin-inline-end: -1px; - position: relative; -} - -.tab-icon-overlay[soundplaying], -.tab-icon-overlay[muted]:not([crashed]), -.tab-icon-overlay[blocked]:not([crashed]) { - border-radius: 10px; -} - -.tab-icon-overlay[soundplaying]:hover, -.tab-icon-overlay[muted]:not([crashed]):hover, -.tab-icon-overlay[blocked]:not([crashed]):hover { - background-color: white; -} - -.tab-icon-overlay[soundplaying] { - list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio"); -} - -.tab-icon-overlay[muted] { - list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-muted"); -} - -.tab-icon-overlay[blocked] { - list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-blocked"); -} - -#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[soundplaying]:not([selected]):not(:hover), -.tab-icon-overlay[soundplaying][selected]:-moz-lwtheme-brighttext:not(:hover) { - list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white"); -} - -#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[muted]:not([crashed]):not([selected]):not(:hover), -.tab-icon-overlay[muted][selected]:-moz-lwtheme-brighttext:not(:hover) { - list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-muted"); -} - -#TabsToolbar:-moz-lwtheme-brighttext .tab-icon-overlay[blocked]:not([crashed]):not([selected]):not(:hover), -.tab-icon-overlay[blocked][selected]:-moz-lwtheme-brighttext:not(:hover) { - list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-blocked"); -} - -/* Tab scrollbox arrow, tabstrip new tab and all-tabs buttons */ - -.tabbrowser-arrowscrollbox > .scrollbutton-up, -.tabbrowser-arrowscrollbox > .scrollbutton-down { - list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png"); - margin: 0; - padding-right: 2px; - border-right: 2px solid transparent; - background-origin: border-box; -} - -/* Prevent the icon from being vertically stretched when we unhide - the transparent top border of the tabs (when the tabs are on top - and the window is maximized or in full-screen mode) */ -#main-window[sizemode="maximized"][tabsontop=true] .tabbrowser-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon, -#main-window[sizemode="maximized"][tabsontop=true] .tabbrowser-arrowscrollbox > .scrollbutton-down > .toolbarbutton-icon, -#main-window[sizemode="fullscreen"][tabsontop=true] .tabbrowser-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon, -#main-window[sizemode="fullscreen"][tabsontop=true] .tabbrowser-arrowscrollbox > .scrollbutton-down > .toolbarbutton-icon { - margin-bottom: 1px; -} - -.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-system-metric(windows-compositor):not(:-moz-lwtheme), -.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-system-metric(windows-compositor):not(:-moz-lwtheme) { - list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-glass.png); -} - -toolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-up, -toolbar[brighttext] .tabbrowser-arrowscrollbox > .scrollbutton-down { - list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png); -} - -.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled], -.tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] { - opacity: .4; -} - -.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl), -.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) { - transform: scaleX(-1); -} - -.tabbrowser-arrowscrollbox > .scrollbutton-down { - transition: 1s background-color ease-out; -} - -.tabbrowser-arrowscrollbox > .scrollbutton-down[notifybgtab] { - background-color: Highlight; - transition: none; -} - -.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]), -.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]) { - border-width: 0 2px 0 0; - border-style: solid; - border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 fill; -} - -.tabs-newtab-button > .toolbarbutton-icon { - margin-top: -1px; - margin-bottom: -1px; -} - -.tabs-newtab-button, -#TabsToolbar > #new-tab-button, -#TabsToolbar > toolbarpaletteitem > #new-tab-button { - list-style-image: url(chrome://browser/skin/tabbrowser/newtab.png); - -moz-image-region: auto; -} - -#TabsToolbar > #new-tab-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme), -#TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme) { - list-style-image: url(chrome://browser/skin/tabbrowser/newtab-glass.png); -} - -.tabs-newtab-button:-moz-lwtheme-brighttext, -#TabsToolbar[brighttext] > #new-tab-button, -#TabsToolbar[brighttext] > toolbarpaletteitem > #new-tab-button { - list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png); -} - -.tabs-newtab-button { -/* The button has a transparent outer border, so it will appear - to be 2px narrower than the width we set for it here */ - width: 30px; -} - -#TabsToolbar > #new-tab-button { - width: 26px; -} - -#alltabs-button { - list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png"); - -moz-image-region: rect(0, 14px, 16px, 0); -} - -#alltabs-button[type="menu"] { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png"); - -moz-image-region: auto; -} - -toolbar[brighttext] #alltabs-button { - list-style-image: url("chrome://browser/skin/tabbrowser/alltabs-inverted.png"); -} - -:-moz-any(#TabsToolbar, #nav-bar[tabsontop=false], #toolbar-menubar) > #alltabs-button[type=menu]:-moz-system-metric(windows-compositor):not(:-moz-lwtheme), -:-moz-any(#TabsToolbar, #nav-bar[tabsontop=false], #toolbar-menubar) > toolbarpaletteitem > #alltabs-button[type=menu]:-moz-system-metric(windows-compositor):not(:-moz-lwtheme), -toolbar[brighttext] #alltabs-button[type="menu"] { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png"); -} - -#alltabs-button[type="menu"] > .toolbarbutton-icon { - margin: 0 2px; -} - -#alltabs-button[type="menu"] > .toolbarbutton-menu-dropmarker { - display: none; -} - -/* All tabs menupopup */ -.alltabs-item > .menu-iconic-left > .menu-iconic-icon { - list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); -} - -.alltabs-item[selected="true"] { - font-weight: bold; -} - -.alltabs-item[busy] > .menu-iconic-left > .menu-iconic-icon { - list-style-image: url("chrome://global/skin/icons/loading_16.png"); -} - -.alltabs-item[tabIsVisible] { - /* box-shadow instead of background-color to work around native styling */ - box-shadow: inset -5px 0 ThreeDShadow; -} - -/* Tabstrip close button */ -.tabs-closebutton { - -moz-appearance: none; - padding: 4px 2px; - margin: 0px; - border: none; -} - -toolbar[brighttext] .tabs-closebutton { - list-style-image: url("chrome://global/skin/icons/close-inverted.svg"); -} - -.tabs-closebutton > .toolbarbutton-icon { - -moz-margin-end: 0px !important; - -moz-padding-end: 2px !important; - -moz-padding-start: 2px !important; -} - -toolbarbutton.chevron { - list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important; -} - -toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon { - transform: scaleX(-1); -} - -toolbarbutton.chevron > .toolbarbutton-text, -toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { - display: none; -} - -toolbarbutton.chevron > .toolbarbutton-icon { - margin: 0; -} - -toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon { - display: -moz-box; /* display chevron icon in text mode */ -} - -#sidebar-throbber[loading="true"] { - list-style-image: url("chrome://global/skin/icons/loading_16.png"); - -moz-margin-end: 4px; -} - -/* Pale Moon: Feed icon */ -#ub-feed-button, -#ub-feed-button > .button-box, -#ub-feed-button:hover:active > .button-box { - padding: 0px; - margin: 0px; - border: 0px; - background-color: transparent !important; -} - -#ub-feed-button { - -moz-appearance: none; - min-width: 0px; - list-style-image: url("chrome://browser/skin/feeds/feed-icons-16.png"); - -moz-image-region: rect(0px 16px 16px 0px); -} - -#ub-feed-button:hover { - -moz-image-region: rect(0px 32px 16px 16px); -} - -#ub-feed-button[open="true"], -#ub-feed-button:hover:active { - -moz-image-region: rect(0px 48px 16px 32px); -} - - -/* Bookmarks toolbar */ -#PlacesToolbarDropIndicator { - list-style-image: url(chrome://browser/skin/places/toolbarDropMarker.png); -} - -toolbarbutton.bookmark-item[dragover="true"][open="true"] { - -moz-appearance: none; - background: Highlight !important; - color: HighlightText !important; -} - -/* rules for menupopup drop indicators */ -.menupopup-drop-indicator-bar { - position: relative; - /* these two margins must together compensate the indicator's height */ - margin-top: -1px; - margin-bottom: -1px; -} - -.menupopup-drop-indicator { - list-style-image: none; - height: 2px; - -moz-margin-end: -4em; - background-color: Highlight; -} - -/* ::::: Identity Indicator Styling ::::: */ - -/* Popup Icons */ -#identity-popup-icon { - height: 64px; - width: 64px; - padding: 0; - list-style-image: url("chrome://browser/skin/identity.png"); - -moz-image-region: rect(0px, 64px, 64px, 0px); -} - -#identity-popup.verifiedDomain > #identity-popup-container > #identity-popup-icon { - -moz-image-region: rect(64px, 64px, 128px, 0px); -} - -#identity-popup.verifiedIdentity > #identity-popup-container > #identity-popup-icon { - -moz-image-region: rect(128px, 64px, 192px, 0px); -} - -/* Popup Body Text */ -.identity-popup-description { - white-space: pre-wrap; - -moz-padding-start: 15px; - margin: 2px 0 4px; -} - -.identity-popup-label { - white-space: pre-wrap; - -moz-padding-start: 15px; - margin: 0; -} - -#identity-popup-content-host, -#identity-popup-content-box.verifiedIdentity > #identity-popup-content-owner { - font-size: 1.2em; -} - -#identity-popup-content-host { - margin-top: 3px; - margin-bottom: 5px; - font-weight: bold; - max-width: 300px; -} - -#identity-popup-content-owner { - margin-top: 4px; - margin-bottom: 0 !important; - font-weight: bold; - max-width: 300px; -} - -.verifiedDomain > #identity-popup-content-owner { - font-weight: normal; -} - -#identity-popup-content-verifier { - margin: 4px 0 2px; -} - -#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption , -#identity-popup-content-box.verifiedDomain > #identity-popup-encryption { - margin-top: 10px; - -moz-margin-start: -24px; -} - -#identity-popup-content-box.verifiedIdentity > #identity-popup-encryption > vbox > #identity-popup-encryption-icon , -#identity-popup-content-box.verifiedDomain > #identity-popup-encryption > vbox > #identity-popup-encryption-icon { - list-style-image: url("chrome://browser/skin/Secure24.png"); -} - -#identity-popup-more-info-button { - margin-top: 6px; - margin-bottom: 0; - -moz-margin-end: 0; -} - -.popup-notification-icon { - width: 64px; - height: 64px; - -moz-margin-end: 10px; -} - -.popup-notification-icon[popupid="geolocation"] { - list-style-image: url(chrome://browser/skin/Geolocation-64.png); -} - -.popup-notification-icon[popupid="xpinstall-disabled"], -.popup-notification-icon[popupid="addon-progress"], -.popup-notification-icon[popupid="addon-install-cancelled"], -.popup-notification-icon[popupid="addon-install-blocked"], -.popup-notification-icon[popupid="addon-install-origin-blocked"], -.popup-notification-icon[popupid="addon-install-failed"], -.popup-notification-icon[popupid="addon-install-complete"] { - list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png); - width: 32px; - height: 32px; -} - -.popup-notification-icon[popupid="click-to-play-plugins"] { - list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png); -} - -.popup-notification-icon[popupid="web-notifications"] { - list-style-image: url(chrome://browser/skin/notification-64.png); -} - -.addon-progress-description { - width: 350px; - max-width: 350px; -} - -.popup-progress-label, -.popup-progress-meter { - -moz-margin-start: 0; - -moz-margin-end: 0; -} - -.popup-progress-cancel { - -moz-appearance: none; - background: transparent; - border: none; - padding: 0; - margin: 0; - min-height: 0; - min-width: 0; - list-style-image: url(chrome://mozapps/skin/downloads/downloadButtons.png); - -moz-image-region: rect(0px, 32px, 16px, 16px); -} - -.popup-progress-cancel:hover { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} - -.popup-progress-cancel:active { - -moz-image-region: rect(32px, 32px, 48px, 16px); -} - -.popup-notification-icon[popupid="indexedDB-permissions-prompt"], -.popup-notification-icon[popupid="indexedDB-quota-prompt"], -.popup-notification-icon[popupid*="offline-app-requested"], -.popup-notification-icon[popupid="offline-app-usage"] { - list-style-image: url(chrome://global/skin/icons/question-64.png); -} - -.popup-notification-icon[popupid="password"] { - list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); -} - -.popup-notification-icon[popupid="mixed-content-blocked"] { - list-style-image: url(chrome://browser/skin/mixed-content-blocked-64.png); -} - -%ifdef MOZ_WEBRTC -.popup-notification-icon[popupid="webRTC-sharingDevices"], -.popup-notification-icon[popupid="webRTC-shareDevices"] { - list-style-image: url(chrome://browser/skin/webRTC-shareDevice-64.png); -} -%endif - -.popup-notification-icon[popupid="pointerLock"] { - list-style-image: url(chrome://browser/skin/pointerLock-64.png); -} - -/* Notification icon box */ -#notification-popup-box { - position: relative; - background-color: #fff; - background-clip: padding-box; - padding-left: 3px; - border-radius: var(--toolbarbutton-border-radius) 0 0 var(--toolbarbutton-border-radius); - border-width: 0 8px 0 0; - border-style: solid; - border-image: url("chrome://browser/skin/urlbar-arrow.png") 0 8 0 0 fill; - -moz-margin-end: -8px; -} - -@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box { - padding-left: 5px; -} - -#notification-popup-box:-moz-locale-dir(rtl), -.notification-anchor-icon:-moz-locale-dir(rtl) { - transform: scaleX(-1); -} - -.notification-anchor-icon { - width: 16px; - height: 16px; - margin: 0 2px; -} - -.notification-anchor-icon:-moz-focusring { - outline: 1px dotted -moz-DialogText; - outline-offset: -3px; -} - -.default-notification-icon, -#default-notification-icon { - list-style-image: url(chrome://global/skin/icons/information-16.png); -} - -.geo-notification-icon, -#geo-notification-icon { - list-style-image: url(chrome://browser/skin/Geolocation-16.png); -} - -#addons-notification-icon { - list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-16.png); -} - -.indexedDB-notification-icon, -#indexedDB-notification-icon { - list-style-image: url(chrome://global/skin/icons/question-16.png); -} - -#password-notification-icon { - list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png); -} - -#plugins-notification-icon { - list-style-image: url(chrome://browser/skin/notification-pluginNormal.png); -} - -#alert-plugins-notification-icon { - list-style-image: url(chrome://browser/skin/notification-pluginAlert.png); -} - -#blocked-plugins-notification-icon { - list-style-image: url(chrome://browser/skin/notification-pluginBlocked.png); -} - -#plugins-notification-icon, -#alert-plugins-notification-icon, -#blocked-plugins-notification-icon { - -moz-image-region: rect(0, 16px, 16px, 0); -} - -#plugins-notification-icon:hover, -#alert-plugins-notification-icon:hover, -#blocked-plugins-notification-icon:hover { - -moz-image-region: rect(0, 32px, 16px, 16px); -} - -#plugins-notification-icon:active, -#alert-plugins-notification-icon:active, -#blocked-plugins-notification-icon:active { - -moz-image-region: rect(0, 48px, 16px, 32px); -} - -#notification-popup-box[hidden] { - /* Override display:none to make the pluginBlockedNotification animation work - when showing the notification repeatedly. */ - display: -moz-box; - visibility: collapse; -} - -#blocked-plugins-notification-icon[showing] { - animation: pluginBlockedNotification 500ms ease 0s 5 alternate both; -} - -@keyframes pluginBlockedNotification { - from { - opacity: 0; - } - to { - opacity: 1; - } -} - -.mixed-content-blocked-notification-icon, -#mixed-content-blocked-notification-icon { - list-style-image: url(chrome://browser/skin/mixed-content-blocked-16.png); -} - -%ifdef MOZ_WEBRTC -.webRTC-shareDevices-notification-icon, -#webRTC-shareDevices-notification-icon { - list-style-image: url(chrome://browser/skin/webRTC-shareDevice-16.png); -} - -.webRTC-sharingDevices-notification-icon, -#webRTC-sharingDevices-notification-icon { - list-style-image: url(chrome://browser/skin/webRTC-sharingDevice-16.png); -} -%endif - -.web-notifications-notification-icon, -#web-notifications-notification-icon { - list-style-image: url(chrome://browser/skin/web-notifications-tray.svg); - -moz-image-region: rect(0, 16px, 16px, 0); -} - -.web-notifications-notification-icon:hover, -#web-notifications-notification-icon:hover { - -moz-image-region: rect(0, 32px, 16px, 16px); -} - -.web-notifications-notification-icon:hover:active, -#web-notifications-notification-icon:hover:active { - -moz-image-region: rect(0, 48px, 16px, 32px); -} - -#pointerLock-notification-icon { - list-style-image: url(chrome://browser/skin/pointerLock-16.png); -} -#pointerLock-cancel { - margin: 0px; -} - -#identity-popup-container { - min-width: 280px; -} - -/* Bookmarks roots menu-items */ -#appmenu_subscribeToPage:not([disabled]), -#appmenu_subscribeToPageMenu, -#subscribeToPageMenuitem:not([disabled]), -#subscribeToPageMenupopup, -#BMB_subscribeToPageMenuitem:not([disabled]), -#BMB_subscribeToPageMenupopup { - list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png"); -} - -#appmenu_bookmarksToolbar, -#bookmarksToolbarFolderMenu, -#BMB_bookmarksToolbar { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); - -moz-image-region: auto; -} - -#appmenu_unsortedBookmarks, -#menu_unsortedBookmarks, -#BMB_unsortedBookmarks { - list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); - -moz-image-region: auto; -} - -/* ::::: Keyboard UI Panel ::::: */ - -.KUI-panel { - -moz-appearance: none; - background: rgba(27%,27%,27%,.9) url(KUI-background.png) repeat-x; - color: white; - border-style: none; - border-radius: 20px; -} - -.KUI-panel[level="top"] { - background-color: rgba(27%,27%,27%,.65); -} - -.KUI-panel-closebutton { - list-style-image: url(KUI-close.png); - -moz-appearance: none; - border: none; - padding: 0; - width: 24px; - height: 24px; -} - -.KUI-panel-closebutton:not(:hover) { - opacity: .6; -} - -.KUI-panel-closebutton > .toolbarbutton-icon { - margin: 0; -} - -/* ::::: Ctrl-Tab and All Tabs Panels ::::: */ - -/* Ctrl-Tab */ - -#ctrlTab-panel { - padding: 20px 10px 10px; - font-weight: bold; - text-shadow: 0 0 1px rgb(27%,27%,27%), 0 0 2px rgb(27%,27%,27%); -} - -.ctrlTab-favicon[src] { - background-color: white; - width: 20px; - height: 20px; - padding: 2px; -} - -.ctrlTab-preview-inner > .tabPreview-canvas { - box-shadow: 1px 1px 2px rgb(12%,12%,12%); -} - -.ctrlTab-preview:not(#ctrlTab-showAll) > * > .ctrlTab-preview-inner > .tabPreview-canvas { - margin-bottom: 2px; -} - -.ctrlTab-preview-inner { - padding-bottom: 10px; -} - -#ctrlTab-showAll:not(:focus) > * > .ctrlTab-preview-inner { - padding: 10px; - background-color: rgba(255,255,255,.2); - border-radius: .5em; -} - -.ctrlTab-preview:focus > * > .ctrlTab-preview-inner { - color: white; - background-color: rgba(0,0,0,.6); - text-shadow: none; - padding: 8px; - border: 2px solid white; - border-radius: .5em; -} - -.ctrlTab-preview:not(#ctrlTab-showAll):focus > * > .ctrlTab-preview-inner { - margin: -10px -10px 0; -} - -#ctrlTab-showAll { - margin-top: .5em; -} - -/* All Tabs */ - -#allTabs-panel { - padding-bottom: 10px; - -moz-appearance: none; - border: none; - background: -moz-dialog; - color: -moz-dialogText; -} - -#allTabs-meta { - margin: 10px; -} - -#allTabs-filter { - -moz-margin-start: 24px; - -moz-margin-end: 0; -} - -#allTabs-tab-close-button > .toolbarbutton-icon { - margin: 0; -} - -/* Make sure the allTab previews always have regular close buttons */ -#allTabs-tab-close-button:-moz-lwtheme-brighttext { - list-style-image: url("chrome://global/skin/icons/close.svg"); -} - -.allTabs-favicon[src] { - background-color: -moz-dialog; - width: 22px; - height: 22px; - padding-top: 1px; - padding-bottom: 5px; - -moz-padding-start: 1px; - -moz-padding-end: 5px; - margin-top: -2px; - -moz-margin-start: -2px; - border-bottom-right-radius: 4px; -} - -.allTabs-favicon[src]:-moz-locale-dir(rtl) { - border-bottom-right-radius: 0; - border-bottom-left-radius: 4px; -} - -.allTabs-preview-inner > .tabPreview-canvas { - background-color: rgb(60%,60%,60%); - box-shadow: 0 0 1.5px ThreeDShadow; -} - -.allTabs-preview:not(:hover):not([closebuttonhover]) > html|canvas { - opacity: .8; -} - -.allTabs-preview:focus > * > .allTabs-preview-inner { - outline: 1px dotted -moz-dialogText; -} - -/* Add-on bar */ - -#addon-bar { - -moz-appearance: none; - min-height: 20px; - border-top-style: none; - border-bottom-style: none; - padding-top: 1px; - background-image: linear-gradient(rgba(0,0,0,.15) 1px, rgba(255,255,255,.15) 1px); - background-size: 100% 2px; - background-repeat: no-repeat; -} - -#status-bar { - -moz-appearance: none; - background-color: transparent; - border: none; - min-height: 0; -} - -#addon-bar[customizing] > #status-bar { - opacity: .5; - background-image: repeating-linear-gradient(135deg, - rgba(255,255,255,.3), rgba(255,255,255,.3) 5px, - rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px); -} - -#status-bar > statusbarpanel { - border-width: 0; - -moz-appearance: none; -} - -#addonbar-closebutton { - border: none; - padding: 0 5px; - -moz-appearance: none; -} - -toolbar[brighttext] #addonbar-closebutton { - list-style-image: url("chrome://global/skin/icons/close-inverted.svg"); -} - -/* Status panel */ - -.statuspanel-label { - margin: 0; - padding: 2px 4px; - background: linear-gradient(#fff, #ddd); - border: 1px none #ccc; - border-top-style: solid; - color: #333; - text-shadow: none; -} - -.statuspanel-label:-moz-locale-dir(ltr):not([mirror]), -.statuspanel-label:-moz-locale-dir(rtl)[mirror] { - border-right-style: solid; - /* disabled for triggering grayscale AA (bug 659213) - border-top-right-radius: .3em; - */ - margin-right: 1em; -} - -.statuspanel-label:-moz-locale-dir(rtl):not([mirror]), -.statuspanel-label:-moz-locale-dir(ltr)[mirror] { - border-left-style: solid; - /* disabled for triggering grayscale AA (bug 659213) - border-top-left-radius: .3em; - */ - margin-left: 1em; -} - -#full-screen-warning-message { - background-color: hsl(0,0%,15%); - color: white; - border-radius: 8px; - margin-top: 30px; - padding: 30px 50px; - box-shadow: 0 0 2px white; -} - -.full-screen-description { - font-size: 150%; -} - -#full-screen-domain-text { - font-size: 300%; -} - -%ifdef MOZ_DEVTOOLS -%include ../../../../devtools/client/themes/responsivedesign.inc.css -%include ../../../../devtools/client/themes/commandline.inc.css -%endif -%include ../shared/plugin-doorhanger.inc.css - -%ifdef MOZ_DEVTOOLS -/* Error counter */ - -#developer-toolbar-toolbox-button[error-count]:before { - color: #FDF3DE; - min-width: 16px; - text-shadow: none; - background-image: linear-gradient(#B4211B, #8A1915); - border-radius: 1px; - -moz-margin-end: 5px; -} -%endif - -.toolbarbutton-badge-stack { - margin: 0; - padding: 0; - position: relative; -} - -@navbarLargeIcons@ .toolbarbutton-1 > .toolbarbutton-badge-stack { - padding: 2px 5px; -} - -.toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbar-icon { - position: absolute; - top: 2px; - right: 2px; -} - -.toolbarbutton-badge-stack > .toolbarbutton-icon[label]:not([label=""]) { - -moz-margin-end: 0; -} - -@navbarLargeIcons@ *|* > .toolbarbutton-badge[badge]:not([badge=""])::after { - top: 1px; - right: 1px; -} - -.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after { - left: 0; - right: auto; -} - -@navbarLargeIcons@ *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after { - left: 1px; - right: auto; -} - -#main-window[privatebrowsingmode=temporary] #toolbar-menubar { - background-image: url("chrome://browser/skin/privatebrowsing-dark.png"); - background-position: top right; - background-repeat: no-repeat; -} - -#main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) { - background-position: top left; -} - -#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .box-inherit > .button-icon { - list-style-image: url("chrome://browser/skin/privatebrowsing-light.png"); - width: 20px; - height: 16px; -} - -@media not all and (-moz-windows-classic) { - #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container { - margin-top: 1px; - } - - #appmenu-button { - border-width: 2px; - -moz-border-left-colors: @appMenuButtonBorderColor@; - -moz-border-bottom-colors: @appMenuButtonBorderColor@; - -moz-border-right-colors: @appMenuButtonBorderColor@; - margin-bottom: 1px; /* compensate white outer border */ - box-shadow: 0 1px 0 rgba(255,255,255,.25) inset, - 0 0 2px 1px rgba(255,255,255,.25) inset; - } - - #main-window[privatebrowsingmode=temporary] #appmenu-button { - -moz-border-left-colors: rgba(255,255,255,.5) rgba(43,8,65,.9); - -moz-border-bottom-colors: rgba(255,255,255,.5) rgba(43,8,65,.9); - -moz-border-right-colors: rgba(255,255,255,.5) rgba(43,8,65,.9); - } - - #appmenu-popup { - margin-top: -1px; - -moz-margin-start: 1px; - } - - .panel-promo-message { - font-style: italic; - } -} - -@media (-moz-windows-default-theme) { - #navigator-toolbox > toolbar:not(:-moz-lwtheme), - #browser-bottombox:not(:-moz-lwtheme) { - background-color: var(--toolbar-custom-color); - } - - .tabbrowser-tab:not(:-moz-lwtheme), - .tabs-newtab-button:not(:-moz-lwtheme) { - background-image: @toolbarShadowOnTab@, var(--tab-background), - linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color)); - } - - .tabbrowser-tab:not(:-moz-lwtheme):hover, - .tabs-newtab-button:not(:-moz-lwtheme):hover { - background-image: @toolbarShadowOnTab@, var(--tab-background-hover), - linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color)); - } - - .tabbrowser-tab[selected="true"]:not(:-moz-lwtheme) { - background-image: linear-gradient(#fff, var(--toolbar-highlight-top) 50%), - linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color)); - } - - #main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) { - background-image: @toolbarShadowOnTab@, - linear-gradient(#fff, var(--toolbar-highlight-top) 50%), - linear-gradient(var(--toolbar-custom-color), var(--toolbar-custom-color)); - } - - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { - :root:not(:-moz-lwtheme) { - --toolbox-after-color: #aabccf; - } - } - - @media (-moz-os-version: windows-win8), - (-moz-os-version: windows-win10) { - :root { - --toolbar-custom-color: hsl(210,0%,92%); - } - - :root:not(:-moz-lwtheme) { - --toolbox-after-color: #bcbcbc; - } - } - - #navigator-toolbox[tabsontop=true] #urlbar:not(:-moz-lwtheme), - #navigator-toolbox[tabsontop=true] .searchbar-textbox:not(:-moz-lwtheme) { - border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.27) hsla(210,54%,20%,.3); - } - - #navigator-toolbox[tabsontop=true] #urlbar:not(:-moz-lwtheme):not([focused]):hover, - #navigator-toolbox[tabsontop=true] .searchbar-textbox:not(:-moz-lwtheme):not([focused]):hover { - border-color: hsla(210,54%,20%,.35) hsla(210,54%,20%,.37) hsla(210,54%,20%,.4); - } - - #navigator-toolbox[tabsontop=true] #urlbar:not(:-moz-lwtheme)[focused], - #navigator-toolbox[tabsontop=true] .searchbar-textbox:not(:-moz-lwtheme)[focused] { - border-color: hsla(206,100%,60%,.65) hsla(206,100%,55%,.65) hsla(206,100%,50%,.65); - } - - .sidebar-splitter { - border: 0; - -moz-border-end: 1px solid #A9B7C9; - min-width: 0; - width: 3px; - background-color: transparent; - -moz-margin-start: -3px; - position: relative; - } - - #appcontent ~ .sidebar-splitter { - -moz-border-start: 1px solid #A9B7C9; - -moz-border-end: none; - -moz-margin-start: 0; - -moz-margin-end: -3px; - } - - .menu-accel, - .menu-iconic-accel { - color: graytext; - } - - .chatbar-button, - chatbar > chatbox { - border-color: #A9B7C9; - } -} - -@media (-moz-windows-compositor) { - #main-window { - background-color: transparent; - -moz-appearance: -moz-win-glass; - } - - /* On win 10, if we don't set this on the entire browser container, including - * the sidebar, then the accent color bleeds through in the titlebar - * if the sidebar is open. */ - #browser { - -moz-appearance: -moz-win-exclude-glass; - } - -/* ==== Windows 10 styling ==== */ - - @media (-moz-os-version: windows-win10) { - /* Draw XUL caption buttons and background on Win10 */ - @media (-moz-windows-accent-color-applies: 0) { - /* Default styling for when no accent color is applied */ - #main-window:not(:-moz-window-inactive):not(:-moz-lwtheme) { - background-color: white; - } - - :root:not(:-moz-window-inactive):not(:-moz-lwtheme) { - --window-text-color: black; - } - - #titlebar-min:not(:-moz-window-inactive):not(:-moz-lwtheme) { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize); - } - - #titlebar-max:not(:-moz-window-inactive):not(:-moz-lwtheme) { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize); - } - - #main-window[sizemode="maximized"] #titlebar-max:not(:-moz-window-inactive):not(:-moz-lwtheme) { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore); - } - - #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme) { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close); - } - - .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover { - background-color: hsla(0, 0%, 0%, .17); - } - - .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active { - background-color: hsla(0, 0%, 0%, .27); - transition: none; - } - - #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight); - background-color: hsla(0, 86%, 49%, 1); - } - - #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active { - background-color: hsla(0, 60%, 49%, 0.6); - transition: none; - } - } - - @media (-moz-windows-accent-color-applies) { - /* Styling for when an accent color is applied to the titlebar */ - #main-window:not(:-moz-window-inactive):not(:-moz-lwtheme) { - background-color: -moz-win-accentcolor; - } - - :root:not(:-moz-window-inactive):not(:-moz-lwtheme) { - --window-text-color: -moz-win-accentcolortext; - } - - #titlebar-min { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize); - } - - #titlebar-max { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize); - } - - #main-window[sizemode="maximized"] #titlebar-max { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore); - } - - #titlebar-close { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close); - } - - .titlebar-button:hover { - background-color: hsla(0, 0%, 0%, .17); - } - - .titlebar-button:hover:active { - background-color: hsla(0, 0%, 0%, .27); - transition: none; - } - - @media (-moz-windows-accent-color-is-dark) { - /* dark accent color */ - #titlebar-min { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-highlight); - } - - #titlebar-max { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-highlight); - } - - #main-window[sizemode="maximized"] #titlebar-max { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-highlight); - } - - #titlebar-close { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight); - } - - .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover { - background-color: hsla(0, 0%, 100%, .17); - } - - .titlebar-button:not(#titlebar-close):not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active { - background-color: hsla(0, 0%, 100%, .27); - transition: none; - } - - #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover { - background-color: hsla(0, 86%, 49%, 1); - } - - #titlebar-close:not(:-moz-window-inactive):not(:-moz-lwtheme):hover:active { - background-color: hsla(0, 60%, 39%, 1); - transition: none; - } - } - } - - #main-window:-moz-window-inactive:not(:-moz-lwtheme) { - background-color: hsl(0, 0%, 95%); - } - - /* If we don't have [chromemargin], it means the menubar is active; set the - window background to transparent in that case to match it with the dwm - color and prevent a drawing delay between title bar and UI region */ - #main-window:not([chromemargin]):not(:-moz-lwtheme) { - background-color: transparent; - } - - #titlebar-buttonbox, - .titlebar-button { - -moz-appearance: none !important; - } - - .titlebar-button { - border: none; - margin: 0 !important; - padding: 9px 17px; - transition: background-color linear 120ms; - } - - #main-window[sizemode="maximized"][tabsontop=true] #tabbrowser-tabs { - min-height: 28px; - } - - #main-window[sizemode=maximized] .titlebar-button { - padding-top: 8px; - padding-bottom: 8px; - } - - .titlebar-button > .toolbarbutton-icon { - width: 12px; - height: 12px; - } - - .titlebar-button:not(:hover) > .toolbarbutton-icon:-moz-window-inactive { - opacity: 0.5; - } - - #main-window[chromemargin^="0,"][sizemode=normal] #navigator-toolbox { - margin-top: -4px; - } - - #main-window[sizemode="maximized"] #titlebar-close { - padding-right: 19px; - } - - #titlebar-close:hover { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight); - background-color: hsla(0, 86%, 49%, 1); - transition: background-color linear 160ms; - } - - #titlebar-close:hover:active { - background-color: hsla(0, 86%, 49%, 0.6); - transition: none; - } - - /* inactive window */ - - #titlebar-min:-moz-window-inactive:not(:-moz-lwtheme) { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-inactive); - } - - #titlebar-max:-moz-window-inactive:not(:-moz-lwtheme) { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-inactive); - } - - #main-window[sizemode="maximized"] #titlebar-max:-moz-window-inactive:not(:-moz-lwtheme) { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-inactive); - } - - #titlebar-close:-moz-window-inactive:not(:-moz-lwtheme):not(:hover) { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-inactive); - } - - .titlebar-button:-moz-window-inactive:not(:-moz-lwtheme):hover { - background-color: hsla(0, 0%, 0%, .17); - } - - .titlebar-button:-moz-window-inactive:not(:-moz-lwtheme):hover:active { - background-color: hsla(0, 0%, 0%, .27); - transition: none; - } - - /* light persona */ - - .titlebar-button:-moz-lwtheme-darktext:hover { - background-color: hsla(0, 0%, 0%, .17); - } - - .titlebar-button:-moz-lwtheme-darktext:hover:active { - background-color: hsla(0, 0%, 0%, .27); - transition: none; - } - - #titlebar-min:-moz-lwtheme-darktext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-outline); - } - - #titlebar-max:-moz-lwtheme-darktext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-outline); - } - - #main-window[sizemode="maximized"]:-moz-lwtheme-darktext #titlebar-max:-moz-lwtheme-darktext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-outline); - } - - #titlebar-close:-moz-lwtheme-darktext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline); - } - #titlebar-close:hover:-moz-lwtheme-darktext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline); - } - - /* dark persona */ - - .titlebar-button:-moz-lwtheme-brighttext:hover { - background-color: hsla(0, 0%, 100%, .27); - } - - .titlebar-button:-moz-lwtheme-brighttext:hover:active { - background-color: hsla(0, 0%, 100%, .37); - transition: none; - } - - #titlebar-min:-moz-lwtheme-brighttext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-outline-inverted); - } - - #titlebar-max:-moz-lwtheme-brighttext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-outline-inverted); - } - - #main-window[sizemode="maximized"]:-moz-lwtheme-brighttext #titlebar-max:-moz-lwtheme-brighttext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-outline-inverted); - } - - #titlebar-close:-moz-lwtheme-brighttext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline-inverted); - } - #titlebar-close:hover:-moz-lwtheme-brighttext { - list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-outline-inverted); - } - - /* the 12px image renders a 10px icon, and the 10px upscaled gets rounded to 12.5, which - * rounds up to 13px, which makes the icon one pixel too big on 1.25dppx. Fix: */ - @media (min-resolution: 1.20dppx) and (max-resolution: 1.45dppx) { - .titlebar-button > .toolbarbutton-icon { - width: 11.5px; - height: 11.5px; - } - } - - /* 175% dpi should result in the same device pixel sizes as 150% dpi. */ - @media (min-resolution: 1.70dppx) and (max-resolution: 1.95dppx) { - .titlebar-button { - padding-left: 14.1px; - padding-right: 14.1px; - } - - .titlebar-button > .toolbarbutton-icon { - width: 10.8px; - height: 10.8px; - } - } - - /* 225% dpi should result in the same device pixel sizes as 200% dpi. */ - @media (min-resolution: 2.20dppx) and (max-resolution: 2.45dppx) { - .titlebar-button { - padding-left: 15.3333px; - padding-right: 15.3333px; - } - - .titlebar-button > .toolbarbutton-icon { - width: 10.8px; - height: 10.8px; - } - } - - /* 275% dpi should result in the same device pixel sizes as 250% dpi. */ - @media (min-resolution: 2.70dppx) and (max-resolution: 2.95dppx) { - .titlebar-button > .toolbarbutton-icon { - width: 10.8px; - height: 10.8px; - } - } - - #appmenu-button { - margin-top: -1px; - margin-bottom: 5px; - } - } - -/* ==== Windows Vista/7/8 styling ==== */ - - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), - (-moz-os-version: windows-win8) { - /* Make sure the native margins are correct on Win Vista/7/8. - * We can't use -moz-win-glass there because the border sizing would - * not be correct. */ - #main-window { - -moz-appearance: -moz-win-borderless-glass; - } - - /* These should be hidden w/ glass enabled. Windows draws its own buttons. */ - .titlebar-button { - display: none; - } - - /* The borders on the glass frame are ours, and inside #browser, and on - * vista and win7 we want to make sure they are "glassy", so we can't use - * #browser as the exclude-glass container. We use #appcontent instead. */ - #browser { - -moz-appearance: none; - } - - #appcontent { - -moz-appearance: -moz-win-exclude-glass; - } - - #main-window[chromemargin^="0,"][sizemode=normal] #navigator-toolbox { - margin-top: -7px; - } - - /* Artificially draw window borders that are covered by lwtheme, see bug 591930. */ - #main-window[sizemode="normal"] > #titlebar > #titlebar-content:-moz-lwtheme { - border-top: 2px solid; - -moz-border-top-colors: @glassActiveBorderColor@ rgba(255,255,255,.6); - } - - #main-window[sizemode="normal"] > #titlebar > #titlebar-content:-moz-lwtheme:-moz-window-inactive { - -moz-border-top-colors: @glassInactiveBorderColor@ rgba(255,255,255,.6); - } - - #main-window[sizemode="normal"] > #titlebar > #titlebar-content > #appmenu-button-container:-moz-lwtheme { - margin-top: -1px; - } - - #main-window[sizemode="normal"] #titlebar-buttonbox:-moz-lwtheme { - margin-top: -2px; - } - - #appmenu-button { - margin-bottom: -1px; /* compensate white outer border */ - } - - } - -/* ==== Windows Vista/7 (true glass) styling ==== */ - - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { - #toolbar-menubar:not(:-moz-lwtheme), - #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme), - #nav-bar[tabsontop=false]:not(:-moz-lwtheme), - #nav-bar[tabsontop=false]:not(:-moz-lwtheme) .toolbarbutton-text, - #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child:not(:-moz-lwtheme) { - text-shadow: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255,255,255,.4); - } - - #main-menubar:not(:-moz-lwtheme):not(:-moz-window-inactive) { - background-color: rgba(255,255,255,.7); - border-radius: var(--toolbarbutton-border-radius); - color: black; - } - - :-moz-any(#toolbar-menubar, #TabsToolbar[tabsontop=true], #nav-bar[tabsontop=false]) .toolbarbutton-1 > .toolbarbutton-menu-dropmarker:not(:-moz-lwtheme), - :-moz-any(#toolbar-menubar, #TabsToolbar[tabsontop=true], #nav-bar[tabsontop=false]) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:not(:-moz-lwtheme), - #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child .toolbarbutton-1 > .toolbarbutton-menu-dropmarker:not(:-moz-lwtheme), - #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:not(:-moz-lwtheme) { - list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png"); - } - } - -/* ==== Windows 8/10 (flat color) styling ==== */ - - @media (-moz-os-version: windows-win8) { - /* Use a light text styling on dark window frames */ - :root[darkwindowframe="true"]:not(:-moz-lwtheme):not(:-moz-window-inactive) { - --window-text-color: white; - } - } - - @media (-moz-os-version: windows-win8), - (-moz-os-version: windows-win10) { - /* Fade text stylings on window inactivity */ - :root:not(:-moz-lwtheme):-moz-window-inactive { - --window-text-color: rgba(0, 0, 0, 0.5); - } - } - -/* ==== ==== */ - - #main-window[sizemode=fullscreen]:not(:-moz-lwtheme) { - -moz-appearance: none; - background-color: #556; - } - - #toolbar-menubar:not(:-moz-lwtheme), - #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme), - #nav-bar[tabsontop=false]:not(:-moz-lwtheme), - #nav-bar[tabsontop=false]:not(:-moz-lwtheme) .toolbarbutton-text, - #nav-bar + #customToolbars + #PersonalToolbar:-moz-any([collapsed=true],[moz-collapsed=true]) + #TabsToolbar[tabsontop=false]:last-child:not(:-moz-lwtheme) { - background-color: transparent !important; - color: var(--window-text-color); - border-left-style: none !important; - border-right-style: none !important; - } - - #main-menubar > menu:not(:-moz-lwtheme) { - color: inherit; - } - - :-moz-any(#toolbar-menubar, #nav-bar[tabsontop=false]) :-moz-any(@primaryToolbarButtons@):not(:-moz-any(#alltabs-button,#sync-button[status])) > .toolbarbutton-icon:not(:-moz-lwtheme), - :-moz-any(#toolbar-menubar, #nav-bar[tabsontop=false]) :-moz-any(@primaryToolbarButtons@) > toolbarbutton > .toolbarbutton-icon:not(:-moz-lwtheme), - #TabsToolbar[tabsontop=true] :-moz-any(@primaryToolbarButtons@):not(:-moz-any(#alltabs-button,#new-tab-button,#sync-button[status])) > .toolbarbutton-icon:not(:-moz-lwtheme), - #TabsToolbar[tabsontop=true] :-moz-any(@primaryToolbarButtons@) > toolbarbutton > .toolbarbutton-icon:not(:-moz-lwtheme), - #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child :-moz-any(@primaryToolbarButtons@):not(:-moz-any(#alltabs-button,#new-tab-button,#sync-button[status])) > .toolbarbutton-icon:not(:-moz-lwtheme), - #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child :-moz-any(@primaryToolbarButtons@) > toolbarbutton > .toolbarbutton-icon:not(:-moz-lwtheme) { - list-style-image: var(--toolbarbutton-glass-image); - } - -/* Show toolbar borders on vista through win8, but not on win10 and later: */ -@media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7), - (-moz-os-version: windows-win8) { - /* Vertical toolbar border */ - #main-window[sizemode=normal] #navigator-toolbox::after, - #main-window[sizemode=normal] #navigator-toolbox[tabsontop=true] > toolbar:not(#toolbar-menubar):not(#TabsToolbar), - #main-window[sizemode=normal] #navigator-toolbox[tabsontop=false] > toolbar:not(#toolbar-menubar):not(#nav-bar) { - border-left: 1px solid @toolbarShadowColor@; - border-right: 1px solid @toolbarShadowColor@; - background-clip: padding-box; - } - #main-window[sizemode=normal] #navigator-toolbox > toolbar:-moz-lwtheme { - border-color: transparent !important; - } - #main-window[sizemode=normal] #browser-border-start, - #main-window[sizemode=normal] #browser-border-end { - display: -moz-box; - background-color: @toolbarShadowColor@; - width: 1px; - } - #main-window[sizemode=normal] #browser-bottombox { - border: 1px solid @toolbarShadowColor@; - border-top-style: none; - background-clip: padding-box; - } -} - - #main-window[sizemode=normal][tabsontop=false] #PersonalToolbar:not(:-moz-lwtheme) { - border-top-left-radius: var(--toolbarbutton-border-radius); - border-top-right-radius: var(--toolbarbutton-border-radius); - } - - #main-window[sizemode=normal] #nav-bar[tabsontop=true]:not(:-moz-lwtheme), - #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar:not(:-moz-lwtheme), - #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme), - #main-window[sizemode=normal][disablechrome] #navigator-toolbox[tabsontop=true]:not(:-moz-lwtheme)::after { - border-top-left-radius: var(--toolbarbutton-border-radius); - border-top-right-radius: var(--toolbarbutton-border-radius); - } - - /* Toolbar shadow behind tabs */ - /* This code is only needed for restored windows (i.e. sizemode=normal) - because of the border radius on the toolbar below the tab bar. */ - #main-window[sizemode=normal] #nav-bar[tabsontop=true]:not(:-moz-lwtheme), - #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + toolbar:not(:-moz-lwtheme), - #main-window[sizemode=normal] #nav-bar[tabsontop=true][collapsed=true]:not([customizing]) + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme), - #main-window[sizemode=normal][disablechrome] #navigator-toolbox[tabsontop=true]:not(:-moz-lwtheme)::after { - border-top: 1px solid @toolbarShadowColor@; - background-clip: padding-box; - } - #main-window[sizemode=normal] #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme) { - margin-bottom: -1px; - background-image: none !important; - } - #main-window[sizemode=normal] #tabbrowser-tabs[tabsontop=true] > .tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox > .scrollbox-innerbox:not(:-moz-lwtheme) { - position: relative; - } - - #navigator-toolbox[tabsontop=false] > #PersonalToolbar { - margin-top: 3px; - } - - #navigator-toolbox[tabsontop=false] > #PersonalToolbar:not(:-moz-lwtheme) { - margin-top: 2px; - border-top: 1px solid @toolbarShadowColor@; - background-image: linear-gradient(var(--toolbar-highlight-top), var(--toolbar-highlight-bottom)); - } - - @media (-moz-os-version: windows-win10) { - /* Remove gradient and make border faded */ - #navigator-toolbox[tabsontop=false] > #PersonalToolbar:not(:-moz-lwtheme) { - border-top: 1px solid rgba(10%,10%,10%,.2); - background-image: none; - } - } - - #main-window[sizemode=normal] #TabsToolbar[tabsontop=true] { - padding-left: 4px; - padding-right: 4px; - } - - #main-window[sizemode=normal] #TabsToolbar[tabsontop=false] { - padding-left: 2px; - padding-right: 2px; - } - - /* Rounded corners for when chrome is disabled */ - #main-window[sizemode=normal][disablechrome] #navigator-toolbox[tabsontop=true]:not(:-moz-lwtheme)::after { - visibility: visible; - background-color: var(--toolbar-custom-color); - background-image: linear-gradient(var(--toolbar-highlight-top), var(--toolbar-highlight-top)); - height: 4px; - } - - /* Make the window draggable by glassed toolbars (bug 555081) */ - #toolbar-menubar:not([autohide="true"]), - #TabsToolbar[tabsontop="true"], - #nav-bar[tabsontop=false], - #nav-bar + #customToolbars + #PersonalToolbar[collapsed="true"] + #TabsToolbar[tabsontop="false"]:last-child, - #navigator-toolbox > toolbar:not(#toolbar-menubar):-moz-lwtheme { - -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag"); - } - - #appcontent:not(:-moz-lwtheme) { - background-color: -moz-dialog; - } - - #navigator-toolbox[tabsontop=false] #urlbar:not(:-moz-lwtheme), - #navigator-toolbox[tabsontop=false] .searchbar-textbox:not(:-moz-lwtheme) { - background-color: rgba(255,255,255,.725); - @navbarTextboxCustomBorder@ - color: black; - } - - #navigator-toolbox[tabsontop=false] html|*.urlbar-input:not(:-moz-lwtheme)::-moz-placeholder, - #navigator-toolbox[tabsontop=false] .searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box > html|*.textbox-input:not(:-moz-lwtheme)::-moz-placeholder { - opacity: 1.0; - color: #777; - } - - #navigator-toolbox[tabsontop=false] #urlbar:not(:-moz-lwtheme):hover, - #navigator-toolbox[tabsontop=false] .searchbar-textbox:not(:-moz-lwtheme):hover { - background-color: rgba(255,255,255,.898); - } - - #navigator-toolbox[tabsontop=false] #urlbar:not(:-moz-lwtheme)[focused], - #navigator-toolbox[tabsontop=false] .searchbar-textbox:not(:-moz-lwtheme)[focused] { - background-color: white; - } - - .tabbrowser-tab:not(:-moz-lwtheme) { - text-shadow: none; - } - - #main-window[sizemode=normal] .statuspanel-inner { - /* align with the browser's side borders */ - padding-left: 1px; - padding-right: 1px; - } - - #allTabs-panel, - #ctrlTab-panel { - background: transparent; - -moz-appearance: -moz-win-glass; - border-radius: 0; - border: none; - font: normal 1.2em "Segoe UI"; - color: black; - text-shadow: white -1px -1px .35em, white -1px 1px .35em, white 1px 1px .35em, white 1px -1px .35em; - } -} - -@media not all and (-moz-windows-compositor) { - @media (-moz-windows-default-theme) { - #main-window { - background-color: rgb(185,209,234); - } - #main-window:-moz-window-inactive { - background-color: rgb(215,228,242); - } - - #toolbar-menubar:not([autohide=true]):not(:-moz-lwtheme), - #TabsToolbar[tabsontop=true]:not(:-moz-lwtheme), - #navigator-toolbox[tabsontop=false] > toolbar:not(#toolbar-menubar):not(:-moz-lwtheme) { - -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-drag"); - background-color: transparent; - } - #toolbar-menubar[autohide=true] { - background-color: transparent !important; - } - } - - #print-preview-toolbar:not(:-moz-lwtheme) { - -moz-appearance: -moz-win-browsertabbar-toolbox; - } -} - -/* ::::: fullscreen window controls ::::: */ - -#window-controls { - -moz-box-align: start; -} - -#minimize-button, -#restore-button, -#close-button { - -moz-appearance: none; - border-style: none; - margin: 0; -} -#close-button { - -moz-image-region: rect(0, 49px, 16px, 32px); -} -#close-button:hover { - -moz-image-region: rect(16px, 49px, 32px, 32px); -} -#close-button:hover:active { - -moz-image-region: rect(32px, 49px, 48px, 32px); -} - -#minimize-button:-moz-locale-dir(rtl), -#restore-button:-moz-locale-dir(rtl), -#close-button:-moz-locale-dir(rtl) { - transform: scaleX(-1); -} - -/* ::::: splitmenu highlight style that imitates Windows 7 start menu ::::: */ -@media (-moz-os-version: windows-vista) and (-moz-windows-default-theme), - (-moz-os-version: windows-win7) and (-moz-windows-default-theme) { - .splitmenu-menuitem, - .splitmenu-menu { - -moz-appearance: none; - padding-top: 2px; - padding-bottom: 2px; - border: 1px solid transparent; - } - .splitmenu-menuitem { - -moz-margin-end: 0; - } - .splitmenu-menu { - -moz-margin-start: -1px; - } - .splitmenu-menuitem:-moz-locale-dir(ltr), - .splitmenu-menu:-moz-locale-dir(rtl) { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; - } - .splitmenu-menu:-moz-locale-dir(ltr), - .splitmenu-menuitem:-moz-locale-dir(rtl) { - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; - } - - .splitmenu-menuitem > .menu-text { - -moz-margin-start: 1px !important; - -moz-margin-end: 3px !important; - } - .splitmenu-menu > .menu-right { - -moz-margin-end: -3px; - } - - .splitmenu-menuitem[iconic], - .splitmenu-menu[iconic] { - padding-bottom: 1px; - } - .splitmenu-menuitem[iconic] > .menu-iconic-left { - margin-top: -3px; - margin-bottom: -2px; - -moz-margin-start: -1px; - } - .splitmenu-menuitem[iconic] > .menu-iconic-text { - -moz-margin-start: 2px !important; - -moz-margin-end: 3px !important; - } - .splitmenu-menu[iconic] > .menu-right { - margin-top: -1px; - } - - .splitmenu-menuitem[_moz-menuactive], - .splitmenu-menu[_moz-menuactive] { - background-color: transparent; - background-image: linear-gradient(#fafbfd, #ebf3fd); - border-color: #aeccf1; - } - - .splitmenu-menuitem[disabled][_moz-menuactive], - .splitmenu-menu[disabled][_moz-menuactive] { - background-image: linear-gradient(#f8f9f9, #eaeaea); - border-color: #d8d7d7; - } - - .splitmenu-menu[_moz-menuactive]:not(:hover):not([open]) { - background-image: none; - } -} diff --git a/webbrowser/themes/windows/caption-buttons.svg b/webbrowser/themes/windows/caption-buttons.svg deleted file mode 100644 index 9342aca..0000000 --- a/webbrowser/themes/windows/caption-buttons.svg +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/webbrowser/themes/windows/click-to-play-warning-stripes.png b/webbrowser/themes/windows/click-to-play-warning-stripes.png deleted file mode 100644 index 29f15f7..0000000 Binary files a/webbrowser/themes/windows/click-to-play-warning-stripes.png and /dev/null differ diff --git a/webbrowser/themes/windows/communicator/communicator.css b/webbrowser/themes/windows/communicator/communicator.css deleted file mode 100644 index 0b57574..0000000 --- a/webbrowser/themes/windows/communicator/communicator.css +++ /dev/null @@ -1,6 +0,0 @@ -/* 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/. */ - -@import url("chrome://global/skin/"); - diff --git a/webbrowser/themes/windows/communicator/jar.mn b/webbrowser/themes/windows/communicator/jar.mn deleted file mode 100644 index 612d133..0000000 --- a/webbrowser/themes/windows/communicator/jar.mn +++ /dev/null @@ -1,7 +0,0 @@ -# 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/. - -browser.jar: -% skin communicator classic/1.0 %skin/classic/communicator/ - skin/classic/communicator/communicator.css diff --git a/webbrowser/themes/windows/communicator/moz.build b/webbrowser/themes/windows/communicator/moz.build deleted file mode 100644 index c97072b..0000000 --- a/webbrowser/themes/windows/communicator/moz.build +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# 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/. - -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/webbrowser/themes/windows/downloads/allDownloadsViewOverlay.css b/webbrowser/themes/windows/downloads/allDownloadsViewOverlay.css deleted file mode 100644 index bd3b789..0000000 --- a/webbrowser/themes/windows/downloads/allDownloadsViewOverlay.css +++ /dev/null @@ -1,178 +0,0 @@ -/* 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/. */ - -#downloadsRichListBox { - /** The default listbox appearance comes with an unwanted margin. **/ - -moz-appearance: none; - margin: 0; -} - -#downloadsRichListBox > richlistitem.download { - height: 6em; -} - -.downloadTypeIcon { - -moz-margin-start: 8px; - -moz-margin-end: 8px; - /* explicitly size the icon, so size doesn't vary on hidpi systems */ - height: 32px; - width: 32px; -} - -.blockedIcon { - list-style-image: url("chrome://global/skin/icons/Error.png"); -} - -.downloadTarget { - margin-bottom: 3px; - cursor: inherit; -} - -.downloadDetails { - opacity: 0.7; - font-size: 95%; - cursor: inherit; -} - -.downloadButton { - -moz-appearance: none; - background: transparent; - min-width: 0; - min-height: 0; - margin: 3px; - border: none; - padding: 5px; - list-style-image: url("chrome://browser/skin/downloads/buttons.png"); -} - -/*** Button icons ***/ - -.downloadButton.downloadCancel { - -moz-image-region: rect(0px, 16px, 16px, 0px); -} - -richlistitem.download:hover > .downloadButton.downloadCancel { - -moz-image-region: rect(0px, 32px, 16px, 16px); -} - -richlistitem.download:hover > .downloadButton.downloadCancel:hover { - -moz-image-region: rect(0px, 48px, 16px, 32px); -} - -richlistitem.download:hover > .downloadButton.downloadCancel:active { - -moz-image-region: rect(0px, 64px, 16px, 48px); -} - -.downloadButton.downloadShow { - -moz-image-region: rect(16px, 16px, 32px, 0px); -} - -richlistitem.download:hover > .downloadButton.downloadShow { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} - -richlistitem.download:hover > .downloadButton.downloadShow:hover { - -moz-image-region: rect(16px, 48px, 32px, 32px); -} - -richlistitem.download:hover > .downloadButton.downloadShow:active { - -moz-image-region: rect(16px, 64px, 32px, 48px); -} - -.downloadButton.downloadRetry { - -moz-image-region: rect(32px, 16px, 48px, 0px); -} - -richlistitem.download:hover > .downloadButton.downloadRetry { - -moz-image-region: rect(32px, 32px, 48px, 16px); -} - -richlistitem.download:hover > .downloadButton.downloadRetry:hover { - -moz-image-region: rect(32px, 48px, 48px, 32px); -} - -richlistitem.download:hover > .downloadButton.downloadRetry:active { - -moz-image-region: rect(32px, 64px, 48px, 48px); -} - -@media not all and (-moz-os-version: windows-vista) and (-moz-windows-default-theme) { - @media not all and (-moz-os-version: windows-win7) and (-moz-windows-default-theme) { - richlistitem.download[selected] > .downloadButton.downloadCancel { - -moz-image-region: rect(0px, 80px, 16px, 64px); - } - - richlistitem.download[selected]:hover > .downloadButton.downloadCancel { - -moz-image-region: rect(0px, 96px, 16px, 80px); - } - - richlistitem.download[selected]:hover > .downloadButton.downloadCancel:hover { - -moz-image-region: rect(0px, 112px, 16px, 96px); - } - - richlistitem.download[selected]:hover > .downloadButton.downloadCancel:active { - -moz-image-region: rect(0px, 128px, 16px, 112px); - } - - richlistitem.download[selected] > .downloadButton.downloadShow { - -moz-image-region: rect(16px, 80px, 32px, 64px); - } - - richlistitem.download[selected]:hover > .downloadButton.downloadShow { - -moz-image-region: rect(16px, 96px, 32px, 80px); - } - - richlistitem.download[selected]:hover > .downloadButton.downloadShow:hover { - -moz-image-region: rect(16px, 112px, 32px, 96px); - } - - richlistitem.download[selected]:hover > .downloadButton.downloadShow:active { - -moz-image-region: rect(16px, 128px, 32px, 112px); - } - - richlistitem.download[selected] > .downloadButton.downloadRetry { - -moz-image-region: rect(32px, 80px, 48px, 64px); - } - - richlistitem.download[selected]:hover > .downloadButton.downloadRetry { - -moz-image-region: rect(32px, 96px, 48px, 80px); - } - - richlistitem.download[selected]:hover > .downloadButton.downloadRetry:hover { - -moz-image-region: rect(32px, 112px, 48px, 96px); - } - - richlistitem.download[selected]:hover > .downloadButton.downloadRetry:active { - -moz-image-region: rect(32px, 128px, 48px, 112px); - } - } -} - -@media (-moz-os-version: windows-vista) and (-moz-windows-default-theme), - (-moz-os-version: windows-win7) and (-moz-windows-default-theme) { - /* - -moz-appearance: menuitem is almost right, but the hover effect is not - transparent and is lighter than desired. - - Copied from the autocomplete richlistbox styling in - toolkit/themes/windows/global/autocomplete.css - - This styling should be kept in sync with the style from the above file. - */ - #downloadsRichListBox > richlistitem.download[selected] { - color: inherit; - background-color: transparent; - /* four gradients for the bevel highlights on each edge, one for blue background */ - background-image: - linear-gradient(to bottom, rgba(255,255,255,0.9) 3px, transparent 3px), - linear-gradient(to right, rgba(255,255,255,0.5) 3px, transparent 3px), - linear-gradient(to left, rgba(255,255,255,0.5) 3px, transparent 3px), - linear-gradient(to top, rgba(255,255,255,0.4) 3px, transparent 3px), - linear-gradient(to bottom, rgba(163,196,247,0.3), rgba(122,180,246,0.3)); - background-clip: content-box; - border-radius: 6px; - outline: 1px solid rgb(124,163,206); - -moz-outline-radius: 3px; - outline-offset: -2px; - } -} diff --git a/webbrowser/themes/windows/downloads/buttons.png b/webbrowser/themes/windows/downloads/buttons.png deleted file mode 100644 index ca87b40..0000000 Binary files a/webbrowser/themes/windows/downloads/buttons.png and /dev/null differ diff --git a/webbrowser/themes/windows/downloads/contentAreaDownloadsView.css b/webbrowser/themes/windows/downloads/contentAreaDownloadsView.css deleted file mode 100644 index ece99ea..0000000 --- a/webbrowser/themes/windows/downloads/contentAreaDownloadsView.css +++ /dev/null @@ -1,22 +0,0 @@ -/* 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/. */ - -@import url("chrome://global/skin/inContentUI.css"); - -.downloadButton { - box-shadow: none; -} - -.downloadButton:not([disabled="true"]):hover:active, -.downloadButton:not([disabled]):hover:active { - background: transparent; - border: none; - box-shadow: none; -} - -#downloadsListEmptyDescription { - margin: 1em; - text-align: center; - color: GrayText; -} diff --git a/webbrowser/themes/windows/downloads/download-notification-finish.png b/webbrowser/themes/windows/downloads/download-notification-finish.png deleted file mode 100644 index 5194f5d..0000000 Binary files a/webbrowser/themes/windows/downloads/download-notification-finish.png and /dev/null differ diff --git a/webbrowser/themes/windows/downloads/download-notification-start.png b/webbrowser/themes/windows/downloads/download-notification-start.png deleted file mode 100644 index bd548b1..0000000 Binary files a/webbrowser/themes/windows/downloads/download-notification-start.png and /dev/null differ diff --git a/webbrowser/themes/windows/downloads/download-summary.png b/webbrowser/themes/windows/downloads/download-summary.png deleted file mode 100644 index 67003c7..0000000 Binary files a/webbrowser/themes/windows/downloads/download-summary.png and /dev/null differ diff --git a/webbrowser/themes/windows/downloads/downloads.css b/webbrowser/themes/windows/downloads/downloads.css deleted file mode 100644 index f169896..0000000 --- a/webbrowser/themes/windows/downloads/downloads.css +++ /dev/null @@ -1,487 +0,0 @@ -/* 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/. */ - -/*** Panel and outer controls ***/ - -#downloadsPanel > .panel-arrowcontainer > .panel-arrowcontent { - padding: 0; -} - -#downloadsListBox { - background-color: transparent; - padding: 4px; - color: inherit; -} - -#downloadsPanel:not([hasdownloads]) > #downloadsListBox { - display: none; -} - -#downloadsPanel[hasdownloads] > #emptyDownloads { - display: none; -} - -#emptyDownloads { - padding: 10px 20px; - max-width: 40ch; -} - -#downloadsHistory { - background: transparent; - cursor: pointer; -} - -@media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { - #downloadsHistory { - color: -moz-nativehyperlinktext; - } -} - -#downloadsPanel[keyfocus] > #downloadsFooter > #downloadsHistory:focus { - outline: 1px -moz-dialogtext dotted; - outline-offset: -1px; -} - -#downloadsHistory > .button-box { - border: none; - margin: 1em; -} - -#downloadsFooter { - background-color: hsla(210,4%,10%,.04); - box-shadow: 0 1px 0 hsla(210,4%,10%,.08) inset; - transition-duration: 150ms; - transition-property: background-color; -} - -#downloadsFooter:hover { - background-color: hsla(210,4%,10%,.05); -} - -#downloadsFooter:hover:active { - background-color: hsla(210,4%,10%,.1); - box-shadow: 0 2px 0 0 hsla(210,4%,10%,.1) inset; -} - -@media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { - @media (-moz-windows-default-theme) { - #downloadsFooter { - border-bottom-left-radius: 3px; - border-bottom-right-radius: 3px; - transition-duration: 0s; - } - - #downloadsFooter, - #downloadsFooter:hover, - #downloadsFooter:hover:active { - background-color: #f1f5fb; - box-shadow: 0px 1px 2px rgb(204,214,234) inset; - } - } -} - -/*** Downloads Summary and List items ***/ - -#downloadsSummary, -richlistitem[type="download"] { - height: 7em; - -moz-padding-end: 0; - color: inherit; -} - -#downloadsSummary { - padding: 8px 38px 8px 12px; - cursor: pointer; - -moz-user-focus: normal; -} - -#downloadsPanel[keyfocus] > #downloadsFooter > #downloadsSummary:focus { - outline: 1px -moz-dialogtext dotted; - outline-offset: -5px; -} - -#downloadsSummary > .downloadTypeIcon { - list-style-image: url("chrome://browser/skin/downloads/download-summary.png"); -} - -#downloadsSummaryDescription { - color: -moz-nativehyperlinktext; -} - -richlistitem[type="download"] { - margin: 0; - border-top: 1px solid hsla(0,0%,100%,.3); - border-bottom: 1px solid hsla(220,18%,51%,.25); - background: transparent; - padding: 8px; -} - -@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista), - (-moz-windows-default-theme) and (-moz-os-version: windows-win7) { - richlistitem[type="download"] { - border: 1px solid transparent; - border-bottom: 1px solid hsl(213,40%,90%); - } -} - -richlistitem[type="download"]:first-child { - border-top: 1px solid transparent; -} - -@media (-moz-windows-default-theme) { - richlistitem[type="download"]:last-child { - border-bottom: 1px solid transparent; - } -} - -#downloadsPanel[keyfocus] > #downloadsListBox:focus > richlistitem[type="download"][selected] { - outline: 1px -moz-dialogtext dotted; - outline-offset: -1px; -} - -.downloadTypeIcon { - -moz-margin-end: 8px; - /* Prevent flickering when changing states. */ - height: 32px; - width: 32px; -} - -.blockedIcon { - list-style-image: url("chrome://global/skin/icons/Error.png"); -} - -/* We hold .downloadDisplayName, .downloadProgress and .downloadDetails - inside of a vbox with class .downloadContainer. We set the font-size of - the entire container to 90% because: - - 1) This is the size that we want .downloadDetails to be - 2) The container's width is set by localizers by &downloadDetails.width;, - which is a ch unit. Since this is the value that should control the - panel width, we apply it to the outer container to constrain - .downloadDisplayName and .downloadProgress. - - Finally, since we want .downloadDisplayName's font-size to be at 100% of - the font-size of .downloadContainer's parent, we use calc to go from the - smaller font-size back to the original font-size. - */ -#downloadsSummaryDetails, -.downloadContainer { - font-size: 90%; -} - -#downloadsSummaryDescription, -.downloadDisplayName { - margin-bottom: 6px; - cursor: inherit; -} - -.downloadDisplayName { - font-size: calc(100%/0.9); -} - -#downloadsSummaryDetails, -.downloadDetails { - opacity: 0.6; - cursor: inherit; -} - -.downloadButton { - -moz-appearance: none; - min-width: 0; - min-height: 0; - margin: 3px; - border: none; - background: transparent; - padding: 5px; - list-style-image: url("chrome://browser/skin/downloads/buttons.png"); -} - -.downloadButton > .button-box { - border: 1px solid transparent; - padding: 0; -} - -#downloadsPanel[keyfocus] .downloadButton:focus > .button-box { - border: 1px dotted ThreeDDarkShadow; -} - -/*** Highlighted list items ***/ - -#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover { - background-color: hsla(210,4%,10%,.08); - outline: 1px solid hsla(210,4%,10%,.1); - outline-offset: -1px; - cursor: pointer; -} - -#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover:active { - background-color: hsla(210,4%,10%,.15); - outline: 1px solid hsla(210,4%,10%,.15); - box-shadow: 0 1px 0 0 hsla(210,4%,10%,.05) inset; -} - -@media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { - #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover { - border-radius: 3px; - outline: 0; - border-top: 1px solid hsla(0,0%,100%,.2); - border-bottom: 1px solid hsla(0,0%,0%,.2); - background-color: Highlight; - color: HighlightText; - } - - #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover:active { - background-color: Highlight; - outline: 0; - box-shadow: none; - } -} - -@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista), - (-moz-windows-default-theme) and (-moz-os-version: windows-win7) { - #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover { - border: 1px solid hsl(213,45%,65%); - box-shadow: 0 0 0 1px hsla(0,0%,100%,.5) inset, - 0 1px 0 hsla(0,0%,100%,.3) inset; - background-image: linear-gradient(hsl(212,86%,92%), hsl(212,91%,86%)); - color: black; - } -} - -/*** Button icons ***/ - -.downloadButton.downloadCancel { - -moz-image-region: rect(0px, 16px, 16px, 0px); -} -richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel { - -moz-image-region: rect(0px, 32px, 16px, 16px); -} -richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:hover { - -moz-image-region: rect(0px, 48px, 16px, 32px); -} -richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:active { - -moz-image-region: rect(0px, 64px, 16px, 48px); -} - -.downloadButton.downloadShow { - -moz-image-region: rect(16px, 16px, 32px, 0px); -} -richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} -richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow:hover { - -moz-image-region: rect(16px, 48px, 32px, 32px); -} -richlistitem[type="download"]:hover > stack > .downloadButton.downloadShow:active { - -moz-image-region: rect(16px, 64px, 32px, 48px); -} - -.downloadButton.downloadRetry { - -moz-image-region: rect(32px, 16px, 48px, 0px); -} -richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry { - -moz-image-region: rect(32px, 32px, 48px, 16px); -} -richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:hover { - -moz-image-region: rect(32px, 48px, 48px, 32px); -} -richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:active { - -moz-image-region: rect(32px, 64px, 48px, 48px); -} - -/*** Status and progress indicator ***/ - -#downloads-indicator-anchor { - /* Makes the outermost stack element positioned, so that its contents are - rendered over the main browser window in the Z order. This is required by - the animated event notification. */ - position: relative; -} - -#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar[brighttext] #downloads-indicator[counter] > #downloads-indicator-anchor { - /* Use a dark download button when appropriate to improve text legibility */ - background: hsla(94,56%,18%,.3) padding-box; - background-image: linear-gradient(hsla(0,0%,0%,.1), hsla(0,0%,0%,.4)); - border-color: hsla(29,12%,90%,.2) hsla(29,12%,90%,.2) hsla(29,12%,90%,.2); - box-shadow: 0 1px hsla(0,0%,0%,.05) inset, - 0 1px hsla(29,12%,90%,.05), - 0 0 2px hsla(29,12%,90%,.05); -} - -/*** Main indicator icon ***/ - -#downloads-indicator-icon { - background: -moz-image-rect(var(--toolbarbutton-image), - 0, 108, 18, 90) center no-repeat; - min-width: 18px; - min-height: 18px; -} - -toolbar[brighttext] #downloads-indicator-icon { - background: -moz-image-rect(var(--toolbarbutton-inverted-image), - 0, 108, 18, 90) center no-repeat; -} - -#downloads-indicator[attention] > #downloads-indicator-anchor > #downloads-indicator-icon { - background: -moz-image-rect(var(--toolbarbutton-image), - 19, 108, 36, 90) center no-repeat; -} - -@media (-moz-windows-compositor) { - :-moz-any(#toolbar-menubar, #nav-bar[tabsontop=false]) #downloads-indicator-icon:not(:-moz-lwtheme), - #TabsToolbar[tabsontop=true] #downloads-indicator-icon:not(:-moz-lwtheme), - #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child #downloads-indicator-icon:not(:-moz-lwtheme) { - background: -moz-image-rect(var(--toolbarbutton-glass-image), - 0, 108, 18, 90) center no-repeat; - } - #downloads-indicator[attention] > #downloads-indicator-anchor > #downloads-indicator-icon { - background: -moz-image-rect(var(--toolbarbutton-glass-image), - 19, 108, 36, 90) center no-repeat; -} - - -} - -/* In the next few rules, we use :not([counter]) as a shortcut that is - equivalent to -moz-any([progress], [paused]). */ - -#downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { - background: -moz-image-rect(var(--toolbarbutton-image), - 0, 108, 18, 90) center no-repeat; - background-size: 12px; -} - -toolbar[brighttext] #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { - background: -moz-image-rect(var(--toolbarbutton-inverted-image), - 0, 108, 18, 90) center no-repeat; -} - -@media (-moz-windows-compositor) { - :-moz-any(#toolbar-menubar, #nav-bar[tabsontop=false]) #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter:not(:-moz-lwtheme), - #TabsToolbar[tabsontop=true] #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter:not(:-moz-lwtheme), - #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child #downloads-indicator:not([counter]) > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter:not(:-moz-lwtheme) { - background: -moz-image-rect(var(--toolbarbutton-glass-image), - 0, 108, 18, 90) center no-repeat; - } - #downloads-indicator:not([counter])[attention] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-counter { - background: -moz-image-rect(var(--toolbarbutton-glass-image), - 19, 108, 36, 90) center no-repeat; - } -} - -/*** Download notifications ***/ - -#downloads-indicator-notification { - opacity: 0; - background-size: 16px; - background-position: center; - background-repeat: no-repeat; -} - -@keyframes downloadsIndicatorNotificationStartRight { - from { opacity: 0; transform: translate(-128px, 128px) scale(8); } - 20% { opacity: .85; animation-timing-function: ease-out; } - to { opacity: 0; transform: translate(0) scale(1); } -} - -@keyframes downloadsIndicatorNotificationStartLeft { - from { opacity: 0; transform: translate(128px, 128px) scale(8); } - 20% { opacity: .85; animation-timing-function: ease-out; } - to { opacity: 0; transform: translate(0) scale(1); } -} - -#downloads-indicator[notification="start"] > #downloads-indicator-anchor > #downloads-indicator-notification { - background-image: url("chrome://browser/skin/downloads/download-notification-start.png"); - animation-name: downloadsIndicatorNotificationStartRight; - animation-duration: 1s; -} - -#downloads-indicator[notification="start"]:-moz-locale-dir(rtl) > #downloads-indicator-anchor > #downloads-indicator-notification { - animation-name: downloadsIndicatorNotificationStartLeft; -} - -@keyframes downloadsIndicatorNotificationFinish { - from { opacity: 0; transform: scale(1); } - 20% { opacity: .65; animation-timing-function: ease-in; } - to { opacity: 0; transform: scale(8); } -} - -#downloads-indicator[notification="finish"] > #downloads-indicator-anchor > #downloads-indicator-notification { - background-image: url("chrome://browser/skin/downloads/download-notification-finish.png"); - animation-name: downloadsIndicatorNotificationFinish; - animation-duration: 1s; -} - -/*** Progress bar and text ***/ - -#downloads-indicator-counter { - height: 9px; - margin: -3px 0px 0px 0px; - color: hsl(0,0%,30%); - text-shadow: hsla(0,0%,100%,.5) 0 1px; - font-size: 9px; - line-height: 9px; - text-align: center; -} - -toolbar[brighttext] #downloads-indicator-counter { - color: white; - text-shadow: 0 0 1px rgba(0,0,0,.7), - 0 1px 1.5px rgba(0,0,0,.5); -} - -#downloads-indicator-progress { - width: 16px; - height: 5px; - min-width: 0; - min-height: 0; - margin-top: 1px; - margin-bottom: 2px; - border-radius: 2px; - box-shadow: 0 1px 0 hsla(0,0%,100%,.4); -} - -#downloads-indicator-progress > .progress-bar { - -moz-appearance: none; - min-width: 0; - min-height: 0; - /* The background-clip: border-box; and background-image: none; are there to expand the background-color behind the border */ - background-clip: padding-box, border-box; - background-color: rgb(90, 201, 66); - background-image: linear-gradient(transparent 1px, rgba(255, 255, 255, 0.4) 1px, rgba(255, 255, 255, 0.4) 2px, transparent 2px), none; - border: 1px solid; - border-color: rgba(0,43,86,.6) rgba(0,43,86,.4) rgba(0,43,86,.4); - border-radius: 2px 0 0 2px; -} - -#downloads-indicator-progress > .progress-remainder { - -moz-appearance: none; - min-width: 0; - min-height: 0; - background-image: linear-gradient(#505050, #575757); - border: 1px solid; - border-color: hsla(0,0%,0%,.6) hsla(0,0%,0%,.4) hsla(0,0%,0%,.4); - -moz-border-start: none; - border-radius: 0 2px 2px 0; -} - -#downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-bar { - background-color: rgb(220, 230, 81); -} - -#downloads-indicator[paused] > #downloads-indicator-anchor > #downloads-indicator-progress-area > #downloads-indicator-progress > .progress-remainder { - background-image: linear-gradient(#4b5000, #515700); -} - -toolbar[mode="full"] > #downloads-indicator > .toolbarbutton-text { - margin: 0; - text-align: center; -} - -#downloads-indicator-counter { - margin-bottom: -1px; -} diff --git a/webbrowser/themes/windows/engineManager.css b/webbrowser/themes/windows/engineManager.css deleted file mode 100644 index 18817cd..0000000 --- a/webbrowser/themes/windows/engineManager.css +++ /dev/null @@ -1,16 +0,0 @@ -%if 0 -/* 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/. */ -%endif - -#engineList treechildren::-moz-tree-image(engineName) { - -moz-margin-end: 4px; - -moz-margin-start: 1px; - width: 16px; - height: 16px; -} - -#engineList treechildren::-moz-tree-row { - height: 20px; -} diff --git a/webbrowser/themes/windows/feeds/feed-icons-16.png b/webbrowser/themes/windows/feeds/feed-icons-16.png deleted file mode 100644 index b822aa4..0000000 Binary files a/webbrowser/themes/windows/feeds/feed-icons-16.png and /dev/null differ diff --git a/webbrowser/themes/windows/feeds/feedIcon.png b/webbrowser/themes/windows/feeds/feedIcon.png deleted file mode 100644 index b4d5994..0000000 Binary files a/webbrowser/themes/windows/feeds/feedIcon.png and /dev/null differ diff --git a/webbrowser/themes/windows/feeds/feedIcon16.png b/webbrowser/themes/windows/feeds/feedIcon16.png deleted file mode 100644 index 7c3aceb..0000000 Binary files a/webbrowser/themes/windows/feeds/feedIcon16.png and /dev/null differ diff --git a/webbrowser/themes/windows/feeds/subscribe-ui.css b/webbrowser/themes/windows/feeds/subscribe-ui.css deleted file mode 100644 index 8ca5328..0000000 --- a/webbrowser/themes/windows/feeds/subscribe-ui.css +++ /dev/null @@ -1,29 +0,0 @@ -/* 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/. */ - -.alwaysUse { - padding: 5px; -} - -.handlersMenuPopup > menuitem { - -moz-padding-start: 23px; -} - -.handlersMenuPopup > menuitem.menuitem-iconic { - -moz-padding-start: 2px; -} - -.handlersMenuPopup > .menuitem-iconic > .menu-iconic-left { - display: -moz-box; - min-width: 16px; - -moz-padding-end: 2px; -} - -.chooseApplicationMenuItem { - list-style-image: url("chrome://browser/skin/preferences/application.png"); -} - -#feedHeader[dir="rtl"] .handlersMenuList > menupopup { - direction: rtl; -} diff --git a/webbrowser/themes/windows/feeds/subscribe.css b/webbrowser/themes/windows/feeds/subscribe.css deleted file mode 100644 index dc9304b..0000000 --- a/webbrowser/themes/windows/feeds/subscribe.css +++ /dev/null @@ -1,163 +0,0 @@ -/* 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/. */ - -html { - background: -moz-Dialog; - font: 3mm tahoma,arial,helvetica,sans-serif; -} - -#feedBody { - border: 1px solid THreeDShadow; - padding: 3em; - -moz-padding-start: 30px; - margin: 2em auto; - background: -moz-Field; -} - -#feedHeaderContainer { - border: 1px solid ThreeDShadow; - border-radius: 10px; - margin: -4em auto 0 auto; - background-color: InfoBackground; -} - -#feedHeader { - margin-top: 4.9em; - margin-bottom: 1em; - -moz-margin-start: 1.4em; - -moz-margin-end: 1em; - -moz-padding-start: 2.9em; - font-size: 110%; - color: InfoText; -} - -#feedIntroText { - display: none; -} - -.feedBackground { - background: url("chrome://browser/skin/feeds/feedIcon.png") 0% 10% no-repeat InfoBackground; -} - -.videoPodcastBackground { - background: url("chrome://browser/skin/feeds/videoFeedIcon.png") 0% 10% no-repeat InfoBackground; -} - -.audioPodcastBackground { - background: url("chrome://browser/skin/feeds/audioFeedIcon.png") 0% 10% no-repeat InfoBackground; -} - -#feedHeader[dir="rtl"] { - background-position: 100% 10%; -} - -#feedHeader[firstrun="true"] #feedIntroText { - padding-top: 0.1em; - -moz-padding-start: 0.6em; - display: block; -} - -#feedHeader[firstrun="true"] > #feedSubscribeLine { - -moz-padding-start: 1.8em; -} - -#feedSubscribeLine { - padding-top: 0.2em; -} - -img { - max-width: 100%; -} - -/* Don't print subscription UI */ -@media print { - #feedHeaderContainer { - display: none; - } -} - -body { - margin: 0; - padding: 0 3em; - color: -moz-fieldText; - font: message-box; -} - -h1 { - font-size: 160%; - border-bottom: 2px solid ThreeDLightShadow; - margin: 0 0 .2em 0; -} - -h2 { - color: ThreeDDarkShadow; - font-size: 110%; - font-weight: normal; - margin: 0 0 .6em 0; -} - -#feedTitleLink { - float: right; - -moz-margin-start: .6em; - -moz-margin-end: 0; - margin-top: 0; - margin-bottom: 0; -} - -a[href] img { - border: none; -} - -#feedTitleContainer { - -moz-margin-start: 0; - -moz-margin-end: .6em; - margin-top: 0; - margin-bottom: 0; -} - -#feedTitleImage { - -moz-margin-start: .6em; - -moz-margin-end: 0; - margin-top: 0; - margin-bottom: 0; - max-width: 300px; - max-height: 150px; -} - -.feedEntryContent { - font-size: 110%; -} - -.link { - color: #0000FF; - text-decoration: underline; - cursor: pointer; -} - -.link:hover:active { - color: #FF0000; -} - -.lastUpdated { - font-size: 85%; - font-weight: normal; -} - -.type-icon { - vertical-align: bottom; - height: 16px; - width: 16px; -} - -.enclosures { - border: 1px solid THreeDShadow; - padding: 1em; - margin: 1em auto; - background: -moz-Dialog; -} - -.enclosure { - vertical-align: middle; - margin-left: 2px; -} diff --git a/webbrowser/themes/windows/icon.png b/webbrowser/themes/windows/icon.png deleted file mode 100644 index ff4f21f..0000000 Binary files a/webbrowser/themes/windows/icon.png and /dev/null differ diff --git a/webbrowser/themes/windows/identity-icons-generic.png b/webbrowser/themes/windows/identity-icons-generic.png deleted file mode 100644 index a39e493..0000000 Binary files a/webbrowser/themes/windows/identity-icons-generic.png and /dev/null differ diff --git a/webbrowser/themes/windows/identity-icons-https-ev.png b/webbrowser/themes/windows/identity-icons-https-ev.png deleted file mode 100644 index d49be13..0000000 Binary files a/webbrowser/themes/windows/identity-icons-https-ev.png and /dev/null differ diff --git a/webbrowser/themes/windows/identity-icons-https-mixed-active.png b/webbrowser/themes/windows/identity-icons-https-mixed-active.png deleted file mode 100644 index 3c77bc8..0000000 Binary files a/webbrowser/themes/windows/identity-icons-https-mixed-active.png and /dev/null differ diff --git a/webbrowser/themes/windows/identity-icons-https.png b/webbrowser/themes/windows/identity-icons-https.png deleted file mode 100644 index ffd6694..0000000 Binary files a/webbrowser/themes/windows/identity-icons-https.png and /dev/null differ diff --git a/webbrowser/themes/windows/identity.png b/webbrowser/themes/windows/identity.png deleted file mode 100644 index 0dcccd4..0000000 Binary files a/webbrowser/themes/windows/identity.png and /dev/null differ diff --git a/webbrowser/themes/windows/imagedocument.png b/webbrowser/themes/windows/imagedocument.png deleted file mode 100644 index ff4f21f..0000000 Binary files a/webbrowser/themes/windows/imagedocument.png and /dev/null differ diff --git a/webbrowser/themes/windows/jar.mn b/webbrowser/themes/windows/jar.mn deleted file mode 100644 index 4422bb6..0000000 --- a/webbrowser/themes/windows/jar.mn +++ /dev/null @@ -1,168 +0,0 @@ -# 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/. - -browser.jar: -% skin browser classic/1.0 %skin/classic/browser/ - skin/classic/browser/sanitizeDialog.css -* skin/classic/browser/aboutPrivateBrowsing.css -* skin/classic/browser/aboutSessionRestore.css - skin/classic/browser/aboutSessionRestore-window-icon.png - skin/classic/browser/aboutCertError.css - skin/classic/browser/aboutCertError_sectionCollapsed.png - skin/classic/browser/aboutCertError_sectionCollapsed-rtl.png - skin/classic/browser/aboutCertError_sectionExpanded.png -#ifdef MOZ_SERVICES_SYNC - skin/classic/browser/aboutSyncTabs.css -#endif -* skin/classic/browser/autocomplete.css - skin/classic/browser/actionicon-tab.png - skin/classic/browser/appmenu-icons.png - skin/classic/browser/appmenu-dropmarker.png -* skin/classic/browser/browser.css - skin/classic/browser/caption-buttons.svg - skin/classic/browser/click-to-play-warning-stripes.png -* skin/classic/browser/engineManager.css - skin/classic/browser/Geolocation-16.png - skin/classic/browser/Geolocation-64.png - skin/classic/browser/Info.png - skin/classic/browser/identity.png - skin/classic/browser/imagedocument.png - skin/classic/browser/identity-icons-generic.png - skin/classic/browser/identity-icons-https.png - skin/classic/browser/identity-icons-https-ev.png - skin/classic/browser/identity-icons-https-mixed-active.png - skin/classic/browser/keyhole-forward-mask.svg - skin/classic/browser/KUI-background.png - skin/classic/browser/KUI-close.png - skin/classic/browser/livemark-folder.png - skin/classic/browser/menu-back.png - skin/classic/browser/menu-forward.png - skin/classic/browser/mixed-content-blocked-16.png - skin/classic/browser/mixed-content-blocked-64.png - skin/classic/browser/monitor.png - skin/classic/browser/monitor_16-10.png - skin/classic/browser/pageInfo.css - skin/classic/browser/pageInfo.png - skin/classic/browser/page-livemarks.png (feeds/feedIcon16.png) - skin/classic/browser/pointerLock-16.png - skin/classic/browser/pointerLock-64.png - skin/classic/browser/Privacy-16.png - skin/classic/browser/Privacy-32.png - skin/classic/browser/Privacy-48.png - skin/classic/browser/Privacy-64.png - skin/classic/browser/privatebrowsing-light.png - skin/classic/browser/privatebrowsing-dark.png - skin/classic/browser/reload-stop-go.png - skin/classic/browser/sanitize.png - skin/classic/browser/searchbar.css - skin/classic/browser/searchbar-dropdown-arrow.png - skin/classic/browser/Secure24.png - skin/classic/browser/setDesktopBackground.css - skin/classic/browser/slowStartup-16.png - skin/classic/browser/Toolbar.png - skin/classic/browser/Toolbar-glass.png - skin/classic/browser/Toolbar-inverted.png - skin/classic/browser/Toolbar.svg - skin/classic/browser/Toolbar-glass.svg - skin/classic/browser/Toolbar-inverted.svg - skin/classic/browser/toolbarbutton-dropdown-arrow.png - skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png - skin/classic/browser/urlbar-arrow.png - skin/classic/browser/urlbar-popup-blocked.png - skin/classic/browser/urlbar-history-dropmarker.png - skin/classic/browser/web-notifications-icon.svg - skin/classic/browser/web-notifications-tray.svg - skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png) - skin/classic/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png) - skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png) -#ifdef MOZ_WEBRTC - skin/classic/browser/webRTC-shareDevice-16.png - skin/classic/browser/webRTC-shareDevice-64.png - skin/classic/browser/webRTC-sharingDevice-16.png -#endif - skin/classic/browser/downloads/buttons.png (downloads/buttons.png) - skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png) - skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png) - skin/classic/browser/downloads/download-summary.png (downloads/download-summary.png) - skin/classic/browser/downloads/downloads.css (downloads/downloads.css) - skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css) - skin/classic/browser/downloads/contentAreaDownloadsView.css (downloads/contentAreaDownloadsView.css) - skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png) - skin/classic/browser/feeds/feedIcon16.png (feeds/feedIcon16.png) - skin/classic/browser/feeds/videoFeedIcon.png (feeds/feedIcon.png) - skin/classic/browser/feeds/videoFeedIcon16.png (feeds/feedIcon16.png) - skin/classic/browser/feeds/audioFeedIcon.png (feeds/feedIcon.png) - skin/classic/browser/feeds/audioFeedIcon16.png (feeds/feedIcon16.png) - skin/classic/browser/feeds/feed-icons-16.png (feeds/feed-icons-16.png) - skin/classic/browser/feeds/subscribe.css (feeds/subscribe.css) - skin/classic/browser/feeds/subscribe-ui.css (feeds/subscribe-ui.css) -* skin/classic/browser/newtab/newTab.css (newtab/newTab.css) - skin/classic/browser/newtab/controls.png (../shared/newtab/controls.png) - skin/classic/browser/newtab/noise.png (../shared/newtab/noise.png) - skin/classic/browser/newtab/pinned.png (../shared/newtab/pinned.png) - skin/classic/browser/places/places.css (places/places.css) -* skin/classic/browser/places/organizer.css (places/organizer.css) - skin/classic/browser/places/editBookmark.png (places/editBookmark.png) - skin/classic/browser/places/bookmark.png (places/bookmark.png) - skin/classic/browser/places/query.png (places/query.png) - skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png) - skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png) - skin/classic/browser/places/calendar.png (places/calendar.png) - skin/classic/browser/places/toolbarDropMarker.png (places/toolbarDropMarker.png) - skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css) - skin/classic/browser/places/libraryToolbar.png (places/libraryToolbar.png) - skin/classic/browser/places/starred48.png (places/starred48.png) - skin/classic/browser/places/unstarred48.png (places/unstarred48.png) - skin/classic/browser/places/tag.png (places/tag.png) - skin/classic/browser/places/history.png (places/history.png) - skin/classic/browser/places/allBookmarks.png (places/allBookmarks.png) - skin/classic/browser/places/unsortedBookmarks.png (places/unsortedBookmarks.png) - skin/classic/browser/places/downloads.png (places/downloads.png) - skin/classic/browser/places/livemark-item.png (places/livemark-item.png) - skin/classic/browser/permissions/aboutPermissions.css (permissions/aboutPermissions.css) - skin/classic/browser/preferences/alwaysAsk.png (preferences/alwaysAsk.png) - skin/classic/browser/preferences/application.png (preferences/application.png) - skin/classic/browser/preferences/mail.png (preferences/mail.png) - skin/classic/browser/preferences/Options.png (preferences/Options.png) -#ifdef MOZ_SERVICES_SYNC - skin/classic/browser/preferences/Options-sync.png (preferences/Options-sync.png) -#endif - skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png) -* skin/classic/browser/preferences/preferences.css (preferences/preferences.css) - skin/classic/browser/preferences/applications.css (preferences/applications.css) - skin/classic/browser/statusbar/dynamic.css (../shared/statusbar/dynamic.css) -* skin/classic/browser/statusbar/overlay.css (statusbar/overlay.css) -* skin/classic/browser/statusbar/prefs.css (statusbar/prefs.css) - skin/classic/browser/statusbar/pulse.png (../shared/statusbar/pulse.png) - skin/classic/browser/statusbar/pms16.png (../shared/statusbar/pms16.png) - skin/classic/browser/statusbar/pms24.png (../shared/statusbar/pms24.png) - skin/classic/browser/statusbar/throbber-idle.png (../shared/statusbar/throbber-idle.png) - skin/classic/browser/statusbar/throbberStatic.png (../shared/statusbar/throbberStatic.png) - skin/classic/browser/tabbrowser/alltabs.png (tabbrowser/alltabs.png) - skin/classic/browser/tabbrowser/alltabs-inverted.png (tabbrowser/alltabs-inverted.png) - skin/classic/browser/tabbrowser/newtab.png (tabbrowser/newtab.png) - skin/classic/browser/tabbrowser/newtab-glass.png (tabbrowser/newtab-glass.png) - skin/classic/browser/tabbrowser/newtab-inverted.png (tabbrowser/newtab-inverted.png) - skin/classic/browser/tabbrowser/connecting.png (tabbrowser/connecting.png) - skin/classic/browser/tabbrowser/loading.png (tabbrowser/loading.png) - skin/classic/browser/tabbrowser/tab-arrow-left.png (tabbrowser/tab-arrow-left.png) - skin/classic/browser/tabbrowser/tab-arrow-left-glass.png (tabbrowser/tab-arrow-left-glass.png) - skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png (tabbrowser/tab-arrow-left-inverted.png) - skin/classic/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png) - skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png) - skin/classic/browser/tabbrowser/tab-audio.svg (../shared/tabbrowser/tab-audio.svg) - skin/classic/browser/tabbrowser/tab-audio-small.svg (../shared/tabbrowser/tab-audio-small.svg) -#ifdef MOZ_SERVICES_SYNC - skin/classic/browser/sync-throbber.png - skin/classic/browser/sync-16.png - skin/classic/browser/sync-32.png - skin/classic/browser/sync-128.png - skin/classic/browser/sync-bg.png - skin/classic/browser/sync-desktopIcon.png - skin/classic/browser/sync-mobileIcon.png - skin/classic/browser/syncSetup.css - skin/classic/browser/syncCommon.css - skin/classic/browser/syncQuota.css - skin/classic/browser/syncProgress.css -#endif diff --git a/webbrowser/themes/windows/keyhole-forward-mask.svg b/webbrowser/themes/windows/keyhole-forward-mask.svg deleted file mode 100644 index 8355447..0000000 --- a/webbrowser/themes/windows/keyhole-forward-mask.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - diff --git a/webbrowser/themes/windows/livemark-folder.png b/webbrowser/themes/windows/livemark-folder.png deleted file mode 100644 index 79e3329..0000000 Binary files a/webbrowser/themes/windows/livemark-folder.png and /dev/null differ diff --git a/webbrowser/themes/windows/menu-back.png b/webbrowser/themes/windows/menu-back.png deleted file mode 100644 index 2f99ea7..0000000 Binary files a/webbrowser/themes/windows/menu-back.png and /dev/null differ diff --git a/webbrowser/themes/windows/menu-forward.png b/webbrowser/themes/windows/menu-forward.png deleted file mode 100644 index 82cd874..0000000 Binary files a/webbrowser/themes/windows/menu-forward.png and /dev/null differ diff --git a/webbrowser/themes/windows/mixed-content-blocked-16.png b/webbrowser/themes/windows/mixed-content-blocked-16.png deleted file mode 100644 index 7cf33ec..0000000 Binary files a/webbrowser/themes/windows/mixed-content-blocked-16.png and /dev/null differ diff --git a/webbrowser/themes/windows/mixed-content-blocked-64.png b/webbrowser/themes/windows/mixed-content-blocked-64.png deleted file mode 100644 index cac4415..0000000 Binary files a/webbrowser/themes/windows/mixed-content-blocked-64.png and /dev/null differ diff --git a/webbrowser/themes/windows/monitor.png b/webbrowser/themes/windows/monitor.png deleted file mode 100644 index 35e7b20..0000000 Binary files a/webbrowser/themes/windows/monitor.png and /dev/null differ diff --git a/webbrowser/themes/windows/monitor_16-10.png b/webbrowser/themes/windows/monitor_16-10.png deleted file mode 100644 index 4195034..0000000 Binary files a/webbrowser/themes/windows/monitor_16-10.png and /dev/null differ diff --git a/webbrowser/themes/windows/moz.build b/webbrowser/themes/windows/moz.build deleted file mode 100644 index 6a7af20..0000000 --- a/webbrowser/themes/windows/moz.build +++ /dev/null @@ -1,9 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# 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/. - -DIRS += ['communicator'] - -JAR_MANIFESTS += ['jar.mn'] \ No newline at end of file diff --git a/webbrowser/themes/windows/newtab/newTab.css b/webbrowser/themes/windows/newtab/newTab.css deleted file mode 100644 index b8b0fd6..0000000 --- a/webbrowser/themes/windows/newtab/newTab.css +++ /dev/null @@ -1,29 +0,0 @@ -/* 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/. */ - -%include ../../shared/newtab/newTab.css.inc - -.newtab-undo-button { - -moz-appearance: none; - color: -moz-nativehyperlinktext; - color: rgb(0,102,204); - cursor: pointer; - padding: 0; - margin: 0 4px; - border: 0; - background: transparent; - text-decoration: none; - min-width: 0; -} - -.newtab-undo-button > .button-box { - padding: 0; -} - -#newtab-undo-close-button { - -moz-appearance: none; - padding: 0; - border: none; - -moz-user-focus: normal; -} diff --git a/webbrowser/themes/windows/pageInfo.css b/webbrowser/themes/windows/pageInfo.css deleted file mode 100644 index ec65cc4..0000000 --- a/webbrowser/themes/windows/pageInfo.css +++ /dev/null @@ -1,268 +0,0 @@ -/* 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/. */ - -@import "chrome://global/skin/"; - -/* View buttons */ -#viewGroup { - -moz-padding-start: 10px; -} - -#viewGroup > radio { - list-style-image: url("chrome://browser/skin/pageInfo.png"); - -moz-box-orient: vertical; - -moz-box-align: center; - -moz-appearance: none; - padding: 5px 3px 1px 3px; - margin: 0 1px; - min-width: 4.5em; -} - -#viewGroup > radio:hover { - background-color: #E0E8F6; - color: black; -} - -#viewGroup > radio[selected="true"] { - background-color: #C1D2EE; - color: black; -} - -#topBar { - border-bottom: 2px groove ThreeDFace; - -moz-padding-start: 10px; - background-color: -moz-Field; - color: -moz-FieldText; -} - -#generalTab { - -moz-image-region: rect(0px, 32px, 32px, 0px) -} - -#generalTab:hover, #generalTab[selected="true"] { - -moz-image-region: rect(32px, 32px, 64px, 0px) -} - -#mediaTab { - -moz-image-region: rect(0px, 64px, 32px, 32px) -} - -#mediaTab:hover, #mediaTab[selected="true"] { - -moz-image-region: rect(32px, 64px, 64px, 32px) -} - -#feedTab { - -moz-image-region: rect(0px, 96px, 32px, 64px) -} - -#feedTab:hover, #feedTab[selected="true"] { - -moz-image-region: rect(32px, 96px, 64px, 64px) -} - -#permTab { - -moz-image-region: rect(0px, 128px, 32px, 96px) -} - -#permTab:hover, #permTab[selected="true"] { - -moz-image-region: rect(32px, 128px, 64px, 96px) -} - -#securityTab { - -moz-image-region: rect(0px, 160px, 32px, 128px) -} - -#securityTab:hover, #securityTab[selected="true"] { - -moz-image-region: rect(32px, 160px, 64px, 128px) -} - -deck { - padding: 10px 10px 10px 10px; -} - -/* Misc */ -tree { - margin: .5em; -} - -.gridSeparator { - width: .5em; -} - -textbox { - background: transparent !important; - border: none; - padding: 0px; - margin-top: 1px; - -moz-appearance: none; -} - -textbox.header { - -moz-margin-start: 0; -} - -.iframe { - margin: .5em; - background: white; - overflow: auto; -} - -.fixedsize { - height: 8.5em; -} - -textbox[disabled] { - font-style: italic; -} - -/* General Tab */ -groupbox.collapsable caption .caption-icon { - width: 9px; - height: 9px; - background-repeat: no-repeat; - background-position: center; - -moz-margin-start: 2px; - -moz-margin-end: 2px; - background-image: url("chrome://global/skin/tree/twisty.svg#open"); -} - -groupbox.collapsable[closed="true"] { - border: none; - margin-bottom: 9px; - -moz-appearance: none; -} - -groupbox.collapsable[closed="true"] caption .caption-icon { - background-image: url("chrome://global/skin/tree/twisty.svg#clsd"); -} - -groupbox tree { - margin: 0 3px; - border: none; -} - -#securityBox description { - -moz-margin-start: 10px; -} - -#general-security-identity { - white-space: pre-wrap; - line-height: 2em; -} - -@media (-moz-os-version: windows-win10) { - groupbox.collapsable caption .caption-icon { - background-image: url("chrome://global/skin/tree/twisty-10.svg#open"); - } - - groupbox.collapsable[closed="true"] caption .caption-icon { - background-image: url("chrome://global/skin/tree/twisty-10.svg#clsd"); - } -} - -/* Media Tab */ -#imagetree { - min-height: 10em; - margin-bottom: 0; -} - -#mediaSplitter { - border-style: none; - background: none; - height: .8em; -} - -#mediaGrid { - min-height: 9em; -} - -#mediaLabelColumn { - min-width: 10em; -} - -#thepreviewimage { - margin: 1em; -} - -treechildren::-moz-tree-cell-text(broken) { - font-style: italic; - color: graytext; -} - -/* Feeds Tab */ -#feedtree { - margin-bottom: 0px; -} - -#feedListbox richlistitem { - padding-top: 6px; - padding-bottom: 6px; - -moz-padding-start: 7px; - -moz-padding-end: 7px; - min-height: 25px; - border-bottom: 1px dotted #C0C0C0; -} - -#feedListbox richlistitem[selected="true"] { - background-color: -moz-Dialog; - color: -moz-DialogText; -} - -#feedListbox { - border: 2px solid; - -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow; - -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow; - -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow; - -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow; -} - -.feedTitle { - font-weight: bold; -} - -/* Permissions Tab */ -#permList { - margin-top: .5em; - overflow: auto; - border: 2px solid; - -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow; - -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow; - -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow; - -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow; - background-color: -moz-field; -} - -.permission { - padding-top: 6px; - padding-bottom: 6px; - -moz-padding-start: 7px; - -moz-padding-end: 7px; - min-height: 25px; - border-bottom: 1px dotted #C0C0C0; -} - -.permissionLabel { - font-weight: bold; -} - -.permission:hover { - background-color: -moz-dialog; -} - -/* Security Tab */ -#securityPanel .caption-icon { - display: none; -} - -#securityPanel .header { - font-size: 120%; -} - -#securityPanel .fieldLabel { - margin: 2px 10px 3px 10px; -} - -#securityPanel .fieldValue { - font-weight: bold; - margin: 2px 10px 0px 10px; -} diff --git a/webbrowser/themes/windows/pageInfo.png b/webbrowser/themes/windows/pageInfo.png deleted file mode 100644 index fcc713b..0000000 Binary files a/webbrowser/themes/windows/pageInfo.png and /dev/null differ diff --git a/webbrowser/themes/windows/permissions/aboutPermissions.css b/webbrowser/themes/windows/permissions/aboutPermissions.css deleted file mode 100644 index 60ee816..0000000 --- a/webbrowser/themes/windows/permissions/aboutPermissions.css +++ /dev/null @@ -1,153 +0,0 @@ -/* 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/. */ - -@import url("chrome://global/skin/inContentUI.css"); - -/* header */ - -#permissions-pagetitle { - font-size: 200%; - font-weight: bold; - padding-bottom: 0.5em; -} - -/* content box */ -#permissions-content { - height: 100%; -} - -/* sites box */ - -#sites-box { - padding: 10px; - width: 25em; -} - -#sites-filter { - margin: 0; -} - -#sites-list { - -moz-appearance: none; - border: 1px solid rgba(0, 0, 0, 0.32); - background-color: rgba(255, 255, 255, 0.4); - margin: 5px 0 0 0; -} - -.site { - padding: 4px; - border-bottom: 1px solid ThreeDLightShadow; -} - -.site-favicon { - height: 16px; - width: 16px; - -moz-margin-end: 4px; - list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); -} - -#all-sites-item > .site-container > .site-favicon { - list-style-image: none; -} - -/* permissions box */ - -#permissions-box { - padding-top: 10px; - overflow-y: auto; -} - -#site-description { - font-size: 125%; - -moz-margin-start: 6px; /* to match button margin */ -} - -#site-label { - font-weight: bold; - margin-top: 0; - margin-bottom: 0; -} - -#defaults-description { - font-size: 125%; - font-weight: bold; - -moz-margin-start: 6px; -} - -.pref-item { - margin-bottom: 10px; -} - -.pref-icon { - width: 48px; - height: 48px; - -moz-margin-end: 10px; -} - -.pref-icon[type="password"] { - list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); -} -.pref-icon[type="image"] { - list-style-image: url(chrome://global/skin/icons/question-48.png); -} -.pref-icon[type="popup"] { - list-style-image: url(chrome://global/skin/icons/question-48.png); -} -.pref-icon[type="cookie"] { - list-style-image: url(chrome://global/skin/icons/question-48.png); -} -.pref-icon[type="desktop-notification"] { - list-style-image: url(chrome://browser/skin/web-notifications-icon.svg); -} -.pref-icon[type="install"] { - list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric-48.png); -} -.pref-icon[type="geo"] { - list-style-image: url(chrome://browser/skin/Geolocation-64.png); -} -.pref-icon[type="plugins"] { - list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric-48.png); -} - -.pref-title { - font-size: 125%; - margin-bottom: 0; - font-weight: bold; - margin-right: 0; - padding-right: 0; -} - -.pref-default { - margin-left: 0.5em; - padding-left: 0; -} - -.pref-set-default { - visibility: collapse; -} - -.pref-menulist { - margin-left: 6px; - margin-right: 6px; - min-width: 10em; /* native menulists ellipsize their longest entries by default on many themes */ -} - -.plugins-label { - margin-right: 0; - padding-right: 0; -} - -.plugins-vulnerable { - margin-left: 0; - padding-left: 0; - margin-right: 0; - padding-right: 0; -} - -.plugins-default { - margin-left: 0.5em; - padding-left: 0; - margin-right: 1em; - padding-right: 0; -} diff --git a/webbrowser/themes/windows/places/allBookmarks.png b/webbrowser/themes/windows/places/allBookmarks.png deleted file mode 100644 index 177c31c..0000000 Binary files a/webbrowser/themes/windows/places/allBookmarks.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/bookmark.png b/webbrowser/themes/windows/places/bookmark.png deleted file mode 100644 index 2e9a206..0000000 Binary files a/webbrowser/themes/windows/places/bookmark.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/bookmarksMenu.png b/webbrowser/themes/windows/places/bookmarksMenu.png deleted file mode 100644 index 14c9601..0000000 Binary files a/webbrowser/themes/windows/places/bookmarksMenu.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/bookmarksToolbar.png b/webbrowser/themes/windows/places/bookmarksToolbar.png deleted file mode 100644 index 5a4a693..0000000 Binary files a/webbrowser/themes/windows/places/bookmarksToolbar.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/calendar.png b/webbrowser/themes/windows/places/calendar.png deleted file mode 100644 index c0d1071..0000000 Binary files a/webbrowser/themes/windows/places/calendar.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/downloads.png b/webbrowser/themes/windows/places/downloads.png deleted file mode 100644 index d37bc40..0000000 Binary files a/webbrowser/themes/windows/places/downloads.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/editBookmark.png b/webbrowser/themes/windows/places/editBookmark.png deleted file mode 100644 index fbca052..0000000 Binary files a/webbrowser/themes/windows/places/editBookmark.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/editBookmarkOverlay.css b/webbrowser/themes/windows/places/editBookmarkOverlay.css deleted file mode 100644 index be3ea83..0000000 --- a/webbrowser/themes/windows/places/editBookmarkOverlay.css +++ /dev/null @@ -1,80 +0,0 @@ -/* 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/. */ - -/**** folder menulist ****/ -.folder-icon > .menulist-label-box > .menulist-icon { - width: 16px; - height: 16px; -} - -.folder-icon > .menu-iconic-left { - display: -moz-box; -} - -.folder-icon { - list-style-image: url("chrome://global/skin/icons/folder-item.png") !important; - -moz-image-region: rect(0px, 32px, 16px, 16px) !important; -} - - -/**** expanders ****/ - -.expander-up, -.expander-down { - min-width: 0; - margin: 0; - -moz-margin-end: 4px; -} - -.expander-up > .button-box, -.expander-down > .button-box { - padding: 0; -} - -.expander-up { - list-style-image: url("chrome://global/skin/icons/collapse.png"); -} - -.expander-down { - list-style-image: url("chrome://global/skin/icons/expand.png"); -} - -#editBookmarkPanelContent { - min-width: 23em; -} - -#editBMPanel_folderTree { - margin-top: 2px; - margin-bottom: 2px; -} - -/* Hide the value column of the tag autocomplete popup - * leaving only the comment column visible. This is - * so that only the tag being edited is shown in the - * popup. - */ -#editBMPanel_tagsField #treecolAutoCompleteValue { - visibility: collapse; -} - - -/* ::::: bookmark panel dropdown icons ::::: */ - -#editBMPanel_folderMenuList[selectedIndex="0"], -#editBMPanel_toolbarFolderItem { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png") !important; - -moz-image-region: auto !important; -} - -#editBMPanel_folderMenuList[selectedIndex="1"], -#editBMPanel_bmRootItem { - list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png") !important; - -moz-image-region: auto !important; -} - -#editBMPanel_folderMenuList[selectedIndex="2"], -#editBMPanel_unfiledRootItem { - list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png") !important; - -moz-image-region: auto !important; -} diff --git a/webbrowser/themes/windows/places/history.png b/webbrowser/themes/windows/places/history.png deleted file mode 100644 index cc3b067..0000000 Binary files a/webbrowser/themes/windows/places/history.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/libraryToolbar.png b/webbrowser/themes/windows/places/libraryToolbar.png deleted file mode 100644 index f5f3654..0000000 Binary files a/webbrowser/themes/windows/places/libraryToolbar.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/livemark-item.png b/webbrowser/themes/windows/places/livemark-item.png deleted file mode 100644 index 9184b95..0000000 Binary files a/webbrowser/themes/windows/places/livemark-item.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/organizer.css b/webbrowser/themes/windows/places/organizer.css deleted file mode 100644 index 45851d0..0000000 --- a/webbrowser/themes/windows/places/organizer.css +++ /dev/null @@ -1,253 +0,0 @@ -/* 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/. */ - -:root { - --toolbar-custom-color: hsl(210,75%,92%); - --toolbar-highlight-top: rgba(255,255,255,.5); - --toolbarbutton-image: url("chrome://browser/skin/Toolbar.png"); -} - -/* Use SVG for HiDPI 133%+ */ -@media (min-resolution: 1.33dppx) { - :root { - --toolbarbutton-image: url("chrome://browser/skin/Toolbar.svg"); - } -} - -/* Toolbar */ -#placesToolbar { - padding: 3px; - -moz-padding-end: 6px; -} - -#placesToolbar > toolbarbutton[disabled] > .toolbarbutton-icon { - opacity: .4; -} - -#back-button, -#forward-button { - list-style-image: var(--toolbarbutton-image); -} - -#back-button { - -moz-image-region: rect(0, 18px, 18px, 0); -} - -#forward-button { - -moz-image-region: rect(0, 36px, 18px, 18px); -} - -#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, -#forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { - transform: scaleX(-1); -} - -/* Menu */ -#placesMenu { - -moz-margin-start: 6px; - -moz-appearance: none; - border: none; -} - -#placesMenu > menu { - -moz-padding-start: 4px; - -moz-padding-end: 1px; - padding-top: 2px; - padding-bottom: 2px; - -moz-appearance: toolbarbutton; -%ifdef XP_WIN -% use standard menu colors on OS/2 - color: -moz-DialogText; -%endif - border: 1px solid transparent; -} - -#placesMenu > menu[_moz-menuactive="true"] { - background-color: transparent; -} - -#placesMenu > menu:hover { - border-color: ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight; -} - -#placesMenu > menu[open="true"] { - border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow; - -moz-padding-start: 5px; - -moz-padding-end: 0px; - padding-top: 3px; - padding-bottom: 1px; -} - -#placesMenu > menu > .menubar-text { - -moz-padding-end: 8px; - background: url(chrome://global/skin/arrow/arrow-dn.gif) right center no-repeat; -} - -#placesMenu > menu > .menubar-text:-moz-locale-dir(rtl) { - background-position: left center; -} - -/* organize, view and maintenance buttons icons */ -#organizeButton, -#viewMenu, -#maintenanceButton { - list-style-image: url("chrome://browser/skin/places/libraryToolbar.png"); -} - -/* organize button */ -#organizeButton { - -moz-image-region: rect(0px, 16px, 16px, 0px); -} -#organizeButton:hover, -#organizeButton[open="true"] { - -moz-image-region: rect(16px, 16px, 32px, 0px); -} - -/* view button */ -#viewMenu { - -moz-image-region: rect(0px, 32px, 16px, 16px); -} -#viewMenu:hover, -#viewMenu[open="true"] { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} - -/* maintenance button */ -#maintenanceButton { - -moz-image-region: rect(0px, 48px, 16px, 32px); -} -#maintenanceButton:hover, -#maintenanceButton[open="true"] { - -moz-image-region: rect(16px, 48px, 32px, 32px); -} - -/* Root View */ -#placesView { - border-top: 1px solid ThreeDDarkShadow; -} - -/* Info box */ -#detailsDeck { - border-top: 1px solid ThreeDShadow; - padding: 5px; -} - -#infoBoxExpanderLabel { - -moz-padding-start: 2px; -} - -#organizerScopeBar { - padding: 2px 0; - -moz-padding-end: 3px; -} - -#organizerScopeBar > toolbarbutton { - -moz-appearance: none; - border: 1px solid transparent; - border-radius: 2px; - padding: 0 !important; - margin: 0 1px; -} - -#organizerScopeBar > toolbarbutton > .toolbarbutton-icon { - padding: 0; - margin: 0; -} - -#organizerScopeBar > toolbarbutton > .toolbarbutton-text { - margin: 0; - padding: 2px 5px; -} - -#organizerScopeBar > toolbarbutton:not([disabled="true"]):not([checked="true"]):hover { - border-color: ThreeDShadow; -} - -#organizerScopeBar > toolbarbutton[checked="true"] { - border-color: ThreeDDarkShadow !important; -} - -#searchFilter { - margin: 0; -} - -/** - * Downloads pane - */ - -#clearDownloadsButton > .toolbarbutton-icon { - display: none; -} - -#clearDownloadsButton { - -moz-padding-start: 9px; - -moz-padding-end: 9px; -} - -#placesView { - border-top: none; -} - -@media not all and (-moz-windows-classic) { - #placesToolbox { - -moz-appearance: none; - background-color: transparent; - } - - #placesToolbar { - -moz-appearance: none; - background-color: -moz-Dialog; - color: -moz-dialogText; - } -} - -@media (-moz-windows-default-theme) { - #placesView > splitter { - border: 0; - -moz-border-end: 1px solid #A9B7C9; - min-width: 0; - width: 3px; - background-color: transparent; - -moz-margin-start: -3px; - position: relative; - } -} - -@media (-moz-windows-glass) { - #placesToolbox { - border-top: none; - } - - #placesToolbar { - background-image: linear-gradient(var(--toolbar-highlight-top), transparent); - } -} - -@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista), - (-moz-windows-default-theme) and (-moz-os-version: windows-win7) { - #placesView, - #infoPane, - #placesList, - #placeContent { - background-color: #EEF3FA; - } - - #placesToolbar { - background-color: var(--toolbar-custom-color); - color: black; - } - - #detailsDeck { - border-top-color: #A9B7C9; - } - - #searchFilter { - -moz-appearance: none; - padding: 2px; - -moz-padding-start: 4px; - background-clip: padding-box; - border: 1px solid rgba(0,0,0,.32); - border-radius: 2px; - } -} diff --git a/webbrowser/themes/windows/places/places.css b/webbrowser/themes/windows/places/places.css deleted file mode 100644 index bb16046..0000000 --- a/webbrowser/themes/windows/places/places.css +++ /dev/null @@ -1,172 +0,0 @@ -/* 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/. */ - -/* Sidebars */ -.sidebar-placesTree { - -moz-appearance: none; - border: 0; - margin: 0; - border-top: 1px solid ThreeDShadow; -} - -.sidebar-placesTreechildren::-moz-tree-cell(leaf) , -.sidebar-placesTreechildren::-moz-tree-image(leaf) { - cursor: pointer; -} - -.sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) { - cursor: pointer; - text-decoration: underline; -} - -.sidebar-placesTreechildren::-moz-tree-cell(separator) { - cursor: default; -} - -@media (-moz-windows-default-theme) { - .sidebar-placesTree { - background-color: transparent; - border-top: none; - } - - .sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) { - text-decoration: none; - } - - @media (-moz-os-version: windows-vista), - (-moz-os-version: windows-win7) { - #bookmarksPanel, - #history-panel { - background-color: #EEF3FA; - } - } -} - -/* Trees */ -treechildren::-moz-tree-image(title) { - list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); - padding-right: 2px; - margin: 0px 2px; - width: 16px; - height: 16px; -} - -treechildren::-moz-tree-image(title, livemarkItem) { - list-style-image: url("chrome://browser/skin/places/livemark-item.png"); - -moz-image-region: rect(0px, 16px, 16px, 0px); -} - -treechildren::-moz-tree-image(title, livemarkItem, visited) { - -moz-image-region: rect(0px, 32px, 16px, 16px); -} - -treechildren::-moz-tree-image(title, separator) { - list-style-image: none; - width: 0; - height: 0; -} - -treechildren::-moz-tree-image(title, container) { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 32px, 16px, 16px); -} - -treechildren::-moz-tree-image(title, open) { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} - -treechildren::-moz-tree-image(title, container, livemark) { - list-style-image: url("chrome://browser/skin/livemark-folder.png"); - -moz-image-region: auto; -} - -treechildren::-moz-tree-image(container, OrganizerQuery_AllBookmarks) { - list-style-image: url("chrome://browser/skin/places/allBookmarks.png"); - -moz-image-region: auto; -} - -treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksToolbar) { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); - -moz-image-region: auto; -} - -treechildren::-moz-tree-image(container, OrganizerQuery_BookmarksMenu) { - list-style-image: url("chrome://browser/skin/places/bookmarksMenu.png"); - -moz-image-region: auto; -} - -treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks) { - list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); - -moz-image-region: auto; -} - -/* query-nodes should be styled even if they're not expandable */ -treechildren::-moz-tree-image(title, query) { - list-style-image: url("chrome://browser/skin/places/query.png"); - -moz-image-region: auto; -} - -treechildren::-moz-tree-image(title, query, tagContainer), -treechildren::-moz-tree-image(query, OrganizerQuery_Tags) { - list-style-image: url("chrome://browser/skin/places/tag.png"); - -moz-image-region: auto; -} - -treechildren::-moz-tree-image(query, OrganizerQuery_Downloads) { - list-style-image: url("chrome://browser/skin/places/downloads.png"); - -moz-image-region: auto; -} - -/* calendar icon for folders grouping items by date */ -treechildren::-moz-tree-image(title, query, dayContainer) { - list-style-image: url("chrome://browser/skin/places/calendar.png"); - -moz-image-region: auto; -} - -treechildren::-moz-tree-image(title, query, hostContainer) { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 32px, 16px, 16px); -} - -treechildren::-moz-tree-image(title, query, hostContainer, open) { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(16px, 32px, 32px, 16px); -} - -treechildren::-moz-tree-image(title, query, OrganizerQuery_History) { - list-style-image: url("chrome://browser/skin/places/history.png"); -} - -/* We want some queries to look like ordinary folders. This must come - after the (title, query) selector, or it would get overridden. */ -treechildren::-moz-tree-image(title, query, folder) { - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 32px, 16px, 16px); -} - -treechildren::-moz-tree-image(title, query, folder, open) { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} - -treechildren::-moz-tree-image(cutting) { - opacity: 0.5; -} - -treechildren::-moz-tree-cell-text(cutting) { - opacity: 0.7; -} - -/* Browser Sidebars */ - -/* Default button vert. margins are 1px/2px, and this can cause misalignment */ -#viewButton { - margin-top: 2px; - margin-bottom: 2px; -} - -#viewButton > .button-box > .button-menu-dropmarker { - height: auto; - width: auto; - -moz-margin-end: -3px; -} diff --git a/webbrowser/themes/windows/places/query.png b/webbrowser/themes/windows/places/query.png deleted file mode 100644 index fff0fb0..0000000 Binary files a/webbrowser/themes/windows/places/query.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/starred48.png b/webbrowser/themes/windows/places/starred48.png deleted file mode 100644 index 2f7e878..0000000 Binary files a/webbrowser/themes/windows/places/starred48.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/tag.png b/webbrowser/themes/windows/places/tag.png deleted file mode 100644 index da90624..0000000 Binary files a/webbrowser/themes/windows/places/tag.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/toolbarDropMarker.png b/webbrowser/themes/windows/places/toolbarDropMarker.png deleted file mode 100644 index 3abb7c2..0000000 Binary files a/webbrowser/themes/windows/places/toolbarDropMarker.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/unsortedBookmarks.png b/webbrowser/themes/windows/places/unsortedBookmarks.png deleted file mode 100644 index d18a501..0000000 Binary files a/webbrowser/themes/windows/places/unsortedBookmarks.png and /dev/null differ diff --git a/webbrowser/themes/windows/places/unstarred48.png b/webbrowser/themes/windows/places/unstarred48.png deleted file mode 100644 index 8b82aab..0000000 Binary files a/webbrowser/themes/windows/places/unstarred48.png and /dev/null differ diff --git a/webbrowser/themes/windows/pointerLock-16.png b/webbrowser/themes/windows/pointerLock-16.png deleted file mode 100644 index 862cd11..0000000 Binary files a/webbrowser/themes/windows/pointerLock-16.png and /dev/null differ diff --git a/webbrowser/themes/windows/pointerLock-64.png b/webbrowser/themes/windows/pointerLock-64.png deleted file mode 100644 index a35ce04..0000000 Binary files a/webbrowser/themes/windows/pointerLock-64.png and /dev/null differ diff --git a/webbrowser/themes/windows/preferences/Options-sync.png b/webbrowser/themes/windows/preferences/Options-sync.png deleted file mode 100644 index 89901fb..0000000 Binary files a/webbrowser/themes/windows/preferences/Options-sync.png and /dev/null differ diff --git a/webbrowser/themes/windows/preferences/Options.png b/webbrowser/themes/windows/preferences/Options.png deleted file mode 100644 index 2cb1f50..0000000 Binary files a/webbrowser/themes/windows/preferences/Options.png and /dev/null differ diff --git a/webbrowser/themes/windows/preferences/alwaysAsk.png b/webbrowser/themes/windows/preferences/alwaysAsk.png deleted file mode 100644 index d12805e..0000000 Binary files a/webbrowser/themes/windows/preferences/alwaysAsk.png and /dev/null differ diff --git a/webbrowser/themes/windows/preferences/application.png b/webbrowser/themes/windows/preferences/application.png deleted file mode 100644 index d67993d..0000000 Binary files a/webbrowser/themes/windows/preferences/application.png and /dev/null differ diff --git a/webbrowser/themes/windows/preferences/applications.css b/webbrowser/themes/windows/preferences/applications.css deleted file mode 100644 index 80699b4..0000000 --- a/webbrowser/themes/windows/preferences/applications.css +++ /dev/null @@ -1,64 +0,0 @@ -/* 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/. */ - -/** - * Line up the actions menu with action labels above and below it. - * Equalize the distance from the left side of the action box to the left side - * of the icon for both the menu and the non-menu versions of the action box. - * Also make sure the labels are the same distance away from the icons. - */ -.actionsMenu { - margin-top: 0; - margin-bottom: 0; - -moz-margin-start: -2px; - -moz-margin-end: 0; -} - -.typeIcon, -.actionIcon { - -moz-margin-start: 3px; - -moz-margin-end: 3px; -} - -richlistitem label { - -moz-margin-start: 1px; - margin-top: 2px; -} - -richlistitem { - min-height: 22px; -} - -richlistitem[appHandlerIcon="ask"], -menuitem[appHandlerIcon="ask"] { - list-style-image: url("chrome://browser/skin/preferences/alwaysAsk.png"); -} - -richlistitem[appHandlerIcon="save"], -menuitem[appHandlerIcon="save"] { - list-style-image: url("chrome://browser/skin/preferences/application.png"); -} - -richlistitem[appHandlerIcon="feed"], -menuitem[appHandlerIcon="feed"] { - list-style-image: url("chrome://browser/skin/page-livemarks.png"); -} - -richlistitem[appHandlerIcon="plugin"], -menuitem[appHandlerIcon="plugin"] { - list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png"); -} - -.actionsMenu .menulist-icon { - -moz-margin-end: 3px; -} - -.actionsMenu > menupopup > menuitem > .menu-iconic-left { - -moz-padding-start: 0px; - -moz-padding-end: 2px; -} - -.actionsMenu > menupopup > menuitem { - -moz-padding-start: 4px; -} diff --git a/webbrowser/themes/windows/preferences/mail.png b/webbrowser/themes/windows/preferences/mail.png deleted file mode 100644 index be1ed4d..0000000 Binary files a/webbrowser/themes/windows/preferences/mail.png and /dev/null differ diff --git a/webbrowser/themes/windows/preferences/preferences.css b/webbrowser/themes/windows/preferences/preferences.css deleted file mode 100644 index 40be343..0000000 --- a/webbrowser/themes/windows/preferences/preferences.css +++ /dev/null @@ -1,146 +0,0 @@ -/* -# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -# 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/. -*/ - -/* Global Styles */ -#BrowserPreferences radio[pane] { - list-style-image: url("chrome://browser/skin/preferences/Options.png"); - padding: 5px 3px 1px; -} - -radio[pane=paneMain] { - -moz-image-region: rect(0, 32px, 32px, 0); -} - -radio[pane=paneTabs] { - -moz-image-region: rect(0, 64px, 32px, 32px); -} - -radio[pane=paneContent] { - -moz-image-region: rect(0, 96px, 32px, 64px); -} - -radio[pane=paneApplications] { - -moz-image-region: rect(0, 128px, 32px, 96px); -} - -radio[pane=panePrivacy] { - -moz-image-region: rect(0, 160px, 32px, 128px); -} - -radio[pane=paneSecurity] { - -moz-image-region: rect(0, 192px, 32px, 160px); -} - -radio[pane=paneAdvanced] { - -moz-image-region: rect(0, 224px, 32px, 192px); -} - -%ifdef MOZ_SERVICES_SYNC -radio[pane=paneSync] { - list-style-image: url("chrome://browser/skin/preferences/Options-sync.png") !important; -} -%endif - -/* Applications Pane */ -#BrowserPreferences[animated="true"] #handlersView { - height: 25em; -} - -#BrowserPreferences[animated="false"] #handlersView { - -moz-box-flex: 1; -} - -/* Privacy Pane */ - -/* styles for the link elements copied from .text-link in global.css */ -.inline-link { - color: -moz-nativehyperlinktext; - text-decoration: none; -} - -.inline-link:hover { - text-decoration: underline; -} - -/* Modeless Window Dialogs */ -.windowDialog, -.windowDialog prefpane { - padding: 0; -} - -#browserHomePage:-moz-locale-dir(rtl) input { - unicode-bidi: plaintext; - direction: rtl; -} - -.contentPane { - margin: 9px 8px 5px; -} - -.actionButtons { - margin: 0 3px 6px !important; -} - -/* Cookies Manager */ -#cookiesChildren::-moz-tree-image(domainCol) { - width: 16px; - height: 16px; - margin: 0 2px; - list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png") !important; -} - -#cookiesChildren::-moz-tree-image(domainCol, container) { - list-style-image: url("chrome://global/skin/icons/folder-item.png") !important; - -moz-image-region: rect(0, 32px, 16px, 16px); -} - -#cookiesChildren::-moz-tree-image(domainCol, container, open) { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} - -#cookieInfoBox { - border: 1px solid ThreeDShadow; - border-radius: 0; - margin: 4px; - padding: 0; -} - -/* Advanced Pane */ - -/* Adding padding-bottom prevents the bottom of the tabpanel from being cutoff - when browser.preferences.animateFadeIn = true */ -#advancedPrefs { - padding-bottom: 8px; -} - -/* bottom-most box containing a groupbox in a prefpane. Prevents the bottom - of the groupbox from being cutoff */ -.bottomBox { - padding-bottom: 4px; -} - -%ifdef MOZ_SERVICES_SYNC -/* Sync Pane */ - -#syncDesc { - padding: 0 8em; -} - -.syncGroupBox { - padding: 10px; -} - -#accountCaptionImage { - list-style-image: url("chrome://mozapps/skin/profile/profileicon.png"); -} - -#syncAddDeviceLabel { - margin-top: 1em; - margin-bottom: 1em; -} - -%endif diff --git a/webbrowser/themes/windows/preferences/saveFile.png b/webbrowser/themes/windows/preferences/saveFile.png deleted file mode 100644 index 1248dd3..0000000 Binary files a/webbrowser/themes/windows/preferences/saveFile.png and /dev/null differ diff --git a/webbrowser/themes/windows/privatebrowsing-dark.png b/webbrowser/themes/windows/privatebrowsing-dark.png deleted file mode 100644 index 9eaf3ae..0000000 Binary files a/webbrowser/themes/windows/privatebrowsing-dark.png and /dev/null differ diff --git a/webbrowser/themes/windows/privatebrowsing-light.png b/webbrowser/themes/windows/privatebrowsing-light.png deleted file mode 100644 index c12f507..0000000 Binary files a/webbrowser/themes/windows/privatebrowsing-light.png and /dev/null differ diff --git a/webbrowser/themes/windows/reload-stop-go.png b/webbrowser/themes/windows/reload-stop-go.png deleted file mode 100644 index 1017be9..0000000 Binary files a/webbrowser/themes/windows/reload-stop-go.png and /dev/null differ diff --git a/webbrowser/themes/windows/sanitize.png b/webbrowser/themes/windows/sanitize.png deleted file mode 100644 index 72eea2c..0000000 Binary files a/webbrowser/themes/windows/sanitize.png and /dev/null differ diff --git a/webbrowser/themes/windows/sanitizeDialog.css b/webbrowser/themes/windows/sanitizeDialog.css deleted file mode 100644 index 4312eb8..0000000 --- a/webbrowser/themes/windows/sanitizeDialog.css +++ /dev/null @@ -1,93 +0,0 @@ -/* 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/. */ - -#sanitizeDurationChoice { - -moz-margin-end: 0; -} - -/* Align the duration label with the warning box and item list */ -#sanitizeDurationLabel { - -moz-margin-start: 3px; -} - - -/* Hide the duration dropdown suffix label if it's empty. Otherwise it - takes up a little space, causing the end of the dropdown to not be aligned - with the warning box. */ -#sanitizeDurationSuffixLabel[value=""] { - display: none; -} - - -/* Places tree */ -#placesTreechildren::-moz-tree-row(selected), -#placesTreechildren::-moz-tree-row(grippyRow) { - background: #999; -} - -#placesTreechildren::-moz-tree-cell-text(selected) { - color: #111; -} - - -/* Sanitize everything warning box */ -#sanitizeEverythingWarningBox { - background-color: Window; - border: 1px solid ThreeDDarkShadow; - border-radius: 5px; - padding: 16px; -} - -#sanitizeEverythingWarningIcon { - list-style-image: url("chrome://global/skin/icons/warning-large.png"); - padding: 0; - margin: 0; -} - -#sanitizeEverythingWarningDescBox { - padding: 0 16px; - margin: 0; -} - - -/* Progressive disclosure button */ -#detailsExpanderWrapper { - padding: 0; - margin: 6px 0; -} - -.expander-up, -.expander-down { - min-width: 0; - margin: 0; -} - -.expander-up > .button-box, -.expander-down > .button-box { - padding: 0; -} - -.expander-up { - list-style-image: url("chrome://global/skin/icons/collapse.png"); -} - -.expander-down { - list-style-image: url("chrome://global/skin/icons/expand.png"); -} - - -/* Make the item list the same width as the warning box */ -#itemList { - -moz-margin-start: 0; - -moz-margin-end: 0; -} - - -/* Align the last dialog button with the end of the warning box */ -.prefWindow-dlgbuttons { - -moz-margin-end: 0; -} -.dialog-button[dlgtype="cancel"] { - -moz-margin-end: 0; -} diff --git a/webbrowser/themes/windows/searchbar-dropdown-arrow.png b/webbrowser/themes/windows/searchbar-dropdown-arrow.png deleted file mode 100644 index 79d8d61..0000000 Binary files a/webbrowser/themes/windows/searchbar-dropdown-arrow.png and /dev/null differ diff --git a/webbrowser/themes/windows/searchbar.css b/webbrowser/themes/windows/searchbar.css deleted file mode 100644 index 86a4855..0000000 --- a/webbrowser/themes/windows/searchbar.css +++ /dev/null @@ -1,81 +0,0 @@ -/* 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/. */ - -.searchbar-textbox { - width: 6em; - min-width: 6em; -} - -.autocomplete-textbox-container { - -moz-box-align: stretch; -} - -.textbox-input-box { - margin: 0; -} - -/* ::::: searchbar-engine-button ::::: */ - -.searchbar-engine-image { - height: 16px; - width: 16px; - list-style-image: url("chrome://global/skin/icons/folder-item.png"); - -moz-image-region: rect(0px, 16px, 16px, 0px); - -moz-margin-start: 2px; -} - -.searchbar-engine-button { - -moz-appearance: none; - min-width: 0; - margin: 0; - padding: 0; - -moz-padding-end: 2px; - -moz-box-align: center; - background: none; - border: none; -} - -.searchbar-engine-button > .button-box { - -moz-appearance: none; - padding: 0; - border: 0; -} - -.searchbar-dropmarker-image { - list-style-image: url("chrome://browser/skin/searchbar-dropdown-arrow.png"); - -moz-image-region: rect(0, 13px, 11px, 0); -} - -.searchbar-engine-button[open="true"] > .searchbar-dropmarker-image { - -moz-image-region: rect(0, 26px, 11px, 13px); -} - - -/* ::::: search-go-button ::::: */ - -.search-go-container { - -moz-box-align: center; -} - -.search-go-button { - padding: 1px; - list-style-image: url("chrome://global/skin/icons/Search-glass.png"); - -moz-image-region: rect(0px 16px 16px 0px); -} - -.search-go-button:-moz-locale-dir(rtl) { - transform: scaleX(-1); -} - -.search-go-button:hover { - -moz-image-region: rect(0px 32px 16px 16px); -} - -.search-go-button:hover:active { - -moz-image-region: rect(0px, 48px, 16px, 32px); -} - -.searchbar-engine-menuitem[selected="true"] > .menu-iconic-text { - font-weight: bold; -} diff --git a/webbrowser/themes/windows/setDesktopBackground.css b/webbrowser/themes/windows/setDesktopBackground.css deleted file mode 100644 index 585284c..0000000 --- a/webbrowser/themes/windows/setDesktopBackground.css +++ /dev/null @@ -1,18 +0,0 @@ -/* 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/. */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -@namespace html url("http://www.w3.org/1999/xhtml"); - -html|canvas#screen { - margin: 12px 11px 32px; -} - -#monitor { - list-style-image: url("chrome://browser/skin/monitor.png"); -} - -#monitor[aspectratio="16:10"] { - list-style-image: url("chrome://browser/skin/monitor_16-10.png"); -} diff --git a/webbrowser/themes/windows/slowStartup-16.png b/webbrowser/themes/windows/slowStartup-16.png deleted file mode 100644 index 5551ef0..0000000 Binary files a/webbrowser/themes/windows/slowStartup-16.png and /dev/null differ diff --git a/webbrowser/themes/windows/statusbar/overlay.css b/webbrowser/themes/windows/statusbar/overlay.css deleted file mode 100644 index 7f9a598..0000000 --- a/webbrowser/themes/windows/statusbar/overlay.css +++ /dev/null @@ -1,104 +0,0 @@ -/* 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/. */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -%include ../../shared/statusbar/overlay.css - -/* - * General - */ - -#status4evar-status-text, -#status4evar-progress-bar -{ - margin: 0px 3px; -} - -/* - * Download status - */ - -#status4evar-download-progress-bar -{ - height: 4px; -} - -#status4evar-download-button #status4evar-download-icon -{ - min-width: 18px; - min-height: 18px; -} - -#status4evar-download-button #status4evar-download-icon -{ - background: -moz-image-rect(var(--toolbarbutton-image), 0, 108, 18, 90) center no-repeat; -} - -toolbar[brighttext] #status4evar-download-button #status4evar-download-icon -{ - background: -moz-image-rect(var(--toolbarbutton-inverted-image), 0, 108, 18, 90) center no-repeat; -} - -@media (-moz-windows-compositor) -{ - :-moz-any(#toolbar-menubar, #nav-bar[tabsontop=false]) #status4evar-download-button #status4evar-download-icon:not(:-moz-lwtheme), - #TabsToolbar[tabsontop=true] #status4evar-download-button #status4evar-download-icon:not(:-moz-lwtheme), - #nav-bar + #customToolbars + #PersonalToolbar[collapsed=true] + #TabsToolbar[tabsontop=false]:last-child #status4evar-download-button #status4evar-download-icon:not(:-moz-lwtheme) - { - background: -moz-image-rect(var(--toolbarbutton-glass-image), 0, 108, 18, 90) center no-repeat; - } -} - -#status4evar-download-button[attention] #status4evar-download-icon -{ - background: -moz-image-rect(var(--toolbarbutton-glass-image), 19, 108, 36, 90) center no-repeat; -} - -toolbar[mode="icons"] #status4evar-download-button[forcelabel="true"] > label -{ - -moz-margin-start: 5px !important; -} - -/* - * Splitter - */ - -splitter.status4evar-status-splitter -{ - width: 6px; - margin: 0px -3px; -} - -/* - * Location bar - */ - -#urlbar-progress-alt -{ - -moz-margin-end: -2px; -} - -/* - * Status bar - */ - -#browser-bottombox[s4eboarder="true"] :-moz-any(#status4evar-status-bar, #addon-bar) -{ - -moz-appearance: none; -} - -#browser-bottombox[s4eboarder="true"] > *:not([hidden="true"]):not([collapsed="true"]) -{ - box-shadow: none !important; - border: none !important; - border-top: 2px solid !important; - -moz-border-top-colors: ThreeDShadow ThreeDHighlight !important; -} - -#browser-bottombox[s4eboarder="true"] > *:not([hidden="true"]):not([collapsed="true"]) ~ * -{ - border: none !important; -} - diff --git a/webbrowser/themes/windows/statusbar/prefs.css b/webbrowser/themes/windows/statusbar/prefs.css deleted file mode 100644 index 005088b..0000000 --- a/webbrowser/themes/windows/statusbar/prefs.css +++ /dev/null @@ -1,7 +0,0 @@ -/* 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/. */ - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -%include ../../shared/statusbar/prefs.css diff --git a/webbrowser/themes/windows/sync-128.png b/webbrowser/themes/windows/sync-128.png deleted file mode 100644 index 1ea3481..0000000 Binary files a/webbrowser/themes/windows/sync-128.png and /dev/null differ diff --git a/webbrowser/themes/windows/sync-16.png b/webbrowser/themes/windows/sync-16.png deleted file mode 100644 index 0afb1c7..0000000 Binary files a/webbrowser/themes/windows/sync-16.png and /dev/null differ diff --git a/webbrowser/themes/windows/sync-32.png b/webbrowser/themes/windows/sync-32.png deleted file mode 100644 index 7a762cb..0000000 Binary files a/webbrowser/themes/windows/sync-32.png and /dev/null differ diff --git a/webbrowser/themes/windows/sync-bg.png b/webbrowser/themes/windows/sync-bg.png deleted file mode 100644 index 893a27d..0000000 Binary files a/webbrowser/themes/windows/sync-bg.png and /dev/null differ diff --git a/webbrowser/themes/windows/sync-desktopIcon.png b/webbrowser/themes/windows/sync-desktopIcon.png deleted file mode 100644 index d3d1e27..0000000 Binary files a/webbrowser/themes/windows/sync-desktopIcon.png and /dev/null differ diff --git a/webbrowser/themes/windows/sync-mobileIcon.png b/webbrowser/themes/windows/sync-mobileIcon.png deleted file mode 100644 index a3bda57..0000000 Binary files a/webbrowser/themes/windows/sync-mobileIcon.png and /dev/null differ diff --git a/webbrowser/themes/windows/sync-throbber.png b/webbrowser/themes/windows/sync-throbber.png deleted file mode 100644 index d25490b..0000000 Binary files a/webbrowser/themes/windows/sync-throbber.png and /dev/null differ diff --git a/webbrowser/themes/windows/syncCommon.css b/webbrowser/themes/windows/syncCommon.css deleted file mode 100644 index f0beae0..0000000 --- a/webbrowser/themes/windows/syncCommon.css +++ /dev/null @@ -1,49 +0,0 @@ -/* 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/. */ - -/* The following are used by both sync/setup.xul and sync/genericChange.xul */ -.status { - color: -moz-dialogtext; -} - -.statusIcon { - -moz-margin-start: 4px; - max-height: 16px; - max-width: 16px; -} - -.statusIcon[status="active"] { - list-style-image: url("chrome://global/skin/icons/loading_16.png"); -} - -.statusIcon[status="error"] { - list-style-image: url("chrome://global/skin/icons/error-16.png"); -} - -.statusIcon[status="success"] { - list-style-image: url("chrome://global/skin/icons/information-16.png"); -} - -/* .data is only used by sync/genericChange.xul, but it seems unnecessary to have - a separate stylesheet for it. */ -.data { - font-size: 90%; - font-weight: bold; -} - -dialog#change-dialog { - width: 40em; -} - -image#syncIcon { - list-style-image: url("chrome://browser/skin/sync-32.png"); -} - -#introText { - margin-top: 2px; -} - -#feedback { - height: 2em; -} diff --git a/webbrowser/themes/windows/syncProgress.css b/webbrowser/themes/windows/syncProgress.css deleted file mode 100644 index d7aa599..0000000 --- a/webbrowser/themes/windows/syncProgress.css +++ /dev/null @@ -1,46 +0,0 @@ -/* 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/. */ -@import url(chrome://global/skin/inContentUI.css); - -:root { - height: 100%; - width: 100%; - padding: 0; -} - -body { - margin: 0; - padding: 0 2em; -} - -#floatingBox { - margin: 4em auto; - max-width: 40em; - min-width: 23em; - padding: 1em 1.5em; - position: relative; - text-align: center; -} - -#successLogo { - margin: 1em 2em; -} - -#loadingText { - margin: 2em 6em; -} - -#progressBar { - margin: 2em 10em; -} - -#uploadProgressBar{ - width: 100%; -} - -#bottomRow { - margin-top: 2em; - padding: 0; - text-align: end; -} diff --git a/webbrowser/themes/windows/syncQuota.css b/webbrowser/themes/windows/syncQuota.css deleted file mode 100644 index 1577de8..0000000 --- a/webbrowser/themes/windows/syncQuota.css +++ /dev/null @@ -1,26 +0,0 @@ -/* 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/. */ - -#quotaDialog { - width: 33em; - height: 25em; -} - -treechildren::-moz-tree-checkbox { - list-style-image: none; -} -treechildren::-moz-tree-checkbox(checked) { - list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif"); -} -treechildren::-moz-tree-checkbox(disabled) { - list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif"); -} - -#treeCaption { - height: 4em; -} - -.captionWarning { - font-weight: bold; -} diff --git a/webbrowser/themes/windows/syncSetup.css b/webbrowser/themes/windows/syncSetup.css deleted file mode 100644 index fff65e9..0000000 --- a/webbrowser/themes/windows/syncSetup.css +++ /dev/null @@ -1,132 +0,0 @@ -/* 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/. */ - -wizard { - -moz-appearance: none; - width: 55em; - height: 45em; - padding: 0; - background-color: Window; -} - -.wizard-page-box { - -moz-appearance: none; - padding-left: 0; - padding-right: 0; - margin: 0; -} - -wizardpage { - -moz-box-pack: center; - -moz-box-align: center; - margin: 0; - padding: 0 6em; - background-color: Window; -} - -.wizard-header { - -moz-appearance: none; - border: none; - padding: 2em 0 1em 0; - text-align: center; -} -.wizard-header-label { - font-size: 24pt; - font-weight: normal; -} - -.wizard-buttons { - background-color: rgba(0,0,0,0.1); - padding: 1em; -} - -.wizard-buttons-separator { - visibility: collapse; -} - -.wizard-header-icon { - visibility: collapse; -} - -.accountChoiceButton { - font: menu; -} - -.confirm { - border: 1px solid black; - padding: 1em; - border-radius: 5px; -} - -/* Override the text-link style from global.css */ -description > .text-link, -description > .text-link:focus { - margin: 0px; - padding: 0px; - border: 0px; -} - - -.success, -.error { - padding: 2px; - border-radius: 2px; -} - -.error { - background-color: #FF0000 !important; - color: #FFFFFF !important; -} - -.success { - background-color: #00FF00 !important; -} - -.warning { - font-weight: bold; - font-size: 100%; - color: red; -} - -.mainDesc { - font-weight: bold; - font-size: 100%; -} - -.normal { - font-size: 100%; -} - -.inputColumn { - -moz-margin-end: 2px -} - -.pin { - font-size: 18pt; - width: 4em; - text-align: center; -} - -#passphraseHelpSpacer { - width: 0.5em; -} - -#pairDeviceThrobber > image, -#login-throbber > image { - list-style-image: url("chrome://global/skin/icons/loading_16.png"); -} - -#captchaFeedback { - visibility: hidden; -} - -#successPageIcon { - /* TODO replace this with a 128px version (bug 591122) */ - list-style-image: url("chrome://browser/skin/sync-32.png"); -} - -#tosDesc { - margin-left: -7px; - margin-bottom: 3px; -} \ No newline at end of file diff --git a/webbrowser/themes/windows/tabbrowser/alltabs-inverted.png b/webbrowser/themes/windows/tabbrowser/alltabs-inverted.png deleted file mode 100644 index 002bdd4..0000000 Binary files a/webbrowser/themes/windows/tabbrowser/alltabs-inverted.png and /dev/null differ diff --git a/webbrowser/themes/windows/tabbrowser/alltabs.png b/webbrowser/themes/windows/tabbrowser/alltabs.png deleted file mode 100644 index 172d425..0000000 Binary files a/webbrowser/themes/windows/tabbrowser/alltabs.png and /dev/null differ diff --git a/webbrowser/themes/windows/tabbrowser/connecting.png b/webbrowser/themes/windows/tabbrowser/connecting.png deleted file mode 100644 index e564fb5..0000000 Binary files a/webbrowser/themes/windows/tabbrowser/connecting.png and /dev/null differ diff --git a/webbrowser/themes/windows/tabbrowser/loading.png b/webbrowser/themes/windows/tabbrowser/loading.png deleted file mode 100644 index ba54836..0000000 Binary files a/webbrowser/themes/windows/tabbrowser/loading.png and /dev/null differ diff --git a/webbrowser/themes/windows/tabbrowser/newtab-glass.png b/webbrowser/themes/windows/tabbrowser/newtab-glass.png deleted file mode 100644 index 15185be..0000000 Binary files a/webbrowser/themes/windows/tabbrowser/newtab-glass.png and /dev/null differ diff --git a/webbrowser/themes/windows/tabbrowser/newtab-inverted.png b/webbrowser/themes/windows/tabbrowser/newtab-inverted.png deleted file mode 100644 index 4ac1eba..0000000 Binary files a/webbrowser/themes/windows/tabbrowser/newtab-inverted.png and /dev/null differ diff --git a/webbrowser/themes/windows/tabbrowser/newtab.png b/webbrowser/themes/windows/tabbrowser/newtab.png deleted file mode 100644 index 7cea7bd..0000000 Binary files a/webbrowser/themes/windows/tabbrowser/newtab.png and /dev/null differ diff --git a/webbrowser/themes/windows/tabbrowser/tab-arrow-left-glass.png b/webbrowser/themes/windows/tabbrowser/tab-arrow-left-glass.png deleted file mode 100644 index aac93a7..0000000 Binary files a/webbrowser/themes/windows/tabbrowser/tab-arrow-left-glass.png and /dev/null differ diff --git a/webbrowser/themes/windows/tabbrowser/tab-arrow-left-inverted.png b/webbrowser/themes/windows/tabbrowser/tab-arrow-left-inverted.png deleted file mode 100644 index 16cd7a2..0000000 Binary files a/webbrowser/themes/windows/tabbrowser/tab-arrow-left-inverted.png and /dev/null differ diff --git a/webbrowser/themes/windows/tabbrowser/tab-arrow-left.png b/webbrowser/themes/windows/tabbrowser/tab-arrow-left.png deleted file mode 100644 index e0fb348..0000000 Binary files a/webbrowser/themes/windows/tabbrowser/tab-arrow-left.png and /dev/null differ diff --git a/webbrowser/themes/windows/tabbrowser/tab-overflow-border.png b/webbrowser/themes/windows/tabbrowser/tab-overflow-border.png deleted file mode 100644 index 77f2462..0000000 Binary files a/webbrowser/themes/windows/tabbrowser/tab-overflow-border.png and /dev/null differ diff --git a/webbrowser/themes/windows/tabbrowser/tabDragIndicator.png b/webbrowser/themes/windows/tabbrowser/tabDragIndicator.png deleted file mode 100644 index c67c233..0000000 Binary files a/webbrowser/themes/windows/tabbrowser/tabDragIndicator.png and /dev/null differ diff --git a/webbrowser/themes/windows/toolbarbutton-dropdown-arrow-inverted.png b/webbrowser/themes/windows/toolbarbutton-dropdown-arrow-inverted.png deleted file mode 100644 index f3261f1..0000000 Binary files a/webbrowser/themes/windows/toolbarbutton-dropdown-arrow-inverted.png and /dev/null differ diff --git a/webbrowser/themes/windows/toolbarbutton-dropdown-arrow.png b/webbrowser/themes/windows/toolbarbutton-dropdown-arrow.png deleted file mode 100644 index a7abe73..0000000 Binary files a/webbrowser/themes/windows/toolbarbutton-dropdown-arrow.png and /dev/null differ diff --git a/webbrowser/themes/windows/urlbar-arrow.png b/webbrowser/themes/windows/urlbar-arrow.png deleted file mode 100644 index fcab253..0000000 Binary files a/webbrowser/themes/windows/urlbar-arrow.png and /dev/null differ diff --git a/webbrowser/themes/windows/urlbar-history-dropmarker.png b/webbrowser/themes/windows/urlbar-history-dropmarker.png deleted file mode 100644 index fc8b0be..0000000 Binary files a/webbrowser/themes/windows/urlbar-history-dropmarker.png and /dev/null differ diff --git a/webbrowser/themes/windows/urlbar-popup-blocked.png b/webbrowser/themes/windows/urlbar-popup-blocked.png deleted file mode 100644 index e6fd29f..0000000 Binary files a/webbrowser/themes/windows/urlbar-popup-blocked.png and /dev/null differ diff --git a/webbrowser/themes/windows/web-notifications-icon.svg b/webbrowser/themes/windows/web-notifications-icon.svg deleted file mode 100644 index f7186c7..0000000 --- a/webbrowser/themes/windows/web-notifications-icon.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - diff --git a/webbrowser/themes/windows/web-notifications-tray.svg b/webbrowser/themes/windows/web-notifications-tray.svg deleted file mode 100644 index 314026a..0000000 --- a/webbrowser/themes/windows/web-notifications-tray.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - diff --git a/webbrowser/themes/windows/webRTC-shareDevice-16.png b/webbrowser/themes/windows/webRTC-shareDevice-16.png deleted file mode 100644 index df01b33..0000000 Binary files a/webbrowser/themes/windows/webRTC-shareDevice-16.png and /dev/null differ diff --git a/webbrowser/themes/windows/webRTC-shareDevice-64.png b/webbrowser/themes/windows/webRTC-shareDevice-64.png deleted file mode 100644 index d125789..0000000 Binary files a/webbrowser/themes/windows/webRTC-shareDevice-64.png and /dev/null differ diff --git a/webbrowser/themes/windows/webRTC-sharingDevice-16.png b/webbrowser/themes/windows/webRTC-sharingDevice-16.png deleted file mode 100644 index a670676..0000000 Binary files a/webbrowser/themes/windows/webRTC-sharingDevice-16.png and /dev/null differ -- cgit v1.2.3