Merge branch 'develop' of github.com:mozilla/f1 into develop

auth.html

@@ -75,7 +75,14 @@
       display: block;
       margin: 0 0 7px 0;
     }
-    
+
+    #oauth .subtext {
+      margin-left: 7px;
+      color: #666666;
+      font-family: "Lucida Grande", Verdana, sans-serif;
+      font-size: 12px;
+    }
+
     .controls {
       width: 300px;
     }
@@ -278,6 +285,7 @@
         <input class="boxFlex google" type="hidden" name="end_point_auth_failure" value="/auth.html#oauth_failure">
         <button id='submitbtn' type="submit">submit</button>
       </div>
+      <span class="subtext">ex: yourappdomain.com</span>
     </form>
 
     </div>

index.html

@@ -98,7 +98,7 @@
       <div id="movie" class="c3">
         <div class="corner tl"></div>
         <div class="corner tr"></div>
-        <iframe src="http://player.vimeo.com/video/16548313?title=0&amp;byline=0&amp;portrait=0" width="700" height="446" frameborder="0"></iframe>
+        <iframe src="http://player.vimeo.com/video/17619444?title=0&amp;byline=0&amp;portrait=0" width="700" height="446" frameborder="0"></iframe>
       </div>
       <div id="tagline" class="c3">
         &ldquo;A browser extension for sharing&rdquo; <span class="watch">Check out the video to see how it works</span>

settings/index.html

@@ -45,11 +45,12 @@
         <h1>Configure your sharing settings</h1>
         <ul>
           <li class="hbox">
-            <label class="option boxFlex" for="shortcut"><span class="key">F1</span> keyboard shortcut enabled</label>
+            <span class="key">F1</span>
+            <label class="option boxFlex" for="use_accel_key">keyboard shortcut enabled</label>
             <input type="checkbox" id="use_accel_key">
           </li>
           <li class="hbox">
-            <label class="option boxFlex" for="bookmark">Bookmark the links I share</label>
+            <label class="option boxFlex" for="bookmarking">Bookmark the links I share</label>
             <input type="checkbox" id="bookmarking">
           </li>
         </ul>
@@ -62,12 +63,15 @@
     <button class="close done">done</button>
   </div>
 
+  <div class="panel about" style="text-align: center; color: rgb(68, 68, 68);">
+    <a target="_blank" href="../">Mozilla F1</a> helps you share links with the people that matter
+  </div>
+
   <div id="newsFooter" class="panel">
     <div class="hbox">
       <div class="boxFlex headline invisible"><span class="icon rss"></span> <a id="rssLink" href="#" target="_blank"></a></div>
-      <div class="about">
-        <a href="../service/privacy.html" target="_blank">privacy</a>
-        <a href="../" target="_blank">about</a>
+      <div class="privacy">
+        We care about your <a href="../service/privacy.html" target="_blank">privacy</a>, seriously.
       </div>
     </div>
   </div>

settings/index.js

@@ -85,7 +85,7 @@ function (require,   $,        fn,         rdapi,   oauth,   jig,
     'yahoo.com': {
       isNew: showNew,
       type: 'yahoo',
-      name: 'Yahoo!',
+      name: 'Yahoo! Mail',
       serviceUrl: 'http://mail.yahoo.com', // XXX yahoo doesn't have ssl enabled mail?
       revokeUrl: 'https://api.login.yahoo.com/WSLogin/V1/unlink',
       signOutUrl: 'https://login.yahoo.com/config/login?logout=1'

settings/style.css

@@ -274,6 +274,11 @@ ul#tabs li.selected {
   margin: 20px 0;
 }
 
+#config .about {
+  color: #444;
+  text-align: center;
+}
+
 #config .username {
   color: #aaa;
 }
@@ -310,9 +315,8 @@ ul#tabs li.selected {
 }
 
 #settings .key {
-  font-family: Helvetica,Arial,sans-serif;
-  margin-right: 3px;
-  padding: 5px;
+  margin-right: 10px;
+  padding: 0 3px 0 5px;
   -moz-border-radius: 4px;
   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.75), 0 1px 0 rgba(0, 0, 0, 0.3);
   background: -moz-linear-gradient(#f8f8f8, #dddee0) repeat scroll 0 0 #ecedef;
@@ -331,8 +335,9 @@ ul#tabs li.selected {
   width: 720px;
 }
 
-#newsFooter .about {
+#newsFooter .privacy {
   margin: 0 0 0 10px;
+  color: #444;
 }
 
 /*

style.css

@@ -101,6 +101,7 @@ strong {
 
 #installed img {
   vertical-align: text-bottom;
+  margin: -1px 4px 0 0;
 }
 
 #installClose {
@@ -174,7 +175,8 @@ a#installClose:hover {
 }
 
 #header.row button.download img {
-  vertical-align: bottom;
+  vertical-align: middle;
+  margin: -1px 4px 0 0;
 }
 
 #header.row button.download span.meta {