Download as
Browse Code »

Commit 49a048fbb3472ff71eb919171210c164a0e6cfb5

Authored by Daniela Feitosa
Committed by Michel Felipe
1 parent 2c6cca64

Improvements to login modal 

Added css rules that increased margin and padding on
specific elements, horizontal rules with text in the middle
and new translations.

Also added checkbox for keep logged in.

Signed-off-by: Carlos Coêlho <carlospecter@gmail.com>
Signed-off-by: Sabryna Sousa <sabryna.sousa1323@gmail.com>
Showing 5 changed files with 78 additions and 14 deletions   Show diff stats
src/app/layout/blocks/login-block/login-block.html
  Diff comments   View file @49a048f
... ... @@ -15,13 +15,13 @@
15 15 <div class="logged-user-info" ng-show="!ctrl.currentUser">
16 16 <form>
17 17 <div class="form-group">
18   - <label for="exampleInputEmail1">{{"auth.form.login" | translate}}</label>
19   - <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Login / Email" ng-model="ctrl.credentials.username">
  18 + <label for="email">{{"auth.form.login" | translate}}</label>
  19 + <input type="text" class="form-control" id="email" placeholder="{{'auth.form.login' | translate}}" ng-model="ctrl.credentials.username">
20 20 </div>
21 21 <div class="form-group">
22   - <label for="exampleInputPassword1">{{"auth.form.password" | translate}}</label>
23   - <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password" ng-model="ctrl.credentials.password">
  22 + <label for="passwd">{{"auth.form.password" | translate}}</label>
  23 + <input type="password" class="form-control" id="passwd" placeholder="{{'auth.form.password' | translate}}" ng-model="ctrl.credentials.password">
24 24 </div>
25 25 <button type="submit" class="btn btn-default" ng-click="ctrl.login()">{{"auth.form.login_button" | translate}}</button>
26 26 </form>
27   -</div>
28 27 \ No newline at end of file
  28 +</div>
... ...
src/app/login/login.html
  Diff comments   View file @49a048f
... ... @@ -4,13 +4,20 @@
4 4 <div class="modal-body">
5 5 <form>
6 6 <div class="form-group">
7   - <label for="exampleInputEmail1">{{"auth.form.login" | translate}}</label>
8   - <input type="text" class="form-control" id="exampleInputEmail1" placeholder="Login / Email" ng-model="vm.credentials.username">
  7 + <label for="email">{{"auth.form.login" | translate}}</label>
  8 + <input type="text" class="form-control" id="email" placeholder="{{'auth.form.login' | translate}}" ng-model="vm.credentials.username">
9 9 </div>
10 10 <div class="form-group">
11   - <label for="exampleInputPassword1">{{"auth.form.password" | translate}}</label>
12   - <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password" ng-model="vm.credentials.password">
  11 + <label for="passwd">{{"auth.form.password" | translate}}</label>
  12 + <input type="password" class="form-control" id="passwd" placeholder="{{'auth.form.password' | translate}}" ng-model="vm.credentials.password">
13 13 </div>
14   - <button type="submit" class="btn btn-default" ng-click="vm.login()">{{"auth.form.login_button" | translate}}</button>
  14 + <div class="form-inline">
  15 + <div class="checkbox">
  16 + <label>
  17 + <input type="checkbox" > {{"auth.form.keepLoggedIn" | translate}}
  18 + </label>
  19 + </div>
  20 + </div>
  21 + <button type="submit" class="btn btn-default btn-block" ng-click="vm.login()">{{"auth.form.login_button" | translate}}</button>
15 22 </form>
16 23 </div>
... ...
src/app/login/login.scss 0 → 100644
  Diff comments   View file @49a048f
... ... @@ -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 @49a048f
... ... @@ -21,9 +21,10 @@
21 21 "activities.create_article.description": "has published on",
22 22 "activities.add_member_in_community.description": "has joined the community",
23 23 "activities.new_friendship.description": "has made {friends, plural, one{one new friend} other{# new friends}}:",
24   - "auth.title": "Login",
25   - "auth.form.login": "Login / Email address",
  24 + "auth.title": "Great to have you back!",
  25 + "auth.form.login": "Username or Email address",
26 26 "auth.form.password": "Password",
  27 + "auth.form.keepLoggedIn": "Keep me logged in",
27 28 "auth.form.login_button": "Login",
28 29 "navbar.content_viewer_actions.new_item": "New Item",
29 30 "navbar.profile_actions.new_item": "New Item",
... ...
src/languages/pt.json
  Diff comments   View file @49a048f
... ... @@ -21,9 +21,10 @@
21 21 "activities.create_article.description": "publicou em",
22 22 "activities.add_member_in_community.description": "entrou na comunidade",
23 23 "activities.new_friendship.description": "fez {friends, plural, one{um novo amigo} other{# novos amigos}}:",
24   - "auth.title": "Login",
25   - "auth.form.login": "Login / Email",
  24 + "auth.title": "Legal ter você de volta!",
  25 + "auth.form.login": "Nome de usuário ou Email",
26 26 "auth.form.password": "Senha",
  27 + "auth.form.keepLoggedIn": "Continuar logado",
27 28 "auth.form.login_button": "Login",
28 29 "navbar.content_viewer_actions.new_item": "Novo Item",
29 30 "navbar.profile_actions.new_item": "Novo Item",
... ...