From 9af981fc8ac0be2cd4ac344d809fe648e78cbeb3 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Thu, 13 Sep 2018 20:41:41 -0400 Subject: Updated branding files for v60 --- data/branding/icecat.VisualElementsManifest.xml | 8 +++ data/branding/icecat/branding.nsi | 13 +++-- data/branding/icecat/content/about-wordmark.svg | 62 +++++++++++++++++++++ data/branding/icecat/content/aboutDialog.css | 23 ++++++-- data/branding/icecat/content/jar.mn | 9 ++- data/branding/icecat/content/silhouette-40.svg | 58 ------------------- data/branding/icecat/default128.png | Bin 0 -> 25374 bytes data/branding/icecat/default64.png | Bin 0 -> 7318 bytes data/branding/icecat/locales/en-US/brand.ftl | 5 ++ .../branding/icecat/locales/en-US/brand.properties | 10 +--- data/branding/icecat/locales/jar.mn | 4 +- data/branding/icecat/locales/moz.build | 2 +- data/branding/icecat/moz.build | 1 - data/branding/icecat/pref/icecat-branding.js | 25 ++++++--- makeicecat | 12 ---- 15 files changed, 129 insertions(+), 103 deletions(-) create mode 100644 data/branding/icecat.VisualElementsManifest.xml create mode 100644 data/branding/icecat/content/about-wordmark.svg delete mode 100644 data/branding/icecat/content/silhouette-40.svg create mode 100644 data/branding/icecat/default128.png create mode 100644 data/branding/icecat/default64.png create mode 100644 data/branding/icecat/locales/en-US/brand.ftl diff --git a/data/branding/icecat.VisualElementsManifest.xml b/data/branding/icecat.VisualElementsManifest.xml new file mode 100644 index 0000000..16e932c --- /dev/null +++ b/data/branding/icecat.VisualElementsManifest.xml @@ -0,0 +1,8 @@ + + + diff --git a/data/branding/icecat/branding.nsi b/data/branding/icecat/branding.nsi index 57a76b2..7d4a6f8 100644 --- a/data/branding/icecat/branding.nsi +++ b/data/branding/icecat/branding.nsi @@ -8,21 +8,26 @@ # BrandFullNameInternal is used for some registry and file system values # instead of BrandFullName and typically should not be modified. -!define BrandFullNameInternal "GNU IceCat" +!define BrandFullNameInternal "IceCat" +!define BrandFullName "IceCat" !define CompanyName "GNU" -!define URLInfoAbout "http://www.gnu.org/software/gnuzilla/" +!define URLInfoAbout "https://www.gnu.org/software/gnuzilla/" !define URLUpdateInfo "https://savannah.gnu.org/projects/gnuzilla/" -!define HelpLink "http://libreplanet.org/wiki/Group:IceCat/ " +!define HelpLink "https://libreplanet.org/wiki/Group:IceCat/ " ; The OFFICIAL define is a workaround to support different urls for Release and ; Beta since they share the same branding when building with other branches that ; set the update channel to beta. !define OFFICIAL +!define URLStubDownload32 "https://www.gnu.org/software/gnuzilla/" +!define URLStubDownload64 "https://www.gnu.org/software/gnuzilla/" +!define URLManualDownload "https://www.gnu.org/software/gnuzilla/" +!define URLSystemRequirements "https://www.gnu.org/software/gnuzilla/" !define Channel "release" # The installer's certificate name and issuer expected by the stub installer !define CertNameDownload "Mozilla Corporation" -!define CertIssuerDownload "DigiCert Assured ID Code Signing CA-1" +!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA" # Dialog units are used so the UI displays correctly with the system's DPI # settings. diff --git a/data/branding/icecat/content/about-wordmark.svg b/data/branding/icecat/content/about-wordmark.svg new file mode 100644 index 0000000..06fcb88 --- /dev/null +++ b/data/branding/icecat/content/about-wordmark.svg @@ -0,0 +1,62 @@ + +image/svg+xml \ No newline at end of file diff --git a/data/branding/icecat/content/aboutDialog.css b/data/branding/icecat/content/aboutDialog.css index 46ba1b7..6312a59 100644 --- a/data/branding/icecat/content/aboutDialog.css +++ b/data/branding/icecat/content/aboutDialog.css @@ -2,15 +2,20 @@ * 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/. */ +#aboutDialogContainer { + background-color: #202340; + color: #fff; +} + #clientBox { - background-color: #F7F7F7; - color: #222222; + padding: 10px 0 15px; } #leftBox { background-image: url("chrome://branding/content/about-logo.png"); background-repeat: no-repeat; background-size: 192px auto; + background-position: center 20%; /* min-width and min-height create room for the logo */ min-width: 210px; min-height: 210px; @@ -25,13 +30,23 @@ } } +.text-link { + color: #fff !important; + text-decoration: underline; +} + +.text-link:-moz-focusring { + border-color: #fff; +} + #rightBox { margin-left: 30px; margin-right: 30px; } -#updateDeck > hbox > label:not([class="text-link"]) { - color: #909090; +#bottomBox { + background-color: hsla(235, 43%, 10%, .5); + padding: 15px 10px 15px; } #trademark { diff --git a/data/branding/icecat/content/jar.mn b/data/branding/icecat/content/jar.mn index 4b8c5fc..40e013e 100644 --- a/data/branding/icecat/content/jar.mn +++ b/data/branding/icecat/content/jar.mn @@ -7,12 +7,11 @@ browser.jar: content/branding/about.png content/branding/about-logo.png content/branding/about-logo@2x.png - content/branding/about-wordmark.png - content/branding/icon48.png - content/branding/icon64.png + content/branding/about-wordmark.svg content/branding/icon16.png (../default16.png) content/branding/icon32.png (../default32.png) - content/branding/icon128.png (../mozicon128.png) + content/branding/icon48.png (../default48.png) + content/branding/icon64.png (../default64.png) + content/branding/icon128.png (../default128.png) content/branding/identity-icons-brand.svg - content/branding/silhouette-40.svg content/branding/aboutDialog.css diff --git a/data/branding/icecat/content/silhouette-40.svg b/data/branding/icecat/content/silhouette-40.svg deleted file mode 100644 index 72d2291..0000000 --- a/data/branding/icecat/content/silhouette-40.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/data/branding/icecat/default128.png b/data/branding/icecat/default128.png new file mode 100644 index 0000000..6d922fd Binary files /dev/null and b/data/branding/icecat/default128.png differ diff --git a/data/branding/icecat/default64.png b/data/branding/icecat/default64.png new file mode 100644 index 0000000..16e1d6e Binary files /dev/null and b/data/branding/icecat/default64.png differ diff --git a/data/branding/icecat/locales/en-US/brand.ftl b/data/branding/icecat/locales/en-US/brand.ftl new file mode 100644 index 0000000..bd7fbe0 --- /dev/null +++ b/data/branding/icecat/locales/en-US/brand.ftl @@ -0,0 +1,5 @@ +# 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/. + +-brand-short-name = IceCat diff --git a/data/branding/icecat/locales/en-US/brand.properties b/data/branding/icecat/locales/en-US/brand.properties index 73ef208..85e2894 100644 --- a/data/branding/icecat/locales/en-US/brand.properties +++ b/data/branding/icecat/locales/en-US/brand.properties @@ -4,13 +4,7 @@ brandShorterName=IceCat brandShortName=IceCat -brandFullName=Mozilla IceCat -vendorShortName=Mozilla - -homePageSingleStartMain=IceCat Start, a fast home page with built-in search -homePageImport=Import your home page from %S - -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: +brandFullName=IceCat +vendorShortName=GNU syncBrandShortName=Sync diff --git a/data/branding/icecat/locales/jar.mn b/data/branding/icecat/locales/jar.mn index 731a24b..c78c829 100644 --- a/data/branding/icecat/locales/jar.mn +++ b/data/branding/icecat/locales/jar.mn @@ -3,9 +3,11 @@ # 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/. +[localization] @AB_CD@.jar: + branding (%*.ftl) @AB_CD@.jar: % locale branding @AB_CD@ %locale/branding/ locale/branding/brand.dtd (%brand.dtd) locale/branding/brand.properties (%brand.properties) - locale/branding/browserconfig.properties (browserconfig.properties) + locale/branding/browserconfig.properties diff --git a/data/branding/icecat/locales/moz.build b/data/branding/icecat/locales/moz.build index c97072b..eb4454d 100644 --- a/data/branding/icecat/locales/moz.build +++ b/data/branding/icecat/locales/moz.build @@ -1,4 +1,4 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# -*- 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 diff --git a/data/branding/icecat/moz.build b/data/branding/icecat/moz.build index e613901..72f0f52 100644 --- a/data/branding/icecat/moz.build +++ b/data/branding/icecat/moz.build @@ -11,4 +11,3 @@ export('DIST_SUBDIR') include('../branding-common.mozbuild') IceCatBranding() - diff --git a/data/branding/icecat/pref/icecat-branding.js b/data/branding/icecat/pref/icecat-branding.js index 84b9c63..aecf8eb 100644 --- a/data/branding/icecat/pref/icecat-branding.js +++ b/data/branding/icecat/pref/icecat-branding.js @@ -4,12 +4,15 @@ pref("startup.homepage_override_url","http://www.gnu.org"); pref("startup.homepage_welcome_url","http://www.gnu.org/software/gnuzilla/"); -// The time interval between checks for a new version (in seconds) -// nightly=8 hours, official=24 hours -pref("app.update.interval", 86400); +pref("startup.homepage_welcome_url.additional", ""); +// Interval: Time between checks for a new version (in seconds) +pref("app.update.interval", 43200); // 12 hours // The time interval between the downloading of mar file chunks in the // background (in seconds) -pref("app.update.download.backgroundInterval", 60); +// 0 means "download everything at once" +pref("app.update.download.backgroundInterval", 0); +// Give the user x seconds to react before showing the big UI. default=192 hours +pref("app.update.promptWaitTime", 691200); // URL user can browse to manually if for some reason all update installation // attempts fail. pref("app.update.url.manual", "http://www.gnu.org/software/gnuzilla/"); @@ -17,15 +20,19 @@ pref("app.update.url.manual", "http://www.gnu.org/software/gnuzilla/"); // supplied in the "An update is available" page of the update wizard. pref("app.update.url.details", "http://www.gnu.org/software/gnuzilla/"); + // Release notes and vendor URLs pref("app.releaseNotesURL", "http://www.gnu.org/software/gnuzilla/"); pref("app.vendorURL", "http://www.gnu.org/"); -// Search codes belong only in builds with official branding -pref("browser.search.param.yahoo-fr", ""); -pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused -pref("browser.search.param.yahoo-fr-ja", ""); -pref("browser.search.param.yahoo-f-CN", ""); +// The number of days a binary is permitted to be old +// without checking for an update. This assumes that +// app.update.checkInstallTime is true. +pref("app.update.checkInstallTime.days", 63); + +// Give the user x seconds to reboot before showing a badge on the hamburger +// button. default=4 days +pref("app.update.badgeWaitTime", 345600); // Number of usages of the web console or scratchpad. // If this is less than 5, then pasting code into the web console or scratchpad is disabled diff --git a/makeicecat b/makeicecat index fb96a07..069d905 100644 --- a/makeicecat +++ b/makeicecat @@ -474,17 +474,6 @@ wf36=$DATA/android-images/resources/drawable-hdpi-v11/ic_status_logo.png ma50=$DATA/android-images/core/marketplace-logo.png ma128=$DATA/android-images/resources/drawable-mdpi/marketplace.png -cp $ff64 devtools/client/framework/dev-edition-promo/dev-edition-logo.png -cp $ff128 mobile/android/base/resources/raw/bookmarkdefaults_favicon_support.png -cp $favicon addon-sdk/source/examples/toolbar-api/data/favicon.ico -cp $gf32 browser/themes/shared/icon.png -cp $gf150 mobile/android/base/resources/drawable-hdpi/icon_search_empty_icecat.png -cp $gf150 mobile/android/base/resources/drawable-xhdpi/icon_search_empty_icecat.png -cp $gf150 mobile/android/base/resources/drawable-xxhdpi/icon_search_empty_icecat.png -cp $gf32 browser/themes/shared/theme-switcher-icon.png -cp $gf32 browser/themes/shared/heme-switcher-icon@2x.png -cp $gf32 browser/base/content/aboutaccounts/images/fox.png - cp $ff16 dom/canvas/test/crossorigin/image.png cp $ff16 image/test/unit/image1.png cp $jpglogo image/test/unit/image1png16x16.jpg @@ -496,7 +485,6 @@ cp $ff32 image/test/unit/image2jpg32x32-win.png cp $ff16 dom/canvas/test/crossorigin/image-allow-credentials.png cp $ff16 dom/html/test/image-allow-credentials.png cp $ff16 dom/canvas/test/crossorigin/image-allow-star.png -#cp $ff32 toolkit/webapps/tests/data/icon.png cp $ff16 toolkit/components/places/tests/favicons/expected-favicon-big32.jpg.png cp $ff16 toolkit/components/places/tests/favicons/expected-favicon-big64.png.png cp $jpglogo toolkit/components/places/tests/favicons/favicon-big32.jpg -- cgit v1.2.3