Bug 965117 - Custom fonts on about:accounts and other visual/string tweaks. r=ttaubert
authorZachary Carter <zack.carter@gmail.com>
Fri, 31 Jan 2014 16:50:55 -0800
changeset 182431 923f7834d8d526e91d1f9b0f510a55b8bd6fa462
parent 182430 ba728a01b0619eb91681638a0148f32b831d7183
child 182432 46a75174aeb9ae9c2f3aba9843774bb39bd03ee8
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersttaubert
bugs965117
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 965117 - Custom fonts on about:accounts and other visual/string tweaks. r=ttaubert
browser/base/content/aboutaccounts/aboutaccounts.xhtml
browser/base/content/aboutaccounts/fonts.css
browser/base/jar.mn
browser/components/preferences/sync.xul
browser/locales/en-US/chrome/browser/aboutAccounts.dtd
browser/locales/en-US/chrome/browser/syncBrand.dtd
--- a/browser/base/content/aboutaccounts/aboutaccounts.xhtml
+++ b/browser/base/content/aboutaccounts/aboutaccounts.xhtml
@@ -10,17 +10,17 @@
   <!ENTITY % aboutAccountsDTD SYSTEM "chrome://browser/locale/aboutAccounts.dtd">
   %aboutAccountsDTD;
   <!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
   %syncBrandDTD;
 ]>
 
 <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"/>
 
 
    <link rel="icon" type="image/png" id="favicon"
          href="chrome://branding/content/icon32.png"/>
    <link rel="stylesheet"
      href="chrome://browser/content/aboutaccounts/fonts.css"
      type="text/css" />
@@ -34,33 +34,33 @@
      href="chrome://browser/content/aboutaccounts/aboutaccounts.css"
      type="text/css" />
   </head>
   <body>
     <div id="stage">
 
       <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>
             <div class="graphic graphic-sync-intro"> </div>
 
             <div class="description">&aboutAccountsConfig.description;</div>
 
             <div class="button-row">
--- a/browser/base/content/aboutaccounts/fonts.css
+++ b/browser/base/content/aboutaccounts/fonts.css
@@ -1,31 +1,25 @@
 @font-face {
   font-family: 'Fira Sans';
   font-style: normal;
   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';
   font-style: normal;
   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';
   font-style: normal;
   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');
 }
 
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -45,25 +45,28 @@ browser.jar:
         content/browser/abouthome/restore@2x.png       (content/abouthome/restore@2x.png)
         content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
         content/browser/abouthome/mozilla@2x.png       (content/abouthome/mozilla@2x.png)
 #ifdef MOZ_SERVICES_HEALTHREPORT
         content/browser/abouthealthreport/abouthealth.xhtml   (content/abouthealthreport/abouthealth.xhtml)
         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)
         content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
         content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
         content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
 *       content/browser/browser.css                   (content/browser.css)
 *       content/browser/browser.js                    (content/browser.js)
--- a/browser/components/preferences/sync.xul
+++ b/browser/components/preferences/sync.xul
@@ -197,17 +197,17 @@
           <label class="text-link"
                  onclick="gSyncPane.openOldSyncSupportPage(); return false;"
                  value="&welcome.useOldSync.label;"/>
           <spacer flex="10"/>
         </vbox>
 
         <vbox id="hasFxaAccount">
           <groupbox id="fxaGroup">
-            <caption label="&syncBrand.fxa-singular.label;"/>
+            <caption label="&syncBrand.fxAccount.label;"/>
 
             <deck id="fxaLoginStatus">
 
               <!-- logged in and verified and all is good -->
               <hbox flex="1">
                 <label id="fxaEmailAddress1"/>
                 <label class="text-link"
                        onclick="gSyncPane.manageFirefoxAccount();"
--- a/browser/locales/en-US/chrome/browser/aboutAccounts.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutAccounts.dtd
@@ -1,9 +1,10 @@
 <!-- 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/. -->
 
-<!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">
--- a/browser/locales/en-US/chrome/browser/syncBrand.dtd
+++ b/browser/locales/en-US/chrome/browser/syncBrand.dtd
@@ -1,8 +1,7 @@
 <!-- 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/. -->
 
 <!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">