Commit 9af0f0f5d267ae21092b30a4fc049827cfe07936
1 parent
c3b50026
Refactored login modal
Added css rules that increased margin and padding on specific elements, horizontal rules with text in the middle and new translations. Signed-off-by: Carlos Coêlho <carlospecter@gmail.com> Signed-off-by: Sabryna Sousa <sabryna.sousa1323@gmail.com>
Showing
4 changed files
with
78 additions
and
9 deletions
Show diff stats
src/app/login/login.html
@@ -18,11 +18,16 @@ | @@ -18,11 +18,16 @@ | ||
18 | </label> | 18 | </label> |
19 | </div> | 19 | </div> |
20 | <div class="pull-right"> | 20 | <div class="pull-right"> |
21 | - <a href="">{{"auth.form.forgotPasswd" | translate}}</a> | 21 | + <a data-dismiss="modal-dialog">{{"auth.form.forgotPasswd" | translate}}</a> |
22 | </div> | 22 | </div> |
23 | </div> | 23 | </div> |
24 | <button type="submit" class="btn btn-default btn-block" ng-click="vm.login()">{{"auth.form.login_button" | translate}}</button> | 24 | <button type="submit" class="btn btn-default btn-block" ng-click="vm.login()">{{"auth.form.login_button" | translate}}</button> |
25 | </form> | 25 | </form> |
26 | + <div class="strike"> | ||
27 | + <span> | ||
28 | + {{"auth.social.alternative" | translate}} | ||
29 | + </span> | ||
30 | + </div> | ||
26 | <div class="text-center"> | 31 | <div class="text-center"> |
27 | <span>{{"auth.social.connectWith" | translate}}</span> | 32 | <span>{{"auth.social.connectWith" | translate}}</span> |
28 | 33 | ||
@@ -40,7 +45,8 @@ | @@ -40,7 +45,8 @@ | ||
40 | <i class="fa fa-google-plus fa-stack-1x fa-inverse"></i> | 45 | <i class="fa fa-google-plus fa-stack-1x fa-inverse"></i> |
41 | </span> | 46 | </span> |
42 | </div> | 47 | </div> |
43 | - | ||
44 | - <a href="">{{"auth.createAccount" | translate}}</a> | 48 | + <div id="create-account"> |
49 | + <a href="">{{"auth.createAccount" | translate}}</a> | ||
50 | + </div> | ||
45 | </div> | 51 | </div> |
46 | </div> | 52 | </div> |
@@ -0,0 +1,55 @@ | @@ -0,0 +1,55 @@ | ||
1 | +.modal-content{ | ||
2 | + padding: 40px; | ||
3 | +} | ||
4 | +.modal-header { | ||
5 | + border-bottom: 0; | ||
6 | + text-align: center; | ||
7 | +} | ||
8 | +form { | ||
9 | + margin-bottom: 30px; | ||
10 | +} | ||
11 | +form button { | ||
12 | + margin-top: 20px; | ||
13 | + text-transform: uppercase; | ||
14 | +} | ||
15 | +.strike { | ||
16 | + display: block; | ||
17 | + text-align: center; | ||
18 | + overflow: hidden; | ||
19 | + white-space: nowrap; | ||
20 | + padding: 25px 0; | ||
21 | +} | ||
22 | + | ||
23 | +.strike > span { | ||
24 | + position: relative; | ||
25 | + display: inline-block; | ||
26 | +} | ||
27 | + | ||
28 | +.strike > span:before, | ||
29 | +.strike > span:after { | ||
30 | + content: ""; | ||
31 | + position: absolute; | ||
32 | + top: 50%; | ||
33 | + width: 9999px; | ||
34 | + height: 1px; | ||
35 | + background: black; | ||
36 | +} | ||
37 | + | ||
38 | +.strike > span:before { | ||
39 | + right: 100%; | ||
40 | + margin-right: 15px; | ||
41 | +} | ||
42 | + | ||
43 | +.strike > span:after { | ||
44 | + left: 100%; | ||
45 | + margin-left: 15px; | ||
46 | +} | ||
47 | +.strike span { | ||
48 | + text-transform: uppercase; | ||
49 | +} | ||
50 | +#oauth-block span { | ||
51 | + margin: 5px; | ||
52 | +} | ||
53 | +#create-account { | ||
54 | + padding: 30px 0 0; | ||
55 | +} |
src/languages/en.json
@@ -20,12 +20,13 @@ | @@ -20,12 +20,13 @@ | ||
20 | "activities.create_article.description": "has published on", | 20 | "activities.create_article.description": "has published on", |
21 | "activities.add_member_in_community.description": "has joined the community", | 21 | "activities.add_member_in_community.description": "has joined the community", |
22 | "activities.new_friendship.description": "has made {friends, plural, one{one new friend} other{# new friends}}:", | 22 | "activities.new_friendship.description": "has made {friends, plural, one{one new friend} other{# new friends}}:", |
23 | - "auth.title": "Login", | ||
24 | - "auth.form.login": "Login / Email address", | 23 | + "auth.title": "Great to have you back!", |
24 | + "auth.form.login": "Username or Email address", | ||
25 | "auth.form.password": "Password", | 25 | "auth.form.password": "Password", |
26 | "auth.form.keepLoggedIn": "Keep me logged in", | 26 | "auth.form.keepLoggedIn": "Keep me logged in", |
27 | "auth.form.forgotPasswd": "Forgot your password?", | 27 | "auth.form.forgotPasswd": "Forgot your password?", |
28 | "auth.form.login_button": "Login", | 28 | "auth.form.login_button": "Login", |
29 | + "auth.social.alternative": "Or", | ||
29 | "auth.social.connectWith": "Connect with:", | 30 | "auth.social.connectWith": "Connect with:", |
30 | "auth.createAccount": "Create account", | 31 | "auth.createAccount": "Create account", |
31 | "navbar.content_viewer_actions.new_post": "New Post", | 32 | "navbar.content_viewer_actions.new_post": "New Post", |
@@ -35,5 +36,8 @@ | @@ -35,5 +36,8 @@ | ||
35 | "notification.http_error.401.message": "Unauthorized", | 36 | "notification.http_error.401.message": "Unauthorized", |
36 | "notification.http_error.500.message": "Server error", | 37 | "notification.http_error.500.message": "Server error", |
37 | "comment.post": "Post a comment", | 38 | "comment.post": "Post a comment", |
38 | - "comment.reply": "reply" | 39 | + "comment.reply": "reply", |
40 | + "forgotPwd.title": "Forgot your password?", | ||
41 | + "forgotPwd.sendInstructions": "Send Instructions", | ||
42 | + "forgotPwd.info": "Upon clicking on the button above, you'll receive an email with instructions on how to create a new password." | ||
39 | } | 43 | } |
src/languages/pt.json
@@ -20,12 +20,13 @@ | @@ -20,12 +20,13 @@ | ||
20 | "activities.create_article.description": "publicou em", | 20 | "activities.create_article.description": "publicou em", |
21 | "activities.add_member_in_community.description": "entrou na comunidade", | 21 | "activities.add_member_in_community.description": "entrou na comunidade", |
22 | "activities.new_friendship.description": "fez {friends, plural, one{um novo amigo} other{# novos amigos}}:", | 22 | "activities.new_friendship.description": "fez {friends, plural, one{um novo amigo} other{# novos amigos}}:", |
23 | - "auth.title": "Login", | ||
24 | - "auth.form.login": "Login / Email", | 23 | + "auth.title": "Legal ter você de volta!", |
24 | + "auth.form.login": "Nome de usuário ou Email", | ||
25 | "auth.form.password": "Senha", | 25 | "auth.form.password": "Senha", |
26 | "auth.form.keepLoggedIn": "Continuar logado", | 26 | "auth.form.keepLoggedIn": "Continuar logado", |
27 | "auth.form.forgotPasswd": "Esqueceu sua senha?", | 27 | "auth.form.forgotPasswd": "Esqueceu sua senha?", |
28 | "auth.form.login_button": "Login", | 28 | "auth.form.login_button": "Login", |
29 | + "auth.social.alternative": "Ou", | ||
29 | "auth.social.connectWith": "Conectar com:", | 30 | "auth.social.connectWith": "Conectar com:", |
30 | "auth.createAccount": "Criar conta", | 31 | "auth.createAccount": "Criar conta", |
31 | "navbar.content_viewer_actions.new_post": "Novo Artigo", | 32 | "navbar.content_viewer_actions.new_post": "Novo Artigo", |
@@ -35,5 +36,8 @@ | @@ -35,5 +36,8 @@ | ||
35 | "notification.http_error.401.message": "Não autorizado", | 36 | "notification.http_error.401.message": "Não autorizado", |
36 | "notification.http_error.500.message": "Erro no servidor", | 37 | "notification.http_error.500.message": "Erro no servidor", |
37 | "comment.post": "Commentar", | 38 | "comment.post": "Commentar", |
38 | - "comment.reply": "responder" | 39 | + "comment.reply": "responder", |
40 | + "forgotPwd.title": "Esqueceu sua senha?", | ||
41 | + "forgotPwd.sendInstructions": "Enviar Instruções", | ||
42 | + "forgotPwd.info": "Ao clicar no botão acima, você receberá um email com instruções para criar uma nova senha." | ||
39 | } | 43 | } |