Download as
Browse Code »

Commit f0aff5fc7b4d3f535813e7c3bee33dfbf6e97d09

Authored by Rafael Diego
1 parent 2870b054
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

Versão inicial da página de cadastro

Showing 4 changed files with 336 additions and 75 deletions   Show diff stats
src/app/pages/auth/auth.scss
  Diff comments   View file @f0aff5f
1 .auth-content{ 1 .auth-content{
2 2
  3 + .btn-submit {
  4 + background-color: #5E749D;
  5 + color: #fff;
  6 + font-weight: bold;
  7 + }
  8 +
3 .btn-social { 9 .btn-social {
4 color: #fff; 10 color: #fff;
5 font-weight: bold; 11 font-weight: bold;
  12 + padding: 15px 16px;
  13 + font-size: 16px;
  14 + white-space: normal;
6 15
7 &:hover, 16 &:hover,
8 &:focus {color: #fff;} 17 &:focus {color: #fff;}
9 18
10 &.btn-facebook { 19 &.btn-facebook {
11 - background-color: #33477a; 20 + // background-color: #33477a;
  21 + background-color: #496AA0;
  22 +
12 &:hover, 23 &:hover,
13 &:focus {background-color: #304373; } 24 &:focus {background-color: #304373; }
14 &:active {background-color: #33477a; } 25 &:active {background-color: #33477a; }
@@ -19,6 +30,9 @@ @@ -19,6 +30,9 @@
19 &:focus {background-color: #b12b23; } 30 &:focus {background-color: #b12b23; }
20 &:active {background-color: #b92d25; } 31 &:active {background-color: #b92d25; }
21 } 32 }
  33 + @media (max-width: 991px) {
  34 + margin-bottom: 20px;
  35 + }
22 } 36 }
23 37
24 .btn { 38 .btn {
@@ -39,25 +53,61 @@ @@ -39,25 +53,61 @@
39 } 53 }
40 } 54 }
41 55
42 - .separator-or { 56 + .border-social-icon {
  57 + border-radius: 25px;
  58 + padding: 7px 9px;
  59 + width: 40px;
  60 + height: 40px;
  61 + display: inline-block;
  62 +
  63 + &.border-social-facebook {
  64 + background: #547BBC;
  65 + }
  66 +
  67 + &.border-social-googlePlus {
  68 + background: #D44105;
  69 + }
  70 + }
  71 +
  72 + .separator {
43 border-top: 2px solid #d8d8d8; 73 border-top: 2px solid #d8d8d8;
44 text-align: center; 74 text-align: center;
45 font-weight: bold; 75 font-weight: bold;
  76 + margin-top: 20px;
  77 + margin-bottom: 35px;
46 78
47 &:after { 79 &:after {
  80 + position: absolute;
  81 + top: 4px;
  82 + margin-left: -26px;
  83 + font-size: 20px;
  84 + line-height: 30px;
  85 + padding: 0 0.25em;
  86 + background: $gray;
  87 +
  88 + .contraste & {
  89 + background: #000;
  90 + }
  91 + }
  92 +
  93 + &.separator-or:after {
48 content: "ou"; 94 content: "ou";
49 - position: absolute;  
50 - top: 4px;  
51 - left: 50%;  
52 - margin-left: -26px;  
53 - font-size: 30px;  
54 - line-height: 30px;  
55 - padding: 0 0.25em;  
56 - background: $gray; 95 + left: 51%;
  96 + }
57 97
58 - .contraste & {  
59 - background: #000;  
60 - } 98 + &.separator-cadastro:after {
  99 + content: "ou preencha o formulario";
  100 + left: 31%;
61 } 101 }
  102 +
  103 + }
  104 +
  105 + input[type="checkbox"] {
  106 + display:inline-block;
  107 + width:18px;
  108 + height:18px;
  109 + margin:-1px 4px 0 0;
  110 + vertical-align:middle;
  111 + cursor:pointer;
62 } 112 }
63 } 113 }
src/app/pages/auth/signin.html
  Diff comments   View file @f0aff5f
1 <section role="main" class="section-gray auth-content"> 1 <section role="main" class="section-gray auth-content">
2 <div class="container"> 2 <div class="container">
3 -  
4 - <div ng-if="pageSignin.currentUser">  
5 - <div class="row">  
6 - <div class="col-sm-8 col-sm-offset-2">  
7 - <h3>Você está logado!</h3>  
8 - <button type="button" ng-click="pageSignin.onClickLogout()" class="btn btn-primary">Sair</button> 3 + <div class="row">
  4 + <!-- Mostra só se estiver logado -->
  5 + <div ng-if="pageSignin.currentUser">
  6 + <div class="row">
  7 + <div class="col-sm-8 col-sm-offset-2">
  8 + <h3>Você está logado!</h3>
  9 + <button type="button" ng-click="pageSignin.onClickLogout()" class="btn btn-primary">Sair</button>
  10 + </div>
9 </div> 11 </div>
10 </div> 12 </div>
11 - </div> 13 + <!-- Mostra só se não estiver logado -->
  14 + <div ng-if="!pageSignin.currentUser">
12 15
13 - <div ng-if="!pageSignin.currentUser">  
14 - <div class="row">  
15 - <div class="col-sm-8 col-sm-offset-2">  
16 - <h2>Identifique-se</h2>  
17 - <form name="loginForm" ng-submit="pageSignin.login(pageSignin.credentials)">  
18 - <div class="form-group">  
19 - <label for="inputUsername" class="sr-only">E-mail:</label>  
20 - <div class="input-group">  
21 - <div class="input-group-addon"><span class="glyphicon glyphicon-user"></span></div>  
22 - <input type="text" id="inputUsername" class="form-control" placeholder="E-mail" required="" autofocus="" ng-model="pageSignin.credentials.username">  
23 - </div> 16 + <div class="col-sm-6">
  17 + <div class="row">
  18 + <div class="col-sm-10 col-sm-offset-2">
  19 + <h2>Já possui cadastro</h2>
  20 + <p>Use seus dados para acessar o Dialoga Brasil</p>
  21 + <form name="loginForm" ng-submit="pageSignin.login(pageSignin.credentials)">
  22 + <div class="form-group">
  23 + <label for="inputUsername">E-mail*</label>
  24 + <input type="text" id="inputUsername" class="form-control input-lg" required="" autofocus="" ng-model="pageSignin.credentials.username">
  25 + </div>
  26 + <div class="form-group">
  27 + <div class="input-group">
  28 + <label for="inputPassword">Senha*</label>
  29 + <input type="password" id="inputPassword" class="form-control input-lg" required="" ng-model="pageSignin.credentials.password">
  30 + </div>
  31 + </div>
  32 + <div class="form-group">
  33 + <button class="btn btn-lg btn-block btn-submit" type="submit">Entrar</button>
  34 + </div>
  35 + </form>
24 </div> 36 </div>
25 - <div class="form-group">  
26 - <label for="inputPassword" class="sr-only">Senha:</label>  
27 - <div class="input-group">  
28 - <div class="input-group-addon"><span class="glyphicon glyphicon-lock"></span></div>  
29 - <input type="password" id="inputPassword" class="form-control" placeholder="Senha" required="" ng-model="pageSignin.credentials.password"> 37 + </div>
  38 + <div class="row">
  39 + <div class="col-sm-10 col-sm-offset-2">
  40 + <hr class="separator separator-or"></hr>
  41 + </div>
  42 + </div>
  43 + <div class="row">
  44 + <div class="col-md-5 col-md-offset-2">
  45 + <button type="button" class="btn btn-lg btn-block btn-social btn-facebook">
  46 + <div class="border-social-icon border-social-facebook">
  47 + <span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
  48 + <!-- Facebook -->
  49 + <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>
  50 + </span>
30 </div> 51 </div>
  52 + <span class="text">
  53 + Entrar com Facebook
  54 + </span>
  55 + </button>
  56 + </div>
  57 + <div class="col-md-5">
  58 + <button type="button" class="btn btn-lg btn-block btn-social btn-google-plus">
  59 + <div class="border-social-icon border-social-googlePlus">
  60 + <span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
  61 + <!-- Google Plus -->
  62 + <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>
  63 + </span>
31 </div> 64 </div>
32 - <div class="form-group">  
33 - <button class="btn btn-lg btn-primary btn-block" type="submit">Entrar</button> 65 + <span class="text">
  66 + Entrar com Google+
  67 + </span>
  68 + </button>
  69 + </div>
  70 + </div>
  71 + </div>
  72 + <div class="col-sm-6">
  73 + <div class="row">
  74 + <div class="col-sm-12">
  75 + <h2>Ou cadastre-se</h2>
  76 + <p>Para fazer parte do Dialoga Brasil, interagir com as propostas e enviar as suas!</p>
  77 + </div>
  78 + </div>
  79 + <div class="row">
  80 + <div class="col-md-6">
  81 + <button type="button" class="btn btn-lg btn-block btn-social btn-facebook">
  82 + <div class="border-social-icon border-social-facebook">
  83 + <span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
  84 + <!-- Google Plus -->
  85 + <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>
  86 + </span>
34 </div> 87 </div>
35 - </form> 88 + <span class="text">Conectar pelo Facebook</span>
  89 + </button>
  90 + </div>
  91 + <div class="col-md-6">
  92 + <button type="button" class="btn btn-lg btn-block btn-social btn-google-plus">
  93 + <div class="border-social-icon border-social-googlePlus">
  94 + <span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
  95 + <!-- Google Plus -->
  96 + <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>
  97 + </span>
  98 + </div>
  99 + <span class="text">Conectar pelo Google+</span>
  100 + </button>
36 </div> 101 </div>
37 </div> 102 </div>
38 <div class="row"> 103 <div class="row">
39 - <div class="col-sm-8 col-sm-offset-2">  
40 - <hr class="separator-or"></hr> 104 + <div class="col-sm-12">
  105 + <hr class="separator separator-cadastro"></hr>
41 </div> 106 </div>
42 </div> 107 </div>
43 <div class="row"> 108 <div class="row">
44 - <div class="col-sm-8 col-sm-offset-2">  
45 - <button class="btn btn-lg btn-link btn-block" type="button" ui-sref="cadastrar">Cadastre-se</button> 109 + <div class="col-sm-12">
  110 + <form name="loginForm">
  111 + <div class="form-group">
  112 + <label for="inputNome">Nome:</label>
  113 + <input type="text" id="inputNome" class="form-control input-lg" required="true" autofocus="">
  114 + </div>
  115 + <div class="form-group">
  116 + <label for="inputEmail">E-mail*</label>
  117 + <input type="text" id="inputEmail" class="form-control input-lg" required="true" autofocus="">
  118 + </div>
  119 + <div class="row">
  120 + <div class="col-sm-6">
  121 + <div class="form-group">
  122 + <label for="inputPassword">Senha:</label>
  123 + <input type="password" id="inputPassword" class="form-control input-lg" required="true" >
  124 + </div>
  125 + </div>
  126 + <div class="col-sm-6">
  127 + <div class="form-group">
  128 + <label for="inputRepeatPassword">Confirmar Senha:</label>
  129 + <input type="password" id="inputRepeatPassword" class="form-control input-lg" required="true">
  130 + </div>
  131 + </div>
  132 + </div>
  133 + <div class="row">
  134 + <div class="col-sm-12">
  135 + <span class="text">A senha deve ter 6 ou mais caracteres e conter números e letras.</span>
  136 + </div>
  137 + </div>
  138 + <div class="form-group">
  139 + <input type="checkbox" name="termosDeUso" value="aceito">Já li os <a href="">Termos de Uso</a> e concordo com os mesmos*</input>
  140 + </div>
  141 + <div class="form-group">
  142 + <span>Digite o texto da imagem</span>
  143 + <p>O Captcha vai aqui</p>
  144 + </div>
  145 + <div class="form-group">
  146 + <button class="btn btn-lg btn-block btn-submit" type="submit">Cadastrar</button>
  147 + </div>
  148 + </form>
46 </div> 149 </div>
47 </div> 150 </div>
48 </div> 151 </div>
49 </div> 152 </div>
  153 +</div>
  154 +</div>
50 </section> 155 </section>
src/app/pages/auth/signinbkp.html 0 → 100644
  Diff comments   View file @f0aff5f
@@ -0,0 +1,70 @@ @@ -0,0 +1,70 @@
  1 +<section role="main" class="section-gray auth-content">
  2 + <div class="container">
  3 +
  4 + <div ng-if="pageSignin.currentUser">
  5 + <div class="row">
  6 + <div class="col-sm-8 col-sm-offset-2">
  7 + <h3>Você está logado!</h3>
  8 + <button type="button" ng-click="pageSignin.onClickLogout()" class="btn btn-primary">Sair</button>
  9 + </div>
  10 + </div>
  11 + </div>
  12 +
  13 + <div ng-if="!pageSignin.currentUser">
  14 + <div class="row">
  15 + <div class="col-sm-8 col-sm-offset-2">
  16 + <h2>Já possui cadastro</h2>
  17 + <h5p>Use seus dados para acessar o Dialoga Brasil</p>
  18 + <form name="loginForm" ng-submit="pageSignin.login(pageSignin.credentials)">
  19 + <div class="form-group">
  20 + <!-- <div class="input-group"> -->
  21 + <label for="inputUsername">E-mail*</label>
  22 + <!-- <div class="input-group-addon"><span class="glyphicon glyphicon-user"></span></div> -->
  23 + <input type="text" id="inputUsername" class="form-control input-lg" required="" autofocus="" ng-model="pageSignin.credentials.username">
  24 + <!-- </div> -->
  25 + </div>
  26 + <div class="form-group">
  27 + <!-- <div class="input-group"> -->
  28 + <label for="inputPassword">Senha*</label>
  29 + <!-- <div class="input-group-addon"><span class="glyphicon glyphicon-lock"></span></div> -->
  30 + <input type="password" id="inputPassword" class="form-control input-lg" required="" ng-model="pageSignin.credentials.password">
  31 + <!-- </div> -->
  32 + </div>
  33 + <div class="form-group">
  34 + <button class="btn btn-lg btn-block btn-submit" type="submit">Entrar</button>
  35 + </div>
  36 + </form>
  37 + </div>
  38 + </div>
  39 + <div class="row">
  40 + <div class="col-sm-8 col-sm-offset-2">
  41 + <hr class="separator separator-or"></hr>
  42 + </div>
  43 + </div>
  44 + <div class="row">
  45 + <div class="col-md-6">
  46 + <button type="button" class="btn btn-lg btn-block btn-social btn-facebook">
  47 + <span class="glyphicon icon-facebook icon-white" aria-hidden="true">
  48 + <!-- Facebook -->
  49 + <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>
  50 + </span>
  51 + <span class="text">
  52 + Entrar com Facebook
  53 + </span>
  54 + </button>
  55 + </div>
  56 + <div class="col-md-6">
  57 + <button type="button" class="btn btn-lg btn-block btn-social btn-google-plus">
  58 + <span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
  59 + <!-- Google Plus -->
  60 + <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>
  61 + </span>
  62 + <span class="text">
  63 + Entrar com Google+
  64 + </span>
  65 + </button>
  66 + </div>
  67 + </div>
  68 + </div>
  69 + </div>
  70 +</section>
src/app/pages/auth/signup.html
  Diff comments   View file @f0aff5f
@@ -9,49 +9,85 @@ @@ -9,49 +9,85 @@
9 <div class="container"> 9 <div class="container">
10 <div class="row"> 10 <div class="row">
11 <div class="col-sm-12"> 11 <div class="col-sm-12">
12 - <h1>Cadastro</h1>  
13 - <p>Cadastre-se para fazer parte do Dialoga Brasil, interagir com as propostas e enviar as suas!</p> 12 + <!-- <h1>Ou cadastre-se</h1> -->
  13 + <!-- <p>Para fazer parte do Dialoga Brasil, interagir com as propostas e enviar as suas!</p> -->
14 </div> 14 </div>
15 </div> 15 </div>
16 </div> 16 </div>
17 </section> 17 </section>
18 <section role="main" class="section-gray auth-content"> 18 <section role="main" class="section-gray auth-content">
19 - <div class="container">  
20 - <div class="row">  
21 - <div class="col-sm-8 col-sm-offset-2">  
22 - <h2>Conecte-se por redes sociais</h2>  
23 - <div class="col-sm-6">  
24 - <button type="button" class="btn btn-lg btn-block btn-social btn-facebook">  
25 - <span class="glyphicon icon-facebook icon-white" aria-hidden="true">  
26 - <!-- Facebook -->  
27 - <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>  
28 - </span>  
29 - <span class="text">  
30 - Conectar pelo Facebook  
31 - </span>  
32 - </button>  
33 - </div>  
34 - <div class="col-sm-6">  
35 - <button type="button" class="btn btn-lg btn-block btn-social btn-google-plus">  
36 - <span class="glyphicon icon-google-plus icon-white" aria-hidden="true">  
37 - <!-- Google Plus -->  
38 - <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>  
39 - </span>  
40 - <span class="text">  
41 - Conectar pelo Google+  
42 - </span>  
43 - </button>  
44 - </div> 19 +<div class="row">
  20 + <div class="col-sm-12">
  21 + <h1>Ou cadastre-se</h1>
  22 + <p>Para fazer parte do Dialoga Brasil, interagir com as propostas e enviar as suas!</p>
45 </div> 23 </div>
46 </div> 24 </div>
  25 + <div class="container">
47 <div class="row"> 26 <div class="row">
48 - <div class="col-sm-8 col-sm-offset-2">  
49 - <hr class="separator-or"></hr> 27 + <div class="col-md-6">
  28 + <button type="button" class="btn btn-lg btn-block btn-social btn-facebook">
  29 + <span class="glyphicon icon-facebook icon-white" aria-hidden="true">
  30 + <!-- Facebook -->
  31 + <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>
  32 + </span>
  33 + <span class="text">
  34 + Conectar pelo Facebook
  35 + </span>
  36 + </button>
  37 + </div>
  38 + <div class="col-md-6">
  39 + <button type="button" class="btn btn-lg btn-block btn-social btn-google-plus">
  40 + <span class="glyphicon icon-google-plus icon-white" aria-hidden="true">
  41 + <!-- Google Plus -->
  42 + <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>
  43 + </span>
  44 + <span class="text">
  45 + Conectar pelo Google+
  46 + </span>
  47 + </button>
50 </div> 48 </div>
51 </div> 49 </div>
  50 + <div class="row">
  51 + <div class="col-sm-12">
  52 + <hr class="separator separator-cadastro"></hr>
  53 + </div>
  54 + </div>
52 <div class="row"> 55 <div class="row">
53 - <div class="col-sm-8 col-sm-offset-2">  
54 - <h2>Faça o cadastro abaixo</h2> 56 + <div class="col-sm-12">
  57 + <form name="loginForm" ng-submit="pageSignin.login(pageSignin.credentials)">
  58 + <div class="form-group">
  59 + <label for="inputNome">Nome:</label>
  60 + <input type="text" id="inputNome" class="form-control input-lg" required="true" autofocus="" ng-model="">
  61 + </div>
  62 + <div class="form-group">
  63 + <label for="inputEmail">E-mail*</label>
  64 + <input type="text" id="inputEmail" class="form-control input-lg" required="true" autofocus="" ng-model="">
  65 + </div>
  66 + <div class="form-group">
  67 + <div class="input-group">
  68 + <label for="inputPassword">Senha:</label>
  69 + <input type="password" id="inputPassword" class="form-control input-lg" required="true" ng-model="">
  70 + </div>
  71 + </div>
  72 + <div class="form-group">
  73 +
  74 + <div class="input-group">
  75 + <label for="inputRepeatPassword">Confirmar Senha:</label>
  76 + <input type="password" id="inputRepeatPassword" class="form-control input-lg" required="true" ng-model="">
  77 + </div>
  78 + </div>
  79 + <span>A senha deve ter 6 ou mais caracteres e conter números e letras.</span>
  80 + <div class="form-group">
  81 + <input type="checkbox" name="termosDeUso" value="aceito">Já li os <a href="">Termos de Uso</a> e concordo com os mesmos*</input>
  82 + </div>
  83 + <div class="form-group">
  84 + <span>Digite o texto da imagem</span>
  85 + <p>O Captcha vai aqui</p>
  86 + </div>
  87 + <div class="form-group">
  88 + <button class="btn btn-lg btn-block btn-submit" type="submit">Cadastrar</button>
  89 + </div>
  90 + </form>
55 </div> 91 </div>
56 </div> 92 </div>
57 </div> 93 </div>