Merge pull request #1847 from sgarrity/bug-729329-new-sync

Layout adjustments to Sync page from Bug 729329
mozilla · Apr 2, 2014 · 4f5f153 · 4f5f153
2 parents 706ebcb + f38d747
commit 4f5f153
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 33 deletions.
diff --git a/bedrock/firefox/templates/firefox/sync.html b/bedrock/firefox/templates/firefox/sync.html
@@ -19,11 +19,11 @@ <h1>{{ self.page_title() }}</h1>
 </div>
 
 <div class="main-content billboard">
-  <div class="primary">
+  <div class="contents">
     <h4>{{ _('Get started with Sync. It’s fast, safe and easy:') }}</h4>
     <ol>
       <li>{% trans url='https://support.mozilla.org/kb/learn-more-about-the-design-of-new-firefox#w_a-handy-new-menu' %}
-        Open the <a href="{{ url }}">menu</a> menu in the top right of Firefox and select “Sign in to Sync.”
+        Open the <a href="{{ url }}">menu</a> in the top right of Firefox and select “Sign in to Sync.”
       {% endtrans %}</li>
       <li>{{ _('Click “Get started” in the tab that opens.') }}</li>
       <li>{{ _('Enter an email address and password to “Create a Firefox Account.”') }}</li>
@@ -35,11 +35,9 @@ <h4>{{ _('Get started with Sync. It’s fast, safe and easy:') }}</h4>
       <li><a href="https://support.mozilla.org/kb/how-do-i-set-up-firefox-sync">{{ _('Get more detailed instructions.') }}</a></li>
       <li><a href="https://support.mozilla.org/kb/how-to-update-to-the-new-firefox-sync">{{ _('Using an older version of Sync?') }}</a></li>
     </ul>
-  </div>
-  <div class="android">
     <h4>{{ _('Have an Android phone or tablet?') }}</h4>
     <p>{{ _('Download Firefox for Android to sync between your desktop and mobile devices.') }}</p>
-    <p><a class="button" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}">{{ _('Get it free from Google Play') }}</a></p>
+    <p><a class="button android-link" href="{{ settings.GOOGLE_PLAY_FIREFOX_LINK }}">{{ _('Get it free from Google Play') }}</a></p>
   </div>
 </div>
 

diff --git a/media/css/firefox/sync.less b/media/css/firefox/sync.less
@@ -29,18 +29,13 @@
     h4 {
         font-size: 20px;
     }
+    .contents {
+        .span-all();
+    }
 }
 
-.primary {
-    .span(8);
-}
-
-.android {
-    .span(4);
-    padding-top: 40px;
-    .button {
-        .trailing-arrow();
-    }
+.android-link {
+    .trailing-arrow();
 }
 
 .newsletter-form {
@@ -68,14 +63,6 @@
         }
     }
 
-    .primary {
-        .span_narrow(8);
-    }
-
-    .android {
-        padding-top: 0;
-        .span_narrow(4);
-    }
 }
 
 /* Mobile layout: 320px */
@@ -93,14 +80,4 @@
         }
     }
 
-
-    .primary {
-        .span-all();
-    }
-
-    .android {
-        padding-top: 0;
-        .span-all();
-    }
-
 }