diff --git a/mobile/branding/nightly/Makefile.in b/mobile/branding/nightly/Makefile.in index 860a11e189e6..2648391dc24e 100644 --- a/mobile/branding/nightly/Makefile.in +++ b/mobile/branding/nightly/Makefile.in @@ -42,6 +42,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk DIRS = \ + content \ locales \ $(NULL) diff --git a/mobile/branding/nightly/content/Makefile.in b/mobile/branding/nightly/content/Makefile.in new file mode 100644 index 000000000000..827181f9b49f --- /dev/null +++ b/mobile/branding/nightly/content/Makefile.in @@ -0,0 +1,11 @@ +# Branding Makefile +# - jars chrome artwork + +DEPTH = ../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +include $(topsrcdir)/config/rules.mk diff --git a/mobile/branding/nightly/content/about.png b/mobile/branding/nightly/content/about.png new file mode 100644 index 000000000000..3819f6337a17 Binary files /dev/null and b/mobile/branding/nightly/content/about.png differ diff --git a/mobile/branding/nightly/content/jar.mn b/mobile/branding/nightly/content/jar.mn new file mode 100644 index 000000000000..aa1b9e30ddd5 --- /dev/null +++ b/mobile/branding/nightly/content/jar.mn @@ -0,0 +1,3 @@ +chrome.jar: +% content branding %content/branding/ + content/branding/about.png (about.png) diff --git a/mobile/branding/official/Makefile.in b/mobile/branding/official/Makefile.in index 860a11e189e6..2648391dc24e 100644 --- a/mobile/branding/official/Makefile.in +++ b/mobile/branding/official/Makefile.in @@ -42,6 +42,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk DIRS = \ + content \ locales \ $(NULL) diff --git a/mobile/branding/official/content/Makefile.in b/mobile/branding/official/content/Makefile.in new file mode 100644 index 000000000000..827181f9b49f --- /dev/null +++ b/mobile/branding/official/content/Makefile.in @@ -0,0 +1,11 @@ +# Branding Makefile +# - jars chrome artwork + +DEPTH = ../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +include $(topsrcdir)/config/rules.mk diff --git a/mobile/branding/official/content/about.png b/mobile/branding/official/content/about.png new file mode 100644 index 000000000000..3cc1444f645b Binary files /dev/null and b/mobile/branding/official/content/about.png differ diff --git a/mobile/branding/official/content/jar.mn b/mobile/branding/official/content/jar.mn new file mode 100644 index 000000000000..aa1b9e30ddd5 --- /dev/null +++ b/mobile/branding/official/content/jar.mn @@ -0,0 +1,3 @@ +chrome.jar: +% content branding %content/branding/ + content/branding/about.png (about.png) diff --git a/mobile/chrome/content/about.xhtml b/mobile/chrome/content/about.xhtml index 7f296f71a459..e14b62c5cdd5 100644 --- a/mobile/chrome/content/about.xhtml +++ b/mobile/chrome/content/about.xhtml @@ -57,74 +57,57 @@ &aboutPage.title; - - + -
- &brandShortName; +
+
+ &brandShortName; #expand

&about.version; __MOZ_APP_VERSION__

+
+ + + +
+ +

+

+ +
- - - -
- -

-

- - - diff --git a/mobile/themes/hildon/aboutPage.css b/mobile/themes/hildon/aboutPage.css new file mode 100644 index 000000000000..3466a2912146 --- /dev/null +++ b/mobile/themes/hildon/aboutPage.css @@ -0,0 +1,83 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Mozilla Mobile Browser. + * + * The Initial Developer of the Original Code is + * Mozilla Corporation. + * Portions created by the Initial Developer are Copyright (C) 2008 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Gavin Sharp + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +body { + font: 15px/1.231 helvetic,arial,clean,sans-serif; + color: #69645c; + background: white url("images/aboutBackground.jpg") top center repeat-x; +} + +#wrapper { + max-width: 600px; + margin: 0 auto; +} + +#aboutLogoContainer { + width: 300px; +} + +#version { + font-weight: bold; + color: #909090; + margin: -24px 20px 0 118px; +} + +#aboutLinks { + padding: 5px; + border: 2px solid #e6e5e3; + font-size: 15px; +} +#aboutLinks li { + clear: both; + padding: 5px 10px; + border-bottom: 2px solid #e6e5e3; + list-style: none; +} +#aboutLinks li:last-child { + border-bottom: 0; +} +#aboutLinks li a { + display: block; + color: #3a3834; + background: url("images/arrowright-16.png") right center no-repeat; + padding: 10px 40px 10px 5px; +} + +#aboutDetails { + margin-top: 15px; + font-size: x-small; +} diff --git a/mobile/themes/hildon/images/aboutBackground.jpg b/mobile/themes/hildon/images/aboutBackground.jpg new file mode 100644 index 000000000000..d597702b4b0e Binary files /dev/null and b/mobile/themes/hildon/images/aboutBackground.jpg differ diff --git a/mobile/themes/hildon/jar.mn b/mobile/themes/hildon/jar.mn index e795db44f3e3..d1070c898531 100644 --- a/mobile/themes/hildon/jar.mn +++ b/mobile/themes/hildon/jar.mn @@ -10,9 +10,12 @@ chrome.jar: chrome.jar: % skin browser classic/1.0 % aboutCertError.css (aboutCertError.css) + aboutPage.css (aboutPage.css) platform.css (platform.css) browser.css (browser.css) notification.css (notification.css) + + images/aboutBackground.jpg (images/aboutBackground.jpg) images/arrowright-16.png (images/arrowright-16.png) images/arrowup-16.png (images/arrowup-16.png) images/ratings-18.png (images/ratings-18.png) diff --git a/mobile/themes/wince/aboutPage.css b/mobile/themes/wince/aboutPage.css new file mode 100644 index 000000000000..3466a2912146 --- /dev/null +++ b/mobile/themes/wince/aboutPage.css @@ -0,0 +1,83 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Mozilla Mobile Browser. + * + * The Initial Developer of the Original Code is + * Mozilla Corporation. + * Portions created by the Initial Developer are Copyright (C) 2008 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Gavin Sharp + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +body { + font: 15px/1.231 helvetic,arial,clean,sans-serif; + color: #69645c; + background: white url("images/aboutBackground.jpg") top center repeat-x; +} + +#wrapper { + max-width: 600px; + margin: 0 auto; +} + +#aboutLogoContainer { + width: 300px; +} + +#version { + font-weight: bold; + color: #909090; + margin: -24px 20px 0 118px; +} + +#aboutLinks { + padding: 5px; + border: 2px solid #e6e5e3; + font-size: 15px; +} +#aboutLinks li { + clear: both; + padding: 5px 10px; + border-bottom: 2px solid #e6e5e3; + list-style: none; +} +#aboutLinks li:last-child { + border-bottom: 0; +} +#aboutLinks li a { + display: block; + color: #3a3834; + background: url("images/arrowright-16.png") right center no-repeat; + padding: 10px 40px 10px 5px; +} + +#aboutDetails { + margin-top: 15px; + font-size: x-small; +} diff --git a/mobile/themes/wince/images/aboutBackground.jpg b/mobile/themes/wince/images/aboutBackground.jpg new file mode 100644 index 000000000000..d597702b4b0e Binary files /dev/null and b/mobile/themes/wince/images/aboutBackground.jpg differ diff --git a/mobile/themes/wince/jar.mn b/mobile/themes/wince/jar.mn index e5217531d83d..24a2b3c94a2f 100644 --- a/mobile/themes/wince/jar.mn +++ b/mobile/themes/wince/jar.mn @@ -10,15 +10,17 @@ chrome.jar: chrome.jar: % skin browser classic/1.0 % aboutCertError.css (aboutCertError.css) + aboutPage.css (aboutPage.css) platform.css (platform.css) browser.css (browser.css) browser-high.css (browser-high.css) browser-low.css (browser-low.css) notification.css (notification.css) + + images/aboutBackground.jpg (images/aboutBackground.jpg) images/arrowright-16.png (images/arrowright-16.png) images/arrowup-16.png (images/arrowup-16.png) images/ratings-18.png (images/ratings-18.png) - images/favicon-default-30.png (images/favicon-default-30.png) images/starred-64.png (images/starred-64.png) images/throbber.png (images/throbber.png)