Download as
Browse Code »

Commit b4735c20f37a6fce42b5b7a03906653ce03da406

Authored by Leonardo Merlin
1 parent 8fe6a9a6
Exists in master and in 8 other branches css-list, feature-captcha, feature-proposal-vote, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Small improvements at Login feature

Showing 4 changed files with 130 additions and 29 deletions   Show diff stats
src/app/partials/footer/footer.scss
  Diff comments   View file @b4735c2
... ... @@ -7,5 +7,5 @@ $barra-theme: ("green": #00420c, "yellow": #2c66ce, "blue": #0042b1);
7 7 }
8 8  
9 9 #footer {
10   - margin: 10px 0;
  10 + margin: 10px auto;
11 11 }
... ...
src/app/partials/login/login.html
  Diff comments   View file @b4735c2
1   -<article class="container" role="main">
2   -
3   - <div class="col-sm-6 col-sm-offset-3">
4   - <form name="loginForm" ng-submit="login.login(login.credentials)">
5   -
6   - <h2>Por favor, identifique-se:</h2>
7   -
8   - <div class="form-group">
9   - <label for="inputUsername" class="sr-only">E-mail:</label>
10   - <div class="input-group">
11   - <div class="input-group-addon"><span class="glyphicon glyphicon-user"></span></div>
12   - <input type="text" id="inputUsername" class="form-control" placeholder="E-mail" required="" autofocus="" ng-model="login.credentials.username">
13   - </div>
  1 +<section role="main" class="section-gray">
  2 + <div class="container">
  3 + <div class="row">
  4 + <div class="col-sm-8 col-sm-offset-2">
  5 + <form name="loginForm" ng-submit="login.login(login.credentials)">
  6 + <div class="form-group">
  7 + <label for="inputUsername" class="sr-only">E-mail:</label>
  8 + <div class="input-group">
  9 + <div class="input-group-addon"><span class="glyphicon glyphicon-user"></span></div>
  10 + <input type="text" id="inputUsername" class="form-control" placeholder="E-mail" required="" autofocus="" ng-model="login.credentials.username">
  11 + </div>
  12 + </div>
  13 + <div class="form-group">
  14 + <label for="inputPassword" class="sr-only">Senha:</label>
  15 + <div class="input-group">
  16 + <div class="input-group-addon"><span class="glyphicon glyphicon-lock"></span></div>
  17 + <input type="password" id="inputPassword" class="form-control" placeholder="Senha" required="" ng-model="login.credentials.password">
  18 + </div>
  19 + </div>
  20 + <div class="form-group">
  21 + <button class="btn btn-lg btn-primary btn-block" type="submit">Entrar</button>
  22 + </div>
  23 + </form>
14 24 </div>
15   -
16   - <div class="form-group">
17   - <label for="inputPassword" class="sr-only">Senha:</label>
18   - <div class="input-group">
19   - <div class="input-group-addon"><span class="glyphicon glyphicon-lock"></span></div>
20   - <input type="password" id="inputPassword" class="form-control" placeholder="Senha" required="" ng-model="login.credentials.password">
21   - </div>
22   - </div>
23   -
24   - <div class="form-group">
25   - <button class="btn btn-lg btn-primary btn-block" type="submit">Entrar</button>
26   - </div>
27   - </form>
  25 + </div>
28 26 </div>
29   -
30   -</article>
  27 +</section>
... ...
src/app/partials/login/login.scss 0 → 100644
  Diff comments   View file @b4735c2
... ... @@ -0,0 +1,50 @@
  1 +$gray: #f1f1f1;
  2 +
  3 +.section-gray {
  4 + background-color: $gray;
  5 +}
  6 +
  7 +.btn-social {
  8 + color: #fff;
  9 + font-weight: bold;
  10 +
  11 + &:hover,
  12 + &:focus {color: #fff;}
  13 +
  14 + &.btn-facebook {
  15 + background-color: #33477a;
  16 + &:hover,
  17 + &:focus {background-color: #304373; }
  18 + &:active {background-color: #33477a; }
  19 + }
  20 + &.btn-google-plus {
  21 + background-color: #b92d25;
  22 + &:hover,
  23 + &:focus {background-color: #b12b23; }
  24 + &:active {background-color: #b92d25; }
  25 + }
  26 +}
  27 +
  28 +.glyphicon {
  29 + &.icon-white {
  30 + fill: white;
  31 + }
  32 +}
  33 +
  34 +.separator-or {
  35 + border-top: 2px solid #d8d8d8;
  36 + text-align: center;
  37 + font-weight: bold;
  38 +
  39 + &:after {
  40 + content: "ou";
  41 + position: absolute;
  42 + top: 4px;
  43 + left: 50%;
  44 + margin-left: -26px;
  45 + font-size: 30px;
  46 + line-height: 30px;
  47 + padding: 0 0.25em;
  48 + background: $gray;
  49 + }
  50 +}
... ...
src/app/partials/login/signup.html 0 → 100644
  Diff comments   View file @b4735c2
... ... @@ -0,0 +1,54 @@
  1 +<section>
  2 + <div class="container">
  3 + <div class="row">
  4 + <div class="col-sm-12">
  5 + <h1>Cadastro</h1>
  6 + <p>Cadastre-se para fazer parte do Dialoga Brasil, interagir com as propostas e enviar as suas!</p>
  7 + </div>
  8 + </div>
  9 + </div>
  10 +</section>
  11 +<section role="main" class="section-gray">
  12 + <div class="container">
  13 + <div class="row">
  14 + <div class="col-sm-8 col-sm-offset-2">
  15 + <h2>Conecte-se por redes sociais</h2>
  16 + <div class="col-sm-6">
  17 + <button type="button" class="btn btn-lg btn-block btn-social btn-facebook">
  18 + <span class="glyphicon icon-facebook icon-white" aria-hidden="true">
  19 + <!-- Facebook -->
  20 + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25"><path d="M18 32L12 32 12 16l-4 0 0-5.5 4 0 0-3.2C12 2.7 13.2 0 18.5 0l4.4 0 0 5.5 -2.8 0c-2.1 0-2.2 0.8-2.2 2.2l0 2.8 5 0 -0.6 5.5L18 16 18 32z"/></svg>
  21 +
  22 + <!-- Twitter -->
  23 + <!-- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25"><path d="M32 6.1c-1.2 0.5-2.4 0.9-3.8 1 1.4-0.8 2.4-2.1 2.9-3.6 -1.3 0.8-2.7 1.3-4.2 1.6 -1.2-1.3-2.9-2.1-4.8-2.1 -3.6 0-6.6 2.9-6.6 6.6 0 0.5 0.1 1 0.2 1.5 -5.5-0.3-10.3-2.9-13.5-6.9 -0.6 1-0.9 2.1-0.9 3.3 0 2.3 1.2 4.3 2.9 5.5 -1.1 0-2.1-0.3-3-0.8 0 0 0 0.1 0 0.1 0 3.2 2.3 5.8 5.3 6.4 -0.6 0.2-1.1 0.2-1.7 0.2 -0.4 0-0.8 0-1.2-0.1 0.8 2.6 3.3 4.5 6.1 4.6 -2.2 1.8-5.1 2.8-8.2 2.8 -0.5 0-1.1 0-1.6-0.1 2.9 1.9 6.4 3 10.1 3 12.1 0 18.7-10 18.7-18.7 0-0.3 0-0.6 0-0.8C30 8.5 31.1 7.4 32 6.1z"/></svg> -->
  24 + </span>
  25 + <span class="text">
  26 + Conectar pelo Facebook
  27 + </span>
  28 + </button>
  29 + </div>
  30 + <div class="col-sm-6">
  31 + <button type="button" class="btn btn-lg btn-block btn-social btn-google-plus">
  32 + <span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
  33 + <!-- Google + -->
  34 + <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 33 33" width="25" height="25"><path d="M17.5 2c0 0-6.3 0-8.4 0C5.3 2 1.8 4.8 1.8 8.1c0 3.4 2.6 6.1 6.4 6.1 0.3 0 0.5 0 0.8 0 -0.2 0.5-0.4 1-0.4 1.6 0 0.9 0.5 1.7 1.1 2.3 -0.5 0-0.9 0-1.5 0C3.6 18.1 0 21.1 0 24.1c0 3 3.9 4.9 8.6 4.9 5.3 0 8.2-3 8.2-6 0-2.4-0.7-3.9-2.9-5.4 -0.8-0.5-2.2-1.8-2.2-2.6 0-0.9 0.3-1.3 1.6-2.4 1.4-1.1 2.4-2.6 2.4-4.4 0-2.1-0.9-4.2-2.7-4.8l2.7 0L17.5 2zM14.5 22.5c0.1 0.3 0.1 0.6 0.1 0.9 0 2.4-1.6 4.4-6.1 4.4 -3.2 0-5.5-2-5.5-4.5 0-2.4 2.9-4.4 6.1-4.4 0.8 0 1.4 0.1 2.1 0.3C12.9 20.4 14.2 21.1 14.5 22.5zM9.4 13.4c-2.2-0.1-4.2-2.4-4.6-5.2 -0.4-2.8 1.1-5 3.2-4.9 2.2 0.1 4.2 2.3 4.6 5.2C13 11.2 11.6 13.4 9.4 13.4zM26 8L26 2 24 2 24 8 18 8 18 10 24 10 24 16 26 16 26 10 32 10 32 8z"/></svg>
  35 + </span>
  36 + <span class="text">
  37 + Conectar pelo Google+
  38 + </span>
  39 + </button>
  40 + </div>
  41 + </div>
  42 + </div>
  43 + <div class="row">
  44 + <div class="col-sm-8 col-sm-offset-2">
  45 + <hr class="separator-or"></hr>
  46 + </div>
  47 + </div>
  48 + <div class="row">
  49 + <div class="col-sm-8 col-sm-offset-2">
  50 + <h2>Faça o cadastro abaixo</h2>
  51 + </div>
  52 + </div>
  53 + </div>
  54 +</section>
... ...