bug 992650 - eliminate use of "embedded" fonts in about:accounts. r=gavin a=lsblakk
authorJonathan Kew <jkew@mozilla.com>
Tue, 20 May 2014 09:41:17 +0100
changeset 199309 457667d6cd48784f777b1f749b27100521b596be
parent 199308 1a3afa1076cc35dd3b816bb9170637bf70852d27
child 199310 483a427430b5d848d440f5da846865ccb98b6732
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin, lsblakk
bugs992650
milestone31.0a2
bug 992650 - eliminate use of "embedded" fonts in about:accounts. r=gavin a=lsblakk
browser/base/content/aboutaccounts/aboutaccounts.xhtml
browser/base/content/aboutaccounts/fonts.css
browser/base/content/aboutaccounts/main.css
browser/base/jar.mn
--- a/browser/base/content/aboutaccounts/aboutaccounts.xhtml
+++ b/browser/base/content/aboutaccounts/aboutaccounts.xhtml
@@ -17,19 +17,16 @@
   <head>
    <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" />
-   <link rel="stylesheet"
      href="chrome://browser/content/aboutaccounts/normalize.css"
      type="text/css" />
    <link rel="stylesheet"
      href="chrome://browser/content/aboutaccounts/main.css"
      type="text/css" />
    <link rel="stylesheet"
      href="chrome://browser/content/aboutaccounts/aboutaccounts.css"
      type="text/css" />
deleted file mode 100644
--- a/browser/base/content/aboutaccounts/fonts.css
+++ /dev/null
@@ -1,24 +0,0 @@
-@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');
-}
-@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');
-}
-@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');
-}
--- a/browser/base/content/aboutaccounts/main.css
+++ b/browser/base/content/aboutaccounts/main.css
@@ -6,17 +6,17 @@
 
 html {
   background-color: #F2F2F2;
   height: 100%;
 }
 
 body {
   color: #424f59;
-  font-family: "Clear Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font: message-box;
   font-size: 14px;
   height: 100%;
 }
 
 a {
   color: #0095dd;
   cursor: pointer; /* Use the correct cursor for anchors without an href */
 }
@@ -44,17 +44,16 @@ a.no-underline {
   position: relative;
   text-align: center;
   top: 80px;
   width: 420px;
 }
 
 header h1
 {
-  font-family: "Fira Sans", Helvetica, Arial, sans-serif;
   font-size: 24px;
   font-weight: 200;
   line-height: 1em;
   margin: 0 0 32px 0;
 }
 
 .description {
   font-size: 18px;
@@ -67,17 +66,16 @@ header h1
 
 .button-row button,
 .button-row a.button {
   background: #0095dd;
   border: none;
   border-radius: 5px;
   color: #FFFFFF;
   cursor: pointer;
-  font-family: "Clear Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 24px;
   padding: 15px 0;
   transition-duration: 150ms;
   transition-property: background-color;
   width: 100%;
 }
 
 .button-row a.button {
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -50,17 +50,16 @@ 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/certerror/aboutCertError.xhtml     (content/aboutcerterror/aboutCertError.xhtml)
         content/browser/certerror/aboutCertError.css       (content/aboutcerterror/aboutCertError.css)
 
         content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)