diff --git a/helpers/DATA/firefox/branding/Makefile.in b/helpers/DATA/firefox/branding/Makefile.in deleted file mode 100644 index dc9da14..0000000 --- a/helpers/DATA/firefox/branding/Makefile.in +++ /dev/null @@ -1,56 +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)/config/config.mk - -# On Windows only do this step for browser, skip for metro. -ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser) -BRANDING_FILES := \ - abrowser.ico \ - document.ico \ - branding.nsi \ - appname.bmp \ - bgintro.bmp \ - clock.bmp \ - particles.bmp \ - pencil.bmp \ - pencil-rtl.bmp \ - wizHeader.bmp \ - wizHeaderRTL.bmp \ - wizWatermark.bmp \ - newwindow.ico \ - newtab.ico \ - pbmode.ico \ - $(NULL) -endif - -ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) -BRANDING_FILES := \ - background.png \ - abrowser.icns \ - disk.icns \ - document.icns \ - dsstore \ - $(NULL) -endif - -ifdef MOZ_WIDGET_GTK -BRANDING_FILES := \ - default16.png \ - default32.png \ - default48.png \ - mozicon128.png \ - $(NULL) -endif - -BRANDING_DEST := $(DIST)/branding -BRANDING_TARGET := export -INSTALL_TARGETS += BRANDING - -ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) -VISUALMANIFEST := VisualElementsManifest.xml -VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME} -VISUALMANIFEST_PATH := $(DIST)/bin -PP_TARGETS += VISUALMANIFEST -endif diff --git a/helpers/DATA/firefox/branding/VisualElementsManifest.xml b/helpers/DATA/firefox/branding/VisualElementsManifest.xml deleted file mode 100644 index a549ae4..0000000 --- a/helpers/DATA/firefox/branding/VisualElementsManifest.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - diff --git a/helpers/DATA/firefox/branding/content/Makefile.in b/helpers/DATA/firefox/branding/content/Makefile.in deleted file mode 100644 index 2d17f36..0000000 --- a/helpers/DATA/firefox/branding/content/Makefile.in +++ /dev/null @@ -1,13 +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/. - -# Branding Makefile -# - jars chrome artwork - -# resources needed for the metro tile interface -ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro) -TILE_FILES := $(wildcard $(srcdir)/VisualElements*) -TILE_DEST := $(DIST)/bin/tileresources -INSTALL_TARGETS += TILE -endif diff --git a/helpers/DATA/firefox/branding/content/VisualElements_logo.png b/helpers/DATA/firefox/branding/content/VisualElements_logo.png deleted file mode 100644 index 7f8f5b9..0000000 Binary files a/helpers/DATA/firefox/branding/content/VisualElements_logo.png and /dev/null differ diff --git a/helpers/DATA/firefox/branding/content/VisualElements_smalllogo.png b/helpers/DATA/firefox/branding/content/VisualElements_smalllogo.png deleted file mode 100644 index 8f60ca0..0000000 Binary files a/helpers/DATA/firefox/branding/content/VisualElements_smalllogo.png and /dev/null differ diff --git a/helpers/DATA/firefox/branding/content/VisualElements_splashscreen.png b/helpers/DATA/firefox/branding/content/VisualElements_splashscreen.png deleted file mode 100644 index 50cf4b7..0000000 Binary files a/helpers/DATA/firefox/branding/content/VisualElements_splashscreen.png and /dev/null differ diff --git a/helpers/DATA/firefox/branding/content/identity-icons-brand.png b/helpers/DATA/firefox/branding/content/identity-icons-brand.png deleted file mode 100644 index feba160..0000000 Binary files a/helpers/DATA/firefox/branding/content/identity-icons-brand.png and /dev/null differ diff --git a/helpers/DATA/firefox/branding/content/identity-icons-brand.svg b/helpers/DATA/firefox/branding/content/identity-icons-brand.svg new file mode 100644 index 0000000..3a927f9 --- /dev/null +++ b/helpers/DATA/firefox/branding/content/identity-icons-brand.svg @@ -0,0 +1,59 @@ + + + + + + + + image/svg+xml + + + + + + + + diff --git a/helpers/DATA/firefox/branding/content/identity-icons-brand@2x.png b/helpers/DATA/firefox/branding/content/identity-icons-brand@2x.png deleted file mode 100644 index 9b2d6bc..0000000 Binary files a/helpers/DATA/firefox/branding/content/identity-icons-brand@2x.png and /dev/null differ diff --git a/helpers/DATA/firefox/branding/content/jar.mn b/helpers/DATA/firefox/branding/content/jar.mn index f14c5cd..bdc1df6 100644 --- a/helpers/DATA/firefox/branding/content/jar.mn +++ b/helpers/DATA/firefox/branding/content/jar.mn @@ -4,24 +4,15 @@ browser.jar: % content branding %content/branding/ contentaccessible=yes - content/branding/about.png (about.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) - content/branding/icon48.png (icon48.png) - content/branding/icon64.png (icon64.png) + content/branding/about.png + content/branding/about-logo.png + content/branding/about-logo@2x.png + content/branding/about-wordmark.svg + content/branding/icon48.png + content/branding/icon64.png content/branding/icon16.png (../default16.png) content/branding/icon32.png (../default32.png) 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) - content/branding/metro-about-footer.png (metro-about-footer.png) - content/branding/metro-about-wordmark.png (metro-about-wordmark.png) - content/branding/metro_firstrun_logo.png (metro_firstrun_logo.png) - content/branding/metro_firstrun_logo@1.4x.png (metro_firstrun_logo@1.4x.png) - content/branding/metro_firstrun_logo@1.8x.png (metro_firstrun_logo@1.8x.png) -#endif + content/branding/identity-icons-brand.svg + content/branding/silhouette-40.svg + content/branding/aboutDialog.css diff --git a/helpers/DATA/firefox/branding/content/metro-about-footer.png b/helpers/DATA/firefox/branding/content/metro-about-footer.png deleted file mode 100644 index 8e507f1..0000000 Binary files a/helpers/DATA/firefox/branding/content/metro-about-footer.png and /dev/null differ diff --git a/helpers/DATA/firefox/branding/content/metro-about-wordmark.png b/helpers/DATA/firefox/branding/content/metro-about-wordmark.png deleted file mode 100644 index 8b51896..0000000 Binary files a/helpers/DATA/firefox/branding/content/metro-about-wordmark.png and /dev/null differ diff --git a/helpers/DATA/firefox/branding/content/metro-about.css b/helpers/DATA/firefox/branding/content/metro-about.css deleted file mode 100644 index 70c5c73..0000000 --- a/helpers/DATA/firefox/branding/content/metro-about.css +++ /dev/null @@ -1,14 +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/. */ - -#about-flyoutpanel { - background-color: #0095dd; - color: white; -} - -#about-policy-label:hover, -#about-policy-label:active { - background: #036fa4; -} - diff --git a/helpers/DATA/firefox/branding/content/metro_firstrun_logo.png b/helpers/DATA/firefox/branding/content/metro_firstrun_logo.png deleted file mode 100644 index d54fb00..0000000 Binary files a/helpers/DATA/firefox/branding/content/metro_firstrun_logo.png and /dev/null differ diff --git a/helpers/DATA/firefox/branding/content/metro_firstrun_logo@1.4x.png b/helpers/DATA/firefox/branding/content/metro_firstrun_logo@1.4x.png deleted file mode 100644 index d2a2fff..0000000 Binary files a/helpers/DATA/firefox/branding/content/metro_firstrun_logo@1.4x.png and /dev/null differ diff --git a/helpers/DATA/firefox/branding/content/metro_firstrun_logo@1.8x.png b/helpers/DATA/firefox/branding/content/metro_firstrun_logo@1.8x.png deleted file mode 100644 index 2d5297f..0000000 Binary files a/helpers/DATA/firefox/branding/content/metro_firstrun_logo@1.8x.png and /dev/null differ diff --git a/helpers/DATA/firefox/branding/locales/en-US/brand.dtd b/helpers/DATA/firefox/branding/locales/en-US/brand.dtd index 874b6b1..2ca349a 100644 --- a/helpers/DATA/firefox/branding/locales/en-US/brand.dtd +++ b/helpers/DATA/firefox/branding/locales/en-US/brand.dtd @@ -6,4 +6,4 @@ - + diff --git a/helpers/DATA/firefox/branding/locales/jar.mn b/helpers/DATA/firefox/branding/locales/jar.mn index 0296be2..9fdfe57 100644 --- a/helpers/DATA/firefox/branding/locales/jar.mn +++ b/helpers/DATA/firefox/branding/locales/jar.mn @@ -9,4 +9,3 @@ locale/branding/brand.dtd (%brand.dtd) locale/branding/brand.properties (%brand.properties) locale/branding/browserconfig.properties - diff --git a/helpers/DATA/firefox/branding/moz.build b/helpers/DATA/firefox/branding/moz.build index 4f68daf..ba29e9e 100644 --- a/helpers/DATA/firefox/branding/moz.build +++ b/helpers/DATA/firefox/branding/moz.build @@ -9,7 +9,5 @@ DIRS += ['content', 'locales'] DIST_SUBDIR = 'browser' export('DIST_SUBDIR') -JS_PREFERENCE_FILES += [ - 'pref/abrowser-branding.js', -] - +include('../branding-common.mozbuild') +AbrowserBranding() diff --git a/helpers/DATA/firefox/branding/newtab.ico b/helpers/DATA/firefox/branding/newtab.ico index 6e3fee6..a9b37c0 100644 Binary files a/helpers/DATA/firefox/branding/newtab.ico and b/helpers/DATA/firefox/branding/newtab.ico differ diff --git a/helpers/DATA/firefox/branding/newwindow.ico b/helpers/DATA/firefox/branding/newwindow.ico index a300935..5537207 100644 Binary files a/helpers/DATA/firefox/branding/newwindow.ico and b/helpers/DATA/firefox/branding/newwindow.ico differ diff --git a/helpers/DATA/firefox/branding/pbmode.ico b/helpers/DATA/firefox/branding/pbmode.ico index d217994..47677c1 100644 Binary files a/helpers/DATA/firefox/branding/pbmode.ico and b/helpers/DATA/firefox/branding/pbmode.ico differ diff --git a/helpers/DATA/firefox/branding/pref/abrowser-branding.js b/helpers/DATA/firefox/branding/pref/abrowser-branding.js index 7d7f5d2..63b8b52 100644 --- a/helpers/DATA/firefox/branding/pref/abrowser-branding.js +++ b/helpers/DATA/firefox/branding/pref/abrowser-branding.js @@ -1,3 +1,7 @@ +/* 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/. */ + pref("startup.homepage_override_url","http://trisquel.info"); pref("startup.homepage_welcome_url","http://trisquel.info/welcome"); // The time interval between checks for a new version (in seconds)