diff --git a/helpers/DATA/firefox/branding/LICENSE b/helpers/DATA/firefox/branding/LICENSE index 32d55b9..41dc232 100644 --- a/helpers/DATA/firefox/branding/LICENSE +++ b/helpers/DATA/firefox/branding/LICENSE @@ -1,10 +1,3 @@ -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/. diff --git a/helpers/DATA/firefox/branding/Makefile.in b/helpers/DATA/firefox/branding/Makefile.in index 0d21270..dc9da14 100644 --- a/helpers/DATA/firefox/branding/Makefile.in +++ b/helpers/DATA/firefox/branding/Makefile.in @@ -4,8 +4,6 @@ include $(topsrcdir)/config/config.mk -PREF_JS_EXPORTS = $(srcdir)/pref/abrowser-branding.js - # On Windows only do this step for browser, skip for metro. ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser) BRANDING_FILES := \ @@ -14,7 +12,6 @@ BRANDING_FILES := \ branding.nsi \ appname.bmp \ bgintro.bmp \ - bgplain.bmp \ clock.bmp \ particles.bmp \ pencil.bmp \ @@ -47,13 +44,6 @@ BRANDING_FILES := \ $(NULL) endif -ifeq ($(OS_ARCH),OS2) -BRANDING_FILES := \ - abrowser-os2.ico \ - document-os2.ico \ - $(NULL) -endif - BRANDING_DEST := $(DIST)/branding BRANDING_TARGET := export INSTALL_TARGETS += BRANDING diff --git a/helpers/DATA/firefox/branding/VisualElementsManifest.xml b/helpers/DATA/firefox/branding/VisualElementsManifest.xml index f763409..a549ae4 100644 --- a/helpers/DATA/firefox/branding/VisualElementsManifest.xml +++ b/helpers/DATA/firefox/branding/VisualElementsManifest.xml @@ -5,7 +5,7 @@ Logo="tileresources\VisualElements_logo.png" SmallLogo="tileresources\VisualElements_smalllogo.png" ForegroundText="light" - BackgroundColor="#0a1833"> + BackgroundColor="#1895f5"> image/svg+xml - - - -image/svg+xmlAbrowser - + id="text2986" + sodipodi:linespacing="125%">Abrowser \ No newline at end of file diff --git a/helpers/DATA/firefox/branding/content/aboutDialog.css b/helpers/DATA/firefox/branding/content/aboutDialog.css index 4c2a7b6..e4f70e3 100644 --- a/helpers/DATA/firefox/branding/content/aboutDialog.css +++ b/helpers/DATA/firefox/branding/content/aboutDialog.css @@ -2,24 +2,44 @@ * 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"); - background-repeat: no-repeat; - background-color: #000; - color: #fff; +#clientBox { + background-color: #F7F7F7; + color: #222222; } -.text-link { - color: #fff !important; - text-decoration: underline; +#leftBox { + background-image: url("chrome://branding/content/about-logo.png"); + background-repeat: no-repeat; + background-size: 192px auto; + /* min-width and min-height create room for the logo */ + min-width: 210px; + min-height: 210px; + margin-top: 20px; + -moz-margin-start: 30px; +} + + +@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; + min-width: 300px; } -#bottomBox { - background-color: rgba(0,0,0,.7); +#updateDeck > hbox > label:not([class="text-link"]) { + color: #909090; } + +#trademark { + font-size: xx-small; + text-align: center; + color: #999999; + margin-top: 10px; + margin-bottom: 10px; +} + diff --git a/helpers/DATA/firefox/branding/content/jar.mn b/helpers/DATA/firefox/branding/content/jar.mn index dc07b3d..f14c5cd 100644 --- a/helpers/DATA/firefox/branding/content/jar.mn +++ b/helpers/DATA/firefox/branding/content/jar.mn @@ -5,7 +5,6 @@ browser.jar: % content branding %content/branding/ contentaccessible=yes content/branding/about.png (about.png) - content/branding/about-background.png (about-background.png) content/branding/about-logo.png (about-logo.png) content/branding/about-logo@2x.png (about-logo@2x.png) content/branding/about-wordmark.svg (about-wordmark.svg) @@ -16,6 +15,7 @@ browser.jar: content/branding/icon128.png (../mozicon128.png) content/branding/identity-icons-brand.png (identity-icons-brand.png) content/branding/identity-icons-brand@2x.png (identity-icons-brand@2x.png) + content/branding/silhouette-40.svg (silhouette-40.svg) content/branding/aboutDialog.css (aboutDialog.css) #ifdef MOZ_METRO content/branding/metro-about.css (metro-about.css) diff --git a/helpers/DATA/firefox/branding/content/metro-about.css b/helpers/DATA/firefox/branding/content/metro-about.css index ae59ca7..70c5c73 100644 --- a/helpers/DATA/firefox/branding/content/metro-about.css +++ b/helpers/DATA/firefox/branding/content/metro-about.css @@ -3,12 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #about-flyoutpanel { - background-color: #002147; + background-color: #0095dd; color: white; } #about-policy-label:hover, #about-policy-label:active { - background: #0a111c; + background: #036fa4; } diff --git a/helpers/DATA/firefox/branding/content/silhouette-40.svg b/helpers/DATA/firefox/branding/content/silhouette-40.svg new file mode 100644 index 0000000..bef6045 --- /dev/null +++ b/helpers/DATA/firefox/branding/content/silhouette-40.svg @@ -0,0 +1,1359 @@ + + + + diff --git a/helpers/DATA/firefox/branding/default22.png b/helpers/DATA/firefox/branding/default22.png new file mode 100644 index 0000000..e34f84f Binary files /dev/null and b/helpers/DATA/firefox/branding/default22.png differ diff --git a/helpers/DATA/firefox/branding/default24.png b/helpers/DATA/firefox/branding/default24.png new file mode 100644 index 0000000..5eff32a Binary files /dev/null and b/helpers/DATA/firefox/branding/default24.png differ diff --git a/helpers/DATA/firefox/branding/default256.png b/helpers/DATA/firefox/branding/default256.png new file mode 100644 index 0000000..46f9a22 Binary files /dev/null and b/helpers/DATA/firefox/branding/default256.png differ diff --git a/helpers/DATA/firefox/branding/document-os2.ico b/helpers/DATA/firefox/branding/document-os2.ico deleted file mode 100644 index 214e92c..0000000 Binary files a/helpers/DATA/firefox/branding/document-os2.ico and /dev/null differ diff --git a/helpers/DATA/firefox/branding/locales/Makefile.in b/helpers/DATA/firefox/branding/locales/Makefile.in deleted file mode 100644 index 82f614e..0000000 --- a/helpers/DATA/firefox/branding/locales/Makefile.in +++ /dev/null @@ -1,5 +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/. - -DEFINES += -DAB_CD=$(AB_CD) diff --git a/helpers/DATA/firefox/branding/locales/browserconfig.properties b/helpers/DATA/firefox/branding/locales/browserconfig.properties index dc9c2ba..06cefec 100644 --- a/helpers/DATA/firefox/branding/locales/browserconfig.properties +++ b/helpers/DATA/firefox/branding/locales/browserconfig.properties @@ -3,4 +3,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Do NOT localize or otherwise change these values -browser.startup.homepage=about:abrowser +browser.startup.homepage=about:home diff --git a/helpers/DATA/firefox/branding/locales/en-US/brand.dtd b/helpers/DATA/firefox/branding/locales/en-US/brand.dtd index b1b0eb7..874b6b1 100644 --- a/helpers/DATA/firefox/branding/locales/en-US/brand.dtd +++ b/helpers/DATA/firefox/branding/locales/en-US/brand.dtd @@ -2,7 +2,8 @@ - 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/. --> + - + diff --git a/helpers/DATA/firefox/branding/locales/en-US/brand.properties b/helpers/DATA/firefox/branding/locales/en-US/brand.properties index a24cc63..ca39ed6 100644 --- a/helpers/DATA/firefox/branding/locales/en-US/brand.properties +++ b/helpers/DATA/firefox/branding/locales/en-US/brand.properties @@ -2,6 +2,7 @@ # 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/. +brandShorterName=Abrowser brandShortName=Abrowser brandFullName=Abrowser vendorShortName=Trisquel diff --git a/helpers/DATA/firefox/branding/locales/jar.mn b/helpers/DATA/firefox/branding/locales/jar.mn index ff4e055..ff8c28c 100644 --- a/helpers/DATA/firefox/branding/locales/jar.mn +++ b/helpers/DATA/firefox/branding/locales/jar.mn @@ -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/browserconfig.properties (browserconfig.properties) + locale/branding/brand.dtd (%brand.dtd) +* locale/branding/brand.properties (%brand.properties) +* locale/branding/browserconfig.properties (browserconfig.properties) diff --git a/helpers/DATA/firefox/branding/locales/moz.build b/helpers/DATA/firefox/branding/locales/moz.build index 3a54c0c..c97072b 100644 --- a/helpers/DATA/firefox/branding/locales/moz.build +++ b/helpers/DATA/firefox/branding/locales/moz.build @@ -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'] \ No newline at end of file diff --git a/helpers/DATA/firefox/branding/moz.build b/helpers/DATA/firefox/branding/moz.build index 3e2f88f..4f68daf 100644 --- a/helpers/DATA/firefox/branding/moz.build +++ b/helpers/DATA/firefox/branding/moz.build @@ -8,3 +8,8 @@ DIRS += ['content', 'locales'] DIST_SUBDIR = 'browser' export('DIST_SUBDIR') + +JS_PREFERENCE_FILES += [ + 'pref/abrowser-branding.js', +] + diff --git a/helpers/DATA/firefox/settings.js b/helpers/DATA/firefox/settings.js index a691eed..0f02a21 100644 --- a/helpers/DATA/firefox/settings.js +++ b/helpers/DATA/firefox/settings.js @@ -172,3 +172,5 @@ pref("browser.apps.URL", ""); //Disable Firefox Hello pref("loop.enabled",false); +// Use old style preferences, that allow javascript to be disabled +pref("browser.preferences.inContent",false); diff --git a/helpers/make-firefox b/helpers/make-firefox index 3c81daa..4b6d008 100644 --- a/helpers/make-firefox +++ b/helpers/make-firefox @@ -1,6 +1,7 @@ #!/bin/bash # # Copyright (C) 2008-2014 Ruben Rodriguez +# Copyright (C) 2015 Santiago Rodriguez # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -189,6 +190,13 @@ echo "debian/search/* /usr/lib/abrowser-addons/searchplugins" >> debian/abrowser cp $DATA/aboutabrowser@trisquel.info -r debian echo "debian/aboutabrowser@trisquel.info @MOZ_ADDONDIR@/extensions/" >> debian/abrowser.install.in +# Disable newtab "What is this" popup and config button +cat << EOF >> ./browser/base/content/newtab/newTab.css +#newtab.customize.what, #newtab.customize.button { +display:none; +} +EOF + # Disable search field at extensions panel #sed '/header-search/d; /search.placeholder/d' -i toolkit/mozapps/extensions/content/extensions.xul cat << EOF >> toolkit/mozapps/extensions/content/extensions.css