Download as
Browse Code »

Commit 747541908e909576a6ac58f1a110a8d6520eafd1

Authored by Carlos Coêlho
Committed by Daniela Feitosa
1 parent 99332285
Exists in login_modal

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>

Conflicts:
	src/languages/en.json
	src/languages/pt.json
Showing 4 changed files with 76 additions and 7 deletions   Show diff stats
src/app/login/login.html
  Diff comments   View file @7475419
... ... @@ -18,11 +18,16 @@
18 18 </label>
19 19 </div>
20 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 22 </div>
23 23 </div>
24 24 <button type="submit" class="btn btn-default btn-block" ng-click="vm.login()">{{"auth.form.login_button" | translate}}</button>
25 25 </form>
  26 + <div class="strike">
  27 + <span>
  28 + {{"auth.social.alternative" | translate}}
  29 + </span>
  30 + </div>
26 31 <div class="text-center">
27 32 <span>{{"auth.social.connectWith" | translate}}</span>
28 33  
... ... @@ -40,7 +45,8 @@
40 45 <i class="fa fa-google-plus fa-stack-1x fa-inverse"></i>
41 46 </span>
42 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 51 </div>
46 52 </div>
... ...
src/app/login/login.scss 0 → 100644
  Diff comments   View file @7475419
... ... @@ -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
  Diff comments   View file @7475419
... ... @@ -20,14 +20,18 @@
20 20 "activities.create_article.description": "has published on",
21 21 "activities.add_member_in_community.description": "has joined the community",
22 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 25 "auth.form.password": "Password",
26 26 "auth.form.keepLoggedIn": "Keep me logged in",
27 27 "auth.form.forgotPasswd": "Forgot your password?",
28 28 "auth.form.login_button": "Login",
  29 + "auth.social.alternative": "Or",
29 30 "auth.social.connectWith": "Connect with:",
30 31 "auth.createAccount": "Create account",
  32 + "forgotPwd.title": "Forgot your password?",
  33 + "forgotPwd.sendInstructions": "Send Instructions",
  34 + "forgotPwd.info": "Upon clicking on the button above, you'll receive an email with instructions on how to create a new password.",
31 35 "navbar.content_viewer_actions.new_item": "New Item",
32 36 "navbar.profile_actions.new_item": "New Item",
33 37 "navbar.content_viewer_actions.new_post": "New Post",
... ...
src/languages/pt.json
  Diff comments   View file @7475419
... ... @@ -20,14 +20,18 @@
20 20 "activities.create_article.description": "publicou em",
21 21 "activities.add_member_in_community.description": "entrou na comunidade",
22 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 25 "auth.form.password": "Senha",
26 26 "auth.form.keepLoggedIn": "Continuar logado",
27 27 "auth.form.forgotPasswd": "Esqueceu sua senha?",
28 28 "auth.form.login_button": "Login",
  29 + "auth.social.alternative": "Ou",
29 30 "auth.social.connectWith": "Conectar com:",
30 31 "auth.createAccount": "Criar conta",
  32 + "forgotPwd.title": "Esqueceu sua senha?",
  33 + "forgotPwd.sendInstructions": "Enviar Instruções",
  34 + "forgotPwd.info": "Ao clicar no botão acima, você receberá um email com instruções para criar uma nova senha.",
31 35 "navbar.content_viewer_actions.new_item": "Novo Item",
32 36 "navbar.profile_actions.new_item": "Novo Item",
33 37 "navbar.content_viewer_actions.new_post": "Novo Artigo",
... ...