Skip to content
Snippets Groups Projects
Commit e02277cb authored by Shane Tomlinson's avatar Shane Tomlinson
Browse files

Merge branch 'this_is_not_me_own_line' into dev

parents ad7437a6 9ecdca8b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
browserid/static/dialog/css/popup.css
+ 5
− 2
View file @ e02277cb
...@@ -201,6 +201,10 @@ h2 { ...@@ -201,6 +201,10 @@ h2 {
line-height: 28px; line-height: 28px;
} }
#signIn .submit > p {
line-height: 13px;
}
#signIn .remember { #signIn .remember {
display: inline-block; display: inline-block;
line-height: 28px; line-height: 28px;
...@@ -498,8 +502,7 @@ html[xmlns] .cf { ...@@ -498,8 +502,7 @@ html[xmlns] .cf {
} }
.inputs { .inputs {
min-height: 106px; height: 110px;
max-height: 140px;
overflow-y: auto; overflow-y: auto;
margin: 1em 0 .5em; margin: 1em 0 .5em;
padding: 0 1em; padding: 0 1em;
......
browserid/static/dialog/views/pickemail.ejs
+ 4
− 2
View file @ e02277cb
...@@ -26,8 +26,10 @@ ...@@ -26,8 +26,10 @@
</ul> </ul>
<div class="submit add cf"> <div class="submit add cf">
<a id="thisIsNotMe" href="#">This is not me</a> <p>
<a id="useNewEmail" href="#">Use a different email</a> <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> <button id="signInButton">sign in</button>
</div> </div>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment