Merge branch 'this_is_not_me_own_line' into dev

browserid/static/dialog/css/popup.css

@@ -201,6 +201,10 @@ h2 {
     line-height: 28px;
 }
 
+#signIn .submit > p {
+  line-height: 13px;
+}
+
 #signIn .remember {
     display: inline-block;
     line-height: 28px;
@@ -498,8 +502,7 @@ html[xmlns] .cf {
 }
 
 .inputs {
-    min-height: 106px;
-    max-height: 140px;
+    height: 110px;
     overflow-y: auto;
     margin: 1em 0 .5em;
     padding: 0 1em;

browserid/static/dialog/views/pickemail.ejs

@@ -26,8 +26,10 @@
                   </ul>
 
                   <div class="submit add cf">
-                      <a id="thisIsNotMe" href="#">This is not me</a>
-                      <a id="useNewEmail" href="#">Use a different email</a>
+                      <p>
+                        <a id="thisIsNotMe" href="#">This is not me</a>
+                        <a id="useNewEmail" href="#">Use a different email</a>
+                      </p>
                       <button id="signInButton">sign in</button>
                   </div>
               </div>