Bug 1196153 - Replace about:accounts Sync illustration by the one in Sync prefs. r?markh, rfeeley draft
authorEdouard Oger <eoger@fastmail.com>
Tue, 03 Jan 2017 18:40:24 -0500
changeset 455976 819f9354448522f738cc9b397be9c0c895c2fa8f
parent 455333 cad2ea346d06ec5a3a70eda912513201dff0c21e
child 541080 98fa61230aa423c28da0535f60f6e74cc3b2f284
push id40335
push userbmo:eoger@fastmail.com
push dateWed, 04 Jan 2017 15:53:01 +0000
reviewersmarkh, rfeeley
bugs1196153
milestone53.0a1
Bug 1196153 - Replace about:accounts Sync illustration by the one in Sync prefs. r?markh, rfeeley MozReview-Commit-ID: GcK8780gF0y
browser/base/content/aboutaccounts/aboutaccounts.xhtml
browser/base/content/aboutaccounts/images/graphic_sync_intro.png
browser/base/content/aboutaccounts/images/graphic_sync_intro@2x.png
browser/base/content/aboutaccounts/main.css
browser/base/jar.mn
browser/locales/en-US/chrome/browser/aboutAccounts.dtd
--- a/browser/base/content/aboutaccounts/aboutaccounts.xhtml
+++ b/browser/base/content/aboutaccounts/aboutaccounts.xhtml
@@ -33,17 +33,16 @@
      href="chrome://browser/content/aboutaccounts/aboutaccounts.css"
      type="text/css" />
   </head>
   <body>
     <div id="stage">
 
       <div id="manage">
         <header>
-          <h1>&aboutAccounts.connected;</h1>
           <div id="email"></div>
         </header>
 
         <section>
             <div class="graphic graphic-sync-intro"> </div>
 
             <div class="button-row">
               <button id="buttonOpenPrefs" class="button" href="#" tabindex="0">&aboutAccountsConfig.syncPreferences.label;</button>
deleted file mode 100644
index ff5f482f0c911f3cac295946551b3230bcdeb218..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 89fda068112cc9dcf3d2dee192ab54413d2e2e5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/base/content/aboutaccounts/main.css
+++ b/browser/base/content/aboutaccounts/main.css
@@ -105,25 +105,25 @@ header h1
 .button-row button:active,
 .button-row button:hover,
 .button-row button:focus {
   background: #08c;
 }
 
 
 .graphic-sync-intro {
-  background-image: url(images/graphic_sync_intro.png);
+  background-image: url(chrome://browser/skin/fxa/sync-illustration.png);
   background-repeat: no-repeat;
-  background-size: 150px 195px;
-  height: 195px;
+  background-size: contain;
+  height: 231px;
+  width: 231px;
   margin: 0 auto;
   overflow: hidden;
   text-indent: 100%;
   white-space: nowrap;
-  width: 150px;
 }
 
 .description,
 .button-row {
   margin-top: 30px;
 }
 
 .links  {
@@ -156,11 +156,11 @@ header h1
 }
 
 /* Retina */
 @media
 only screen and (min-device-pixel-ratio: 2),
 only screen and (        min-resolution: 192dpi),
 only screen and (        min-resolution: 2dppx) {
   .graphic-sync-intro {
-    background-image: url(images/graphic_sync_intro@2x.png);
+    background-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png);
   }
 }
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -51,18 +51,16 @@ browser.jar:
         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/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/aboutProviderDirectory.xhtml  (content/aboutProviderDirectory.xhtml)
         content/browser/aboutTabCrashed.css           (content/aboutTabCrashed.css)
         content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
--- a/browser/locales/en-US/chrome/browser/aboutAccounts.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutAccounts.dtd
@@ -1,14 +1,13 @@
 <!-- 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.welcome "Welcome to &syncBrand.shortName.label;">
-<!ENTITY aboutAccounts.connected "Account connected">
 
 <!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.syncPreferences.label "Sync preferences">
 <!ENTITY aboutAccounts.noConnection.title "No connection">
 <!ENTITY aboutAccounts.noConnection.description "You must be connected to the Internet to sign in.">
 <!ENTITY aboutAccounts.noConnection.retry "Try again">