diff --git a/resources/static/css/common.css b/resources/static/css/common.css index 11f1f79ee52db1129100d736c9765cecb79de34d..7c22ed582dbce5ff26fe771c1e3dd25bd0d05927 100644 --- a/resources/static/css/common.css +++ b/resources/static/css/common.css @@ -409,6 +409,20 @@ footer .help { color: #333; } +.submit { + margin-top: 10px; + line-height: 14px; +} + +.submit > p { + margin-top: 10px; +} + +.tospp { + line-height: 1.2; +} + + #showDevelopment { position: absolute; top: 0; diff --git a/resources/static/css/style.css b/resources/static/css/style.css index 6ac4fb9fd4c9c7f5c8eac819133263d8ed2883eb..3aacacaeff59109d900a831718673add1b9fc183 100644 --- a/resources/static/css/style.css +++ b/resources/static/css/style.css @@ -447,10 +447,6 @@ button.delete:active { padding: 0; } -#signUpForm .submit { - height: 28px; -} - #signUpForm > .siteinfo { margin-bottom: 10px; } @@ -459,10 +455,18 @@ button.delete:active { display: none; } +.submit > p { + line-height: 28px; +} + .submit .remember { float: left; } +.tospp { + font-size: 13px; +} + .enter_password .password_entry, .enter_verify_password #verify_password, .known_secondary .password_entry, .unknown_secondary #unknown_secondary, .verify_primary #verify_primary { display: block; diff --git a/resources/static/dialog/css/popup.css b/resources/static/dialog/css/popup.css index ead1f555b32e3df95c3b37548a342c81d322bf8b..32ef242bb3f014d786d5c7f7614e3031f030397a 100644 --- a/resources/static/dialog/css/popup.css +++ b/resources/static/dialog/css/popup.css @@ -379,19 +379,13 @@ div#required_email { } .submit { - margin-top: 10px; color: #333; font-size: 11px; - line-height: 14px; } -.submit > p { - margin-top: 10px; -} .tospp { font-size: 11px; - line-height: 1.2; color: #787878; } diff --git a/resources/views/signup.ejs b/resources/views/signup.ejs index dcf66e0702c932803c7ca991217b509a4e69323e..9e92bd83b6e5be5865af429ece9f1b226ddd9cb6 100644 --- a/resources/views/signup.ejs +++ b/resources/views/signup.ejs @@ -82,10 +82,20 @@ </ul> <div class="submit cf forminputs"> - <button>Verify Email</button> - <div class="remember cf"> - <a class="action" href="/signin" tabindex="2">Existing account? Sign in.</a> - </div> + <p class="cf"> + <button>Verify Email</button> + <a class="action remember" href="/signin" tabindex="2">Existing account? Sign in.</a> + </p> + + <p class="tospp"> + <%- format( + gettext('By proceeding, you agree to %s\'s <a %s>Terms</a> and <a %s>Privacy Policy</a>.'), + [ "Persona", + ' href="https://login.persona.org/tos" target="_new"', + ' href="https://login.persona.org/privacy" target="_new"', + ]) %> + </p> + </div> <ul class="notifications">