Issue #35

Augusto dos Anjos Almeida
1 parent 285efda0
Showing 4 changed files with 63 additions and 2 deletions Show diff stats
images/icon-facebook.png
images/icon-google-plus.png
index.html
sass/_proposal_detail.scss
@@ -54,11 +54,12 @@
       </ul>
  
       <div id="proposal-group" class='hide'>
-        <label for="search">Selecione um programa para fazer propostas e contar sua experiência. </label>
+        <label for="search">Selecione um programa para fazer propostas e contar sua experiência.</label>
         <div id="search-input-container">
           <input placeholder="palavra chave" id="search-input" type="text" />
         </div>
         <ul>
+
           {{#list_proposal article.children}}
             {{#link title id}}{{/link}}
           {{/list_proposal}}
@@ -221,8 +222,8 @@
           <input id="user_password" name="password" type="password" placeholder="Senha">
         </div>
         <div class="actions">
-          <a href="http://www.participa.br/account/forgot_password" target="_blank" class="forgot-password">Esqueci minha senha</a>
           <a href="#" class="login-action">Acessar</a>
+          <a href="http://www.participa.br/account/forgot_password" target="_blank" class="forgot-password">Esqueci minha senha</a>
         </div>
         <div class="oauth">
           <div class="label">Acessar com:</div>
@@ -453,6 +453,66 @@
           }
         }
       }
+    /*------------------ formulario ---------------- */
+    form .oauth {
+        margin-top: 10px;
+        float: left;
+        width: 50%;
+    }
+
+    form .actions {
+        float: right;
+        width: 50%;
+    }
+
+    .actions > a.login-action{
+        background: $color;
+        border-radius: 7px;
+        color: #fff;
+        display: block;
+        margin-right: 37px;
+        margin-top: 40px;
+        padding: 10px 35px;
+    }
+
+    form .oauth .new-user{
+        background: $color;
+        border-radius: 7px;
+        color: #fff;
+        padding: 10px 15px;
+    }
+
+    form .oauth .label{
+      margin: 0 0 10px;
+    }
+
+    .actions > a.forgot-password{
+        color: $color;
+        display: block;
+        font-weight: normal;
+        font-size: 14px;
+    }
+
+    .oauth > .facebook,
+    .oauth > .google{
+      width: 39px;
+      height: 39px;
+      overflow: hidden;
+      text-indent: -150px;
+      vertical-align: middle;
+      display: inline-block;
+      margin: 0 10px;
+    }
+
+    .oauth > .facebook{
+      background: transparent url(./images/icon-facebook.png) top left no-repeat;
+    }
+    .oauth > .google{
+      background: transparent url(./images/icon-google-plus.png) top left no-repeat;
+    }
+    /*-----------------------------------------------*/
+
+
     }
   }
 }
...	...	@@ -54,11 +54,12 @@
54	54	</ul>
55	55
56	56	<div id="proposal-group" class='hide'>
57		- <label for="search">Selecione um programa para fazer propostas e contar sua experiência. </label>
	57	+ <label for="search">Selecione um programa para fazer propostas e contar sua experiência.</label>
58	58	<div id="search-input-container">
59	59	<input placeholder="palavra chave" id="search-input" type="text" />
60	60	</div>
61	61	<ul>
	62	+
62	63	{{#list_proposal article.children}}
63	64	{{#link title id}}{{/link}}
64	65	{{/list_proposal}}
...	...	@@ -221,8 +222,8 @@
221	222	<input id="user_password" name="password" type="password" placeholder="Senha">
222	223	</div>
223	224	<div class="actions">
224		- <a href="http://www.participa.br/account/forgot_password" target="_blank" class="forgot-password">Esqueci minha senha</a>
225	225	<a href="#" class="login-action">Acessar</a>
	226	+ <a href="http://www.participa.br/account/forgot_password" target="_blank" class="forgot-password">Esqueci minha senha</a>
226	227	</div>
227	228	<div class="oauth">
228	229	<div class="label">Acessar com:</div>
...	...
...	...	@@ -453,6 +453,66 @@
453	453	}
454	454	}
455	455	}
	456	+ /------------------ formulario ---------------- /
	457	+ form .oauth {
	458	+ margin-top: 10px;
	459	+ float: left;
	460	+ width: 50%;
	461	+ }
	462	+
	463	+ form .actions {
	464	+ float: right;
	465	+ width: 50%;
	466	+ }
	467	+
	468	+ .actions > a.login-action{
	469	+ background: $color;
	470	+ border-radius: 7px;
	471	+ color: #fff;
	472	+ display: block;
	473	+ margin-right: 37px;
	474	+ margin-top: 40px;
	475	+ padding: 10px 35px;
	476	+ }
	477	+
	478	+ form .oauth .new-user{
	479	+ background: $color;
	480	+ border-radius: 7px;
	481	+ color: #fff;
	482	+ padding: 10px 15px;
	483	+ }
	484	+
	485	+ form .oauth .label{
	486	+ margin: 0 0 10px;
	487	+ }
	488	+
	489	+ .actions > a.forgot-password{
	490	+ color: $color;
	491	+ display: block;
	492	+ font-weight: normal;
	493	+ font-size: 14px;
	494	+ }
	495	+
	496	+ .oauth > .facebook,
	497	+ .oauth > .google{
	498	+ width: 39px;
	499	+ height: 39px;
	500	+ overflow: hidden;
	501	+ text-indent: -150px;
	502	+ vertical-align: middle;
	503	+ display: inline-block;
	504	+ margin: 0 10px;
	505	+ }
	506	+
	507	+ .oauth > .facebook{
	508	+ background: transparent url(./images/icon-facebook.png) top left no-repeat;
	509	+ }
	510	+ .oauth > .google{
	511	+ background: transparent url(./images/icon-google-plus.png) top left no-repeat;
	512	+ }
	513	+ /-----------------------------------------------/
	514	+
	515	+
456	516	}
457	517	}
458	518	}
...	...