Permalink
Browse files

Fix missing labels and branding files.

  • Loading branch information...
MrAlex94 committed Aug 19, 2017
1 parent f63d3b0 commit 2bdc9aadfd5b57496450f9cb94b90376b7447e0e
Showing with 95 additions and 56 deletions.
  1. +1 −1 browser/base/content/aboutDialog.xul
  2. BIN browser/branding/unofficial/.VolumeIcon.icns
  3. +10 −0 browser/branding/unofficial/LICENSE
  4. BIN browser/branding/unofficial/VisualElements_150.png
  5. BIN browser/branding/unofficial/VisualElements_70.png
  6. BIN browser/branding/unofficial/background.png
  7. BIN browser/branding/unofficial/bgstub.bmp
  8. +26 −20 browser/branding/unofficial/branding.nsi
  9. BIN browser/branding/unofficial/content/about-background.png
  10. BIN browser/branding/unofficial/content/about-logo.png
  11. BIN browser/branding/unofficial/content/about-logo@2x.png
  12. +1 −1 browser/branding/unofficial/content/about-wordmark.svg
  13. BIN browser/branding/unofficial/content/about.png
  14. +30 −12 browser/branding/unofficial/content/aboutDialog.css
  15. BIN browser/branding/unofficial/content/icon48.png
  16. BIN browser/branding/unofficial/content/icon64.png
  17. 0 browser/branding/unofficial/content/identity-icons-brand.svg
  18. +0 −1 browser/branding/unofficial/content/jar.mn
  19. 0 browser/branding/unofficial/content/moz.build
  20. BIN browser/branding/unofficial/default16.png
  21. BIN browser/branding/unofficial/default22.png
  22. BIN browser/branding/unofficial/default24.png
  23. BIN browser/branding/unofficial/default256.png
  24. BIN browser/branding/unofficial/default32.png
  25. BIN browser/branding/unofficial/default48.png
  26. BIN browser/branding/unofficial/disk.icns
  27. BIN browser/branding/unofficial/document.icns
  28. BIN browser/branding/unofficial/document.ico
  29. BIN browser/branding/unofficial/dsstore
  30. +1 −1 browser/branding/unofficial/firefox.VisualElementsManifest.xml
  31. BIN browser/branding/unofficial/firefox.icns
  32. BIN browser/branding/unofficial/firefox.ico
  33. 0 browser/branding/unofficial/locales/browserconfig.properties
  34. +1 −1 browser/branding/unofficial/locales/en-US/brand.dtd
  35. +7 −1 browser/branding/unofficial/locales/en-US/brand.properties
  36. +2 −3 browser/branding/unofficial/locales/jar.mn
  37. +0 −2 browser/branding/unofficial/locales/moz.build
  38. 0 browser/branding/unofficial/moz.build
  39. BIN browser/branding/unofficial/mozicon128.png
  40. BIN browser/branding/unofficial/newtab.ico
  41. BIN browser/branding/unofficial/newwindow.ico
  42. BIN browser/branding/unofficial/pbmode.ico
  43. +13 −10 browser/branding/unofficial/pref/firefox-branding.js
  44. BIN browser/branding/unofficial/wizHeader.bmp
  45. BIN browser/branding/unofficial/wizHeaderRTL.bmp
  46. BIN browser/branding/unofficial/wizWatermark.bmp
  47. +2 −2 browser/components/preferences/in-content-new/advanced.xul
  48. +1 −1 browser/locales/en-US/chrome/browser/aboutDialog.dtd
@@ -71,7 +71,7 @@
</hbox>
<hbox id="apply" align="center">
<button id="updateButton" align="start"
label="&update.updateButton.label3;"
label="&update.updateButton.label2;"
accesskey="&update.updateButton.accesskey;"
oncommand="gAppUpdater.buttonRestartAfterDownload();"/>
<spacer flex="1"/>
Binary file not shown.
@@ -0,0 +1,10 @@
These files are under the MPL 2, as below. However, please note that you
are not granted any trademark rights or licenses to the trademarks of the
Mozilla Foundation or any party, including without limitation the
Firefox name or logo.
For more information, see: http://www.mozilla.org/foundation/licensing.html
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/.
View
No changes.
View
No changes.
View
No changes.
View
Binary file not shown.
View
@@ -2,22 +2,28 @@
# 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/.
# NSIS branding defines for unofficial builds.
# The official release build branding.nsi is located in other-license/branding/firefox/
# NSIS branding defines for official release builds.
# The nightly build branding.nsi is located in browser/installer/windows/nsis/
# The unofficial build branding.nsi is located in browser/branding/unofficial/
# BrandFullNameInternal is used for some registry and file system values
# instead of BrandFullName and typically should not be modified.
!define BrandFullNameInternal "Waterfox"
!define CompanyName "waterfoxproject.org"
!define CompanyName "Waterfox Ltd"
!define URLInfoAbout "https://www.waterfoxproject.org"
!define HelpLink "https://www.reddit.com/r/waterfox"
!define URLUpdateInfo "https://www.waterfoxproject.org"
!define HelpLink "https://www.waterfoxproject.org"
!define URLStubDownload32 ""
!define URLStubDownload64 ""
; 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.waterfoxproject.org/downloads"
!define URLStubDownload64 "https://www.waterfoxproject.org/downloads"
!define URLStubDownload "https://www.waterfoxproject.org/downloads"
!define URLManualDownload "https://www.waterfoxproject.org/downloads"
!define URLSystemRequirements "https://www.waterfoxproject.org/downloads"
!define Channel "unofficial"
!define Channel "release"
# The installer's certificate name and issuer expected by the stub installer
!define CertNameDownload "Mozilla Corporation"
@@ -27,20 +33,20 @@
# settings.
# The dialog units for the bitmap's dimensions should match exactly with the
# bitmap's width and height in pixels.
!define APPNAME_BMP_WIDTH_DU 159u
!define APPNAME_BMP_HEIGHT_DU 50u
!define INTRO_BLURB_WIDTH_DU "230u"
!define INTRO_BLURB_EDGE_DU "198u"
!define INTRO_BLURB_LTR_TOP_DU "16u"
!define INTRO_BLURB_RTL_TOP_DU "11u"
!define APPNAME_BMP_WIDTH_DU "134u"
!define APPNAME_BMP_HEIGHT_DU "36u"
!define INTRO_BLURB_WIDTH_DU "258u"
!define INTRO_BLURB_EDGE_DU "170u"
!define INTRO_BLURB_LTR_TOP_DU "20u"
!define INTRO_BLURB_RTL_TOP_DU "12u"
# UI Colors that can be customized for each channel
!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666666
!define FOOTER_BKGRD_COLOR 0xFFFFFF
!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF
!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF
!define COMMON_TEXT_COLOR_NORMAL 0xFFFFFF
!define COMMON_TEXT_COLOR_FADED 0xA1AAB3
!define COMMON_BKGRD_COLOR 0x0F1B26
!define INTRO_BLURB_TEXT_COLOR 0x666666
!define INSTALL_BLURB_TEXT_COLOR 0x666666
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666666
!define COMMON_TEXT_COLOR_NORMAL 0x000000
!define COMMON_TEXT_COLOR_FADED 0x666666
!define COMMON_BKGRD_COLOR 0xF0F0F0
Binary file not shown.
View
No changes.
No changes.
@@ -1 +1 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="128.4" height="22.3" viewBox="0 0 128.4 22.3"><defs><style>.cls-1{fill:#fff;}</style></defs><title>about-wordmark</title><path class="cls-1" d="M15.9,8l4.3,16.1c.3,1.2.5,2.3.5,2.3h.1a17,17,0,0,1,.4-2.3L25.2,8h3.2L22.7,29.9H19L15.2,15.7c-.4-1.4-.7-3.1-.7-3.1h-.1s-.3,1.7-.7,3.1L9.9,29.9H6.5L.9,8H4.1L8,24.1a17,17,0,0,1,.4,2.3h.1s.2-1.1.5-2.3L13.2,8Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M39.3,20.1H40v-.3c0-2.6-1.5-3.4-3.4-3.4a8.24,8.24,0,0,0-4.4,1.5L31,15.7a9.9,9.9,0,0,1,5.9-1.9c4,0,6.2,2.2,6.2,6.1v9.9H40.3V28.3a6.76,6.76,0,0,1,.1-1.2h-.1a5.46,5.46,0,0,1-5,3.1c-2.7,0-5.3-1.6-5.3-4.8C29.9,20.4,36.7,20.1,39.3,20.1Zm-3.5,7.8c2.5,0,4.2-2.7,4.2-5v-.5h-.8c-2.3,0-6.4.2-6.4,3A2.75,2.75,0,0,0,35.8,27.9Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M48.1,16.9h-2V14.5h2.1V9.9h2.9v4.5h3.8v2.4H51.1v7c0,3.1,2.2,3.5,3.3,3.5a2.44,2.44,0,0,0,.7-.1V30a5,5,0,0,1-1.1.1c-2,0-6-.6-6-5.9V16.9Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M65.3,13.9c4.4,0,6.8,3.3,6.8,7.3,0,.4-.1,1.3-.1,1.3H60.5a5.2,5.2,0,0,0,5.4,5.2,7.75,7.75,0,0,0,4.7-1.8l1.2,2.2a9.35,9.35,0,0,1-6.1,2.2,8,8,0,0,1-8.3-8.2C57.4,17.1,60.8,13.9,65.3,13.9ZM69,20.3c-.1-2.7-1.8-4-3.8-4a4.46,4.46,0,0,0-4.6,4Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M75.7,14.2h2.9V17a6.76,6.76,0,0,1-.1,1.2h.1a5.32,5.32,0,0,1,5-4.1,3.78,3.78,0,0,1,.8.1v3a4.13,4.13,0,0,0-.9-.1,4.81,4.81,0,0,0-4.4,3.7,9,9,0,0,0-.4,2.8V30h-3Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M88.2,16.9h-2V14.5h2v-.7c0-5.2,3.9-5.8,5.9-5.8a5,5,0,0,1,1.1.1v2.6a2.77,2.77,0,0,0-.8-.1,3,3,0,0,0-3.3,3.3v.7h3.7V17H91.1V30.1h-3V16.9Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M105.1,13.9a8.21,8.21,0,1,1-8.5,8.2A8.18,8.18,0,0,1,105.1,13.9Zm0,13.8a5.42,5.42,0,0,0,5.4-5.6,5.37,5.37,0,0,0-5.4-5.6,5.42,5.42,0,0,0-5.4,5.6A5.37,5.37,0,0,0,105.1,27.7Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M122.4,23.8a4.54,4.54,0,0,1-.5.9l-3.3,5.2h-3.4l5.3-8.1-5.1-7.6h3.4l2.9,4.8c.2.4.5.9.5.9h.1s.3-.5.5-.9l2.9-4.8h3.4L124,21.8l5.3,8.1h-3.4l-3.3-5.2a1.44,1.44,0,0,0-.2-.9Z" transform="translate(-0.9 -8)"/></svg>
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="128.4" height="22.3" viewBox="0 0 128.4 22.3"><defs><style>.cls-1{fill:#666;}</style></defs><title>about-wordmark</title><path class="cls-1" d="M15.9,8l4.3,16.1c.3,1.2.5,2.3.5,2.3h.1a17,17,0,0,1,.4-2.3L25.2,8h3.2L22.7,29.9H19L15.2,15.7c-.4-1.4-.7-3.1-.7-3.1h-.1s-.3,1.7-.7,3.1L9.9,29.9H6.5L.9,8H4.1L8,24.1a17,17,0,0,1,.4,2.3h.1s.2-1.1.5-2.3L13.2,8Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M39.3,20.1H40v-.3c0-2.6-1.5-3.4-3.4-3.4a8.24,8.24,0,0,0-4.4,1.5L31,15.7a9.9,9.9,0,0,1,5.9-1.9c4,0,6.2,2.2,6.2,6.1v9.9H40.3V28.3a6.76,6.76,0,0,1,.1-1.2h-.1a5.46,5.46,0,0,1-5,3.1c-2.7,0-5.3-1.6-5.3-4.8C29.9,20.4,36.7,20.1,39.3,20.1Zm-3.5,7.8c2.5,0,4.2-2.7,4.2-5v-.5h-.8c-2.3,0-6.4.2-6.4,3A2.75,2.75,0,0,0,35.8,27.9Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M48.1,16.9h-2V14.5h2.1V9.9h2.9v4.5h3.8v2.4H51.1v7c0,3.1,2.2,3.5,3.3,3.5a2.44,2.44,0,0,0,.7-.1V30a5,5,0,0,1-1.1.1c-2,0-6-.6-6-5.9V16.9Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M65.3,13.9c4.4,0,6.8,3.3,6.8,7.3,0,.4-.1,1.3-.1,1.3H60.5a5.2,5.2,0,0,0,5.4,5.2,7.75,7.75,0,0,0,4.7-1.8l1.2,2.2a9.35,9.35,0,0,1-6.1,2.2,8,8,0,0,1-8.3-8.2C57.4,17.1,60.8,13.9,65.3,13.9ZM69,20.3c-.1-2.7-1.8-4-3.8-4a4.46,4.46,0,0,0-4.6,4Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M75.7,14.2h2.9V17a6.76,6.76,0,0,1-.1,1.2h.1a5.32,5.32,0,0,1,5-4.1,3.78,3.78,0,0,1,.8.1v3a4.13,4.13,0,0,0-.9-.1,4.81,4.81,0,0,0-4.4,3.7,9,9,0,0,0-.4,2.8V30h-3Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M88.2,16.9h-2V14.5h2v-.7c0-5.2,3.9-5.8,5.9-5.8a5,5,0,0,1,1.1.1v2.6a2.77,2.77,0,0,0-.8-.1,3,3,0,0,0-3.3,3.3v.7h3.7V17H91.1V30.1h-3V16.9Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M105.1,13.9a8.21,8.21,0,1,1-8.5,8.2A8.18,8.18,0,0,1,105.1,13.9Zm0,13.8a5.42,5.42,0,0,0,5.4-5.6,5.37,5.37,0,0,0-5.4-5.6,5.42,5.42,0,0,0-5.4,5.6A5.37,5.37,0,0,0,105.1,27.7Z" transform="translate(-0.9 -8)"/><path class="cls-1" d="M122.4,23.8a4.54,4.54,0,0,1-.5.9l-3.3,5.2h-3.4l5.3-8.1-5.1-7.6h3.4l2.9,4.8c.2.4.5.9.5.9h.1s.3-.5.5-.9l2.9-4.8h3.4L124,21.8l5.3,8.1h-3.4l-3.3-5.2a1.44,1.44,0,0,0-.2-.9Z" transform="translate(-0.9 -8)"/></svg>
View
No changes.
View
@@ -2,24 +2,42 @@
* 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-image: url("chrome://branding/content/about-background.png");
#clientBox {
background-color: #F7F7F7;
color: #222222;
}
#leftBox {
background-image: url("chrome://branding/content/about-logo.png");
background-repeat: no-repeat;
background-color: rgb(10,17,37);
color: #fff;
background-size: 192px auto;
/* min-width and min-height create room for the logo */
min-width: 210px;
min-height: 210px;
margin-top: 20px;
margin-inline-start: 30px;
}
.text-link {
color: #fff !important;
text-decoration: underline;
@media (min-resolution: 2dppx) {
#leftBox {
background-image: url("chrome://branding/content/about-logo@2x.png");
}
}
#rightBox {
/* this margin prevents text from overlapping the planet image */
margin-left: 280px;
margin-right: 20px;
margin-left: 30px;
margin-right: 30px;
}
#updateDeck > hbox > label:not([class="text-link"]) {
color: #909090;
}
#bottomBox {
background-color: rgba(0,0,0,.7);
#trademark {
font-size: xx-small;
text-align: center;
color: #999999;
margin-top: 10px;
margin-bottom: 10px;
}
View
No changes.
View
No changes.
No changes.
View
@@ -5,7 +5,6 @@
browser.jar:
% content branding %content/branding/ contentaccessible=yes
content/branding/about.png
content/branding/about-background.png
content/branding/about-logo.png
content/branding/about-logo@2x.png
content/branding/about-wordmark.svg
View
No changes.
View
No changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
BIN browser/branding/unofficial/dsstore 100644 → 100755
Binary file not shown.
@@ -4,5 +4,5 @@
Square150x150Logo='browser\VisualElements\VisualElements_150.png'
Square70x70Logo='browser\VisualElements\VisualElements_70.png'
ForegroundText='light'
BackgroundColor='#14171a'/>
BackgroundColor='#0996f8'/>
</Application>
View
No changes.
View
No changes.
No changes.
View
@@ -5,5 +5,5 @@
<!ENTITY brandShorterName "Waterfox">
<!ENTITY brandShortName "Waterfox">
<!ENTITY brandFullName "Waterfox">
<!ENTITY vendorShortName "Waterfox Ltd.">
<!ENTITY vendorShortName "Waterfox">
<!ENTITY trademarkInfo.part1 "Waterfox is not associated with Mozilla.">
@@ -5,6 +5,12 @@
brandShorterName=Waterfox
brandShortName=Waterfox
brandFullName=Waterfox
vendorShortName=Waterfox Ltd.
vendorShortName=Waterfox
homePageSingleStartMain=Waterfox 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:
syncBrandShortName=Sync
View
@@ -6,7 +6,6 @@
@AB_CD@.jar:
% locale branding @AB_CD@ %locale/branding/
# Unofficial branding only exists in en-US
locale/branding/brand.dtd (en-US/brand.dtd)
locale/branding/brand.properties (en-US/brand.properties)
locale/branding/brand.dtd (%brand.dtd)
locale/branding/brand.properties (%brand.properties)
locale/branding/browserconfig.properties
View
@@ -4,6 +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/.
DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID']
JAR_MANIFESTS += ['jar.mn']
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
No changes.
View
@@ -5,29 +5,32 @@
pref("startup.homepage_override_url", "https://www.waterfoxproject.org/blog/waterfox-%VERSION%-release-download");
pref("startup.homepage_welcome_url", "https://www.waterfoxproject.org/blog/waterfox-%VERSION%-release-download");
pref("startup.homepage_welcome_url.additional", "");
// The time interval between checks for a new version (in seconds)
pref("app.update.interval", 86400); // 24 hours
// 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);
// Give the user x seconds to react before showing the big UI. default=24 hours
pref("app.update.promptWaitTime", 86400);
// 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", "https://www.waterfoxproject.org/downloads");
// A default value for the "More information about this update" link
// supplied in the "An update is available" page of the update wizard.
pref("app.update.url.details", "https://www.waterfoxproject.org/blog/waterfox-%VERSION%-release-download");
pref("app.update.url.details", "https://www.waterfoxproject.org/blog/");
pref("app.releaseNotesURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/releasenotes/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=whatsnew");
// 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", 2);
pref("app.update.checkInstallTime.days", 63);
// Give the user x seconds to reboot before showing a badge on the hamburger
// button. default=immediately
pref("app.update.badgeWaitTime", 0);
// 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
pref("devtools.selfxss.count", 5);
pref("devtools.selfxss.count", 0);
View
No changes.
View
No changes.
View
No changes.
@@ -96,7 +96,7 @@
<hbox id="apply" align="center">
<spacer flex="1"/>
<button id="updateButton"
label="&update.updateButton.label3;"
label="&update.updateButton.label2;"
accesskey="&update.updateButton.accesskey;"
oncommand="gAppUpdater.buttonRestartAfterDownload();"/>
</hbox>
@@ -158,7 +158,7 @@
<hbox id="restarting" align="center">
<image class="update-throbber"/><label>&update.restarting;</label>
<spacer flex="1"/>
<button label="&update.updateButton.label3;"
<button label="&update.updateButton.label2;"
accesskey="&update.updateButton.accesskey;"
disabled="true"/>
</hbox>
@@ -14,7 +14,7 @@
-->
<!ENTITY update.checkForUpdatesButton.label "Check for updates">
<!ENTITY update.checkForUpdatesButton.accesskey "C">
<!ENTITY update.updateButton.label3 "Restart to update &brandShorterName;">
<!ENTITY update.updateButton.label2 "Restart to update &brandShorterName;">
<!ENTITY update.updateButton.accesskey "R">

1 comment on commit 2bdc9aa

@MelchiorGaspar

This comment has been minimized.

Show comment
Hide comment
@MelchiorGaspar

MelchiorGaspar Aug 20, 2017

lol ;) sry but whats with all the logo changes/updates???
I can't tell any difference ;)

MelchiorGaspar commented on 2bdc9aa Aug 20, 2017

lol ;) sry but whats with all the logo changes/updates???
I can't tell any difference ;)

Please sign in to comment.