Commit 38e0f052 by Ruben Rodriguez Committed by Santiago Rodriguez

Updated branding for Abrowser 38

parent 943df9b6
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/.
......@@ -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
......
......@@ -5,7 +5,7 @@
Logo="tileresources\VisualElements_logo.png"
SmallLogo="tileresources\VisualElements_smalllogo.png"
ForegroundText="light"
BackgroundColor="#0a1833">
BackgroundColor="#1895f5">
<DefaultTile
ShortName="@MOZ_APP_DISPLAYNAME@"
ShowName="allLogos"
......
......@@ -12,6 +12,7 @@
!define CompanyName "Trisquel"
!define URLInfoAbout "http://trisquel.info/browser"
!define URLUpdateInfo "http://trisquel.info/wiki"
!define HelpLink "https://trisquel.info/en/wiki/abrowser-help"
!define URLStubDownload "http://trisquel.info/browser"
!define URLManualDownload "http://trisquel.info/browser"
......@@ -42,9 +43,8 @@
!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x666666
!define FOOTER_BKGRD_COLOR 0xFFFFFF
!define INTRO_BLURB_TEXT_COLOR 0x666666
!define OPTIONS_TEXT_COLOR_NORMAL 0x000000
!define OPTIONS_TEXT_COLOR_FADED 0x666666
!define OPTIONS_BKGRD_COLOR 0xF0F0F0
!define INSTALL_BLURB_TEXT_COLOR 0x666666
!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0x666666
!define INSTALL_PROGRESS_TEXT_COLOR_FADED 0x999999
!define COMMON_TEXT_COLOR_NORMAL 0x000000
!define COMMON_TEXT_COLOR_FADED 0x666666
!define COMMON_BKGRD_COLOR 0xF0F0F0
......@@ -15,45 +15,40 @@
height="38px"
viewBox="0 0 130 38"
xml:space="preserve"
inkscape:version="0.48.3.1 r9886"
inkscape:version="0.48.4 r9939"
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"
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="711"
id="namedview5"
showgrid="false"
inkscape:zoom="9.788073"
inkscape:cx="48.569985"
inkscape:cy="11.314337"
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:#6f6f6f;fill-opacity:1;stroke:none;font-family:Sans"
x="0.4501974"
y="37.289883"
style="font-weight:bold;-inkscape-font-specification:Sans Bold;fill:#ffffff;fill-opacity:1">Abrowser</tspan></text>
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:#6f6f6f;fill-opacity:1">Abrowser</tspan></text>
</svg>
\ No newline at end of file
......@@ -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");
#clientBox {
background-color: #F7F7F7;
color: #222222;
}
#leftBox {
background-image: url("chrome://branding/content/about-logo.png");
background-repeat: no-repeat;
background-color: #000;
color: #fff;
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;
}
.text-link {
color: #fff !important;
text-decoration: underline;
@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;
}
......@@ -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)
......
......@@ -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;
}
This source diff could not be displayed because it is too large. You can view the blob instead.
# 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)
......@@ -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
......@@ -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/. -->
<!ENTITY brandShorterName "Abrowser">
<!ENTITY brandShortName "Abrowser">
<!ENTITY brandFullName "Abrowser">
<!ENTITY vendorShortName "Trisquel">
<!ENTITY trademarkInfo.part1 "">
<!ENTITY brandFullName "Mozilla Abrowser">
<!ENTITY vendorShortName "Mozilla">
<!ENTITY trademarkInfo.part1 "Abrowser and the Abrowser logos are trademarks of the Mozilla Foundation.">
......@@ -2,9 +2,10 @@
# 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
brandFullName=Mozilla Abrowser
vendorShortName=Mozilla
homePageSingleStartMain=Abrowser Start, a fast home page with built-in search
homePageImport=Import your home page from %S
......
......@@ -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)
......@@ -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
......@@ -8,3 +8,8 @@ DIRS += ['content', 'locales']
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
JS_PREFERENCE_FILES += [
'pref/abrowser-branding.js',
]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment