From c4936caa471bf2105ce977fe9b3bc0acf74be9e5 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Sat, 15 Apr 2017 00:10:32 -0400 Subject: Branding files updated for v52 --- data/branding/icecat/Makefile.in | 56 --------------- data/branding/icecat/VisualElementsManifest.xml | 16 ----- data/branding/icecat/VisualElements_150.png | Bin 0 -> 58904 bytes data/branding/icecat/VisualElements_70.png | Bin 0 -> 20285 bytes data/branding/icecat/content/Makefile.in | 13 ---- .../icecat/content/VisualElements_logo.png | Bin 24397 -> 0 bytes .../icecat/content/VisualElements_smalllogo.png | Bin 2588 -> 0 bytes .../icecat/content/VisualElements_splashscreen.png | Bin 75713 -> 0 bytes data/branding/icecat/content/about-wordmark.svg | 78 --------------------- data/branding/icecat/content/aboutDialog.css | 3 +- .../icecat/content/identity-icons-brand.png | Bin 1601 -> 0 bytes .../icecat/content/identity-icons-brand.svg | 59 ++++++++++++++++ .../icecat/content/identity-icons-brand@2x.png | Bin 4114 -> 0 bytes data/branding/icecat/content/jar.mn | 27 +++---- .../branding/icecat/content/metro-about-footer.png | Bin 93828 -> 0 bytes .../icecat/content/metro-about-wordmark.png | Bin 2298 -> 0 bytes data/branding/icecat/content/metro-about.css | 14 ---- .../icecat/content/metro_firstrun_logo.png | Bin 49057 -> 0 bytes .../icecat/content/metro_firstrun_logo@1.4x.png | Bin 83476 -> 0 bytes .../icecat/content/metro_firstrun_logo@1.8x.png | Bin 117482 -> 0 bytes data/branding/icecat/content/moz.build | 2 +- .../icecat/icecat.VisualElementsManifest.xml | 8 +++ data/branding/icecat/moz.build | 7 +- data/branding/icecat/newtab.ico | Bin 1150 -> 6518 bytes data/branding/icecat/newwindow.ico | Bin 1150 -> 6518 bytes data/branding/icecat/pbmode.ico | Bin 1150 -> 6518 bytes data/branding/icecat/pref/icecat-branding.js | 3 + 27 files changed, 84 insertions(+), 202 deletions(-) delete mode 100644 data/branding/icecat/Makefile.in delete mode 100644 data/branding/icecat/VisualElementsManifest.xml create mode 100644 data/branding/icecat/VisualElements_150.png create mode 100644 data/branding/icecat/VisualElements_70.png delete mode 100644 data/branding/icecat/content/Makefile.in delete mode 100644 data/branding/icecat/content/VisualElements_logo.png delete mode 100644 data/branding/icecat/content/VisualElements_smalllogo.png delete mode 100644 data/branding/icecat/content/VisualElements_splashscreen.png delete mode 100644 data/branding/icecat/content/about-wordmark.svg delete mode 100644 data/branding/icecat/content/identity-icons-brand.png create mode 100644 data/branding/icecat/content/identity-icons-brand.svg delete mode 100644 data/branding/icecat/content/identity-icons-brand@2x.png delete mode 100644 data/branding/icecat/content/metro-about-footer.png delete mode 100644 data/branding/icecat/content/metro-about-wordmark.png delete mode 100644 data/branding/icecat/content/metro-about.css delete mode 100644 data/branding/icecat/content/metro_firstrun_logo.png delete mode 100644 data/branding/icecat/content/metro_firstrun_logo@1.4x.png delete mode 100644 data/branding/icecat/content/metro_firstrun_logo@1.8x.png create mode 100644 data/branding/icecat/icecat.VisualElementsManifest.xml (limited to 'data/branding') diff --git a/data/branding/icecat/Makefile.in b/data/branding/icecat/Makefile.in deleted file mode 100644 index d858c5b..0000000 --- a/data/branding/icecat/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 := \ - icecat.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 \ - icecat.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/data/branding/icecat/VisualElementsManifest.xml b/data/branding/icecat/VisualElementsManifest.xml deleted file mode 100644 index f763409..0000000 --- a/data/branding/icecat/VisualElementsManifest.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - diff --git a/data/branding/icecat/VisualElements_150.png b/data/branding/icecat/VisualElements_150.png new file mode 100644 index 0000000..c32999a Binary files /dev/null and b/data/branding/icecat/VisualElements_150.png differ diff --git a/data/branding/icecat/VisualElements_70.png b/data/branding/icecat/VisualElements_70.png new file mode 100644 index 0000000..b504997 Binary files /dev/null and b/data/branding/icecat/VisualElements_70.png differ diff --git a/data/branding/icecat/content/Makefile.in b/data/branding/icecat/content/Makefile.in deleted file mode 100644 index 2d17f36..0000000 --- a/data/branding/icecat/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/data/branding/icecat/content/VisualElements_logo.png b/data/branding/icecat/content/VisualElements_logo.png deleted file mode 100644 index 0cbf367..0000000 Binary files a/data/branding/icecat/content/VisualElements_logo.png and /dev/null differ diff --git a/data/branding/icecat/content/VisualElements_smalllogo.png b/data/branding/icecat/content/VisualElements_smalllogo.png deleted file mode 100644 index 425f9fd..0000000 Binary files a/data/branding/icecat/content/VisualElements_smalllogo.png and /dev/null differ diff --git a/data/branding/icecat/content/VisualElements_splashscreen.png b/data/branding/icecat/content/VisualElements_splashscreen.png deleted file mode 100644 index 484ac2f..0000000 Binary files a/data/branding/icecat/content/VisualElements_splashscreen.png and /dev/null differ diff --git a/data/branding/icecat/content/about-wordmark.svg b/data/branding/icecat/content/about-wordmark.svg deleted file mode 100644 index 7c73566..0000000 --- a/data/branding/icecat/content/about-wordmark.svg +++ /dev/null @@ -1,78 +0,0 @@ - -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 f3f6491..46ba1b7 100644 --- a/data/branding/icecat/content/aboutDialog.css +++ b/data/branding/icecat/content/aboutDialog.css @@ -15,7 +15,7 @@ min-width: 210px; min-height: 210px; margin-top: 20px; - -moz-margin-start: 30px; + margin-inline-start: 30px; } @@ -28,7 +28,6 @@ #rightBox { margin-left: 30px; margin-right: 30px; - min-width: 300px; } #updateDeck > hbox > label:not([class="text-link"]) { diff --git a/data/branding/icecat/content/identity-icons-brand.png b/data/branding/icecat/content/identity-icons-brand.png deleted file mode 100644 index b26b76d..0000000 Binary files a/data/branding/icecat/content/identity-icons-brand.png and /dev/null differ diff --git a/data/branding/icecat/content/identity-icons-brand.svg b/data/branding/icecat/content/identity-icons-brand.svg new file mode 100644 index 0000000..230938f --- /dev/null +++ b/data/branding/icecat/content/identity-icons-brand.svg @@ -0,0 +1,59 @@ + + + + + + + + image/svg+xml + + + + + + + + diff --git a/data/branding/icecat/content/identity-icons-brand@2x.png b/data/branding/icecat/content/identity-icons-brand@2x.png deleted file mode 100644 index 41e9a1d..0000000 Binary files a/data/branding/icecat/content/identity-icons-brand@2x.png and /dev/null differ diff --git a/data/branding/icecat/content/jar.mn b/data/branding/icecat/content/jar.mn index fec1857..4b8c5fc 100644 --- a/data/branding/icecat/content/jar.mn +++ b/data/branding/icecat/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.png (about-wordmark.png) - 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.png + 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/data/branding/icecat/content/metro-about-footer.png b/data/branding/icecat/content/metro-about-footer.png deleted file mode 100644 index c81a520..0000000 Binary files a/data/branding/icecat/content/metro-about-footer.png and /dev/null differ diff --git a/data/branding/icecat/content/metro-about-wordmark.png b/data/branding/icecat/content/metro-about-wordmark.png deleted file mode 100644 index 6870bb6..0000000 Binary files a/data/branding/icecat/content/metro-about-wordmark.png and /dev/null differ diff --git a/data/branding/icecat/content/metro-about.css b/data/branding/icecat/content/metro-about.css deleted file mode 100644 index 70c5c73..0000000 --- a/data/branding/icecat/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/data/branding/icecat/content/metro_firstrun_logo.png b/data/branding/icecat/content/metro_firstrun_logo.png deleted file mode 100644 index 8ad7f27..0000000 Binary files a/data/branding/icecat/content/metro_firstrun_logo.png and /dev/null differ diff --git a/data/branding/icecat/content/metro_firstrun_logo@1.4x.png b/data/branding/icecat/content/metro_firstrun_logo@1.4x.png deleted file mode 100644 index 8a247a8..0000000 Binary files a/data/branding/icecat/content/metro_firstrun_logo@1.4x.png and /dev/null differ diff --git a/data/branding/icecat/content/metro_firstrun_logo@1.8x.png b/data/branding/icecat/content/metro_firstrun_logo@1.8x.png deleted file mode 100644 index a716c58..0000000 Binary files a/data/branding/icecat/content/metro_firstrun_logo@1.8x.png and /dev/null differ diff --git a/data/branding/icecat/content/moz.build b/data/branding/icecat/content/moz.build index c97072b..eb4454d 100644 --- a/data/branding/icecat/content/moz.build +++ b/data/branding/icecat/content/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/icecat.VisualElementsManifest.xml b/data/branding/icecat/icecat.VisualElementsManifest.xml new file mode 100644 index 0000000..d675d57 --- /dev/null +++ b/data/branding/icecat/icecat.VisualElementsManifest.xml @@ -0,0 +1,8 @@ + + + diff --git a/data/branding/icecat/moz.build b/data/branding/icecat/moz.build index 408c1f0..e613901 100644 --- a/data/branding/icecat/moz.build +++ b/data/branding/icecat/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 @@ -9,7 +9,6 @@ DIRS += ['content', 'locales'] DIST_SUBDIR = 'browser' export('DIST_SUBDIR') -JS_PREFERENCE_FILES += [ - 'pref/icecat-branding.js', -] +include('../branding-common.mozbuild') +IceCatBranding() diff --git a/data/branding/icecat/newtab.ico b/data/branding/icecat/newtab.ico index 6e3fee6..a9b37c0 100644 Binary files a/data/branding/icecat/newtab.ico and b/data/branding/icecat/newtab.ico differ diff --git a/data/branding/icecat/newwindow.ico b/data/branding/icecat/newwindow.ico index a300935..5537207 100644 Binary files a/data/branding/icecat/newwindow.ico and b/data/branding/icecat/newwindow.ico differ diff --git a/data/branding/icecat/pbmode.ico b/data/branding/icecat/pbmode.ico index d217994..47677c1 100644 Binary files a/data/branding/icecat/pbmode.ico and b/data/branding/icecat/pbmode.ico differ diff --git a/data/branding/icecat/pref/icecat-branding.js b/data/branding/icecat/pref/icecat-branding.js index 4c0eb17..84b9c63 100644 --- a/data/branding/icecat/pref/icecat-branding.js +++ b/data/branding/icecat/pref/icecat-branding.js @@ -27,3 +27,6 @@ pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused pref("browser.search.param.yahoo-fr-ja", ""); pref("browser.search.param.yahoo-f-CN", ""); +// 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", 0); -- cgit v1.2.3