Changes to make-firefox for v29

helpers/DATA/firefox/branding/content/Makefile.in

@@ -5,18 +5,9 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # 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
-
-include $(topsrcdir)/config/rules.mk

helpers/DATA/firefox/branding/content/about-wordmark.svg

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="aboutWordmark"
+   x="0px"
+   y="0px"
+   width="130px"
+   height="38px"
+   viewBox="0 0 130 38"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="about-wordmark.svg"><metadata
+   id="metadata9"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs7" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1364"
+   inkscape:window-height="698"
+   id="namedview5"
+   showgrid="false"
+   inkscape:zoom="15.487971"
+   inkscape:cx="85.460639"
+   inkscape:cy="13.895176"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="aboutWordmark" />
+
+  
+	
+<text
+   xml:space="preserve"
+   style="font-size:28.27791785999999874px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans"
+   x="0.4501974"
+   y="37.289883"
+   id="text2986"
+   sodipodi:linespacing="125%"><tspan
+     sodipodi:role="line"
+     id="tspan2988"
+     x="0.4501974"
+     y="37.289883"
+     style="font-weight:bold;-inkscape-font-specification:Sans Bold;fill:#ffffff;fill-opacity:1">Abrowser</tspan></text>
+
+</svg>

helpers/DATA/firefox/branding/content/aboutDialog.css

@@ -11,6 +11,7 @@
 
 .text-link {
   color: #fff !important;
+  text-decoration: underline;
 }
 
 #rightBox {

helpers/DATA/firefox/branding/content/jar.mn

@@ -7,9 +7,21 @@ browser.jar:
   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-wordmark.png            (about-wordmark.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/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/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

helpers/DATA/firefox/branding/content/metro-about.css

@@ -0,0 +1,14 @@
+/* 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: #002147;
+  color: white;
+}
+
+#about-policy-label:hover,
+#about-policy-label:active {
+  background: #0a111c;
+}
+

helpers/DATA/firefox/branding/content/moz.build

@@ -1,5 +1,7 @@
+# -*- Mode: python; c-basic-offset: 4; 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
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+JAR_MANIFESTS += ['jar.mn']