Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 06:22:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 965117 - Custom fonts on about:accounts and other visual/string tweaks. r=ttaubert

Browse Source
This commit is contained in:
Zachary Carter 2014-01-31 16:50:55 -08:00
parent 71b9757307
commit 89464ece02
6 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
browser/base/content/aboutaccounts/aboutaccounts.xhtml
View File

@ -15,7 +15,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>&aboutAccounts.pageTitle;</title>
<title>&syncBrand.fullName.label;</title>
<meta name="viewport" content="width=device-width"/>
@ -39,23 +39,23 @@
<div id="manage">
<header>
<h1>&syncBrand.fxa-plural.label;</h1>
<h2>&syncBrand.shortName.label;</h2>
<h1><span>&syncBrand.fullName.label;</span></h1>
<h2><span>&aboutAccounts.welcome;</span></h2>
</header>
<section>
<div class="graphic graphic-sync-intro"> </div>
<div class="button-row">
<a class="button" href="#" onclick="openPrefs()">Manage</a>
<a class="button" href="#" onclick="openPrefs()">&aboutAccountsConfig.manage.label;</a>
</div>
</section>
</div>
<div id="intro">
<header>
<h1>&aboutAccounts.pageTitle;</h1>
<h1><span>&syncBrand.fullName.label;</span></h1>
<h2><span>&aboutAccounts.welcome;</span></h2>
</header>
<section>

12
browser/base/content/aboutaccounts/fonts.css
View File

@ -4,9 +4,7 @@
font-weight: 400;
src: local('Fira Sans'),
local('FiraSans'),
url('fonts/firasans-regular.woff') format('woff'),
/*url('/fonts/latin/firasans-regular.ttf') format('truetype'),*/
/*url('/fonts/latin/firasans-regular.svg#Fira Sans') format('svg');*/
url('fonts/firasans-regular.woff') format('woff');
}
@font-face {
font-family: 'Fira Sans';
@ -14,9 +12,7 @@
font-weight: 300;
src: local('Fira Sans Light'),
local('FiraSansLight'),
url('fonts/firasans-light.woff') format('woff'),
/*url('/fonts/latin/firasans-light.ttf') format('truetype'),*/
/*url('/fonts/latin/firasans-light.svg#Fira Sans') format('svg');*/
url('fonts/firasans-light.woff') format('woff');
}
@font-face {
font-family: 'Clear Sans';
@ -24,8 +20,6 @@
font-weight: 400;
src: local('Clear Sans'),
local('ClearSans'),
url('fonts/clearsans-regular.woff') format('woff'),
/*url('/fonts/latin/clearsans-regular.ttf') format('truetype'),*/
/*url('/fonts/latin/clearsans-regular.svg#Clear Sans') format('svg');*/
url('fonts/clearsans-regular.woff') format('woff');
}

21
browser/base/jar.mn
View File

@ -50,15 +50,18 @@ browser.jar:
content/browser/abouthealthreport/abouthealth.js (content/abouthealthreport/abouthealth.js)
content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css)
#endif
content/browser/aboutaccounts/aboutaccounts.xhtml (content/aboutaccounts/aboutaccounts.xhtml)
content/browser/aboutaccounts/aboutaccounts.js (content/aboutaccounts/aboutaccounts.js)
content/browser/aboutaccounts/aboutaccounts.css (content/aboutaccounts/aboutaccounts.css)
content/browser/aboutaccounts/main.css (content/aboutaccounts/main.css)
content/browser/aboutaccounts/normalize.css (content/aboutaccounts/normalize.css)
content/browser/aboutaccounts/fonts.css (content/aboutaccounts/fonts.css)
content/browser/aboutaccounts/images/fox.png (content/aboutaccounts/images/fox.png)
content/browser/aboutaccounts/images/graphic_sync_intro.png (content/aboutaccounts/images/graphic_sync_intro.png)
content/browser/aboutaccounts/images/graphic_sync_intro@2x.png (content/aboutaccounts/images/graphic_sync_intro@2x.png)
content/browser/aboutaccounts/aboutaccounts.xhtml (content/aboutaccounts/aboutaccounts.xhtml)
content/browser/aboutaccounts/aboutaccounts.js (content/aboutaccounts/aboutaccounts.js)
content/browser/aboutaccounts/aboutaccounts.css (content/aboutaccounts/aboutaccounts.css)
content/browser/aboutaccounts/main.css (content/aboutaccounts/main.css)
content/browser/aboutaccounts/normalize.css (content/aboutaccounts/normalize.css)
content/browser/aboutaccounts/fonts.css (content/aboutaccounts/fonts.css)
content/browser/aboutaccounts/fonts/clearsans-regular.woff (content/aboutaccounts/fonts/clearsans-regular.woff)
content/browser/aboutaccounts/fonts/firasans-light.woff (content/aboutaccounts/fonts/firasans-light.woff)
content/browser/aboutaccounts/fonts/firasans-regular.woff (content/aboutaccounts/fonts/firasans-regular.woff)
content/browser/aboutaccounts/images/fox.png (content/aboutaccounts/images/fox.png)
content/browser/aboutaccounts/images/graphic_sync_intro.png (content/aboutaccounts/images/graphic_sync_intro.png)
content/browser/aboutaccounts/images/graphic_sync_intro@2x.png (content/aboutaccounts/images/graphic_sync_intro@2x.png)
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)

2
browser/components/preferences/sync.xul
View File

@ -202,7 +202,7 @@
<vbox id="hasFxaAccount">
<groupbox id="fxaGroup">
<caption label="&syncBrand.fxa-singular.label;"/>
<caption label="&syncBrand.fxAccount.label;"/>
<deck id="fxaLoginStatus">

3
browser/locales/en-US/chrome/browser/aboutAccounts.dtd
View File

@ -2,8 +2,9 @@
- 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 aboutAccounts.pageTitle "Welcome to Sync">
<!ENTITY aboutAccounts.welcome "Welcome to &syncBrand.shortName.label;">
<!ENTITY aboutAccountsConfig.description "Sign in to sync your tabs, bookmarks, passwords &amp; more.">
<!ENTITY aboutAccountsConfig.startButton.label "Get started">
<!ENTITY aboutAccountsConfig.useOldSync.label "Using an older version of Sync?">
<!ENTITY aboutAccountsConfig.manage.label "Manage">

3
browser/locales/en-US/chrome/browser/syncBrand.dtd
View File

@ -4,5 +4,4 @@
<!ENTITY syncBrand.shortName.label "Sync">
<!ENTITY syncBrand.fullName.label "Firefox Sync">
<!ENTITY syncBrand.fxa-singular.label "Firefox Account">
<!ENTITY syncBrand.fxa-plural.label "Firefox Accounts">
<!ENTITY syncBrand.fxAccount.label "Firefox Account">