Commit 681fd6f1a66eb156bcc041dbd1bda5dd1971e61d
1 parent
285efda0
Exists in
master
and in
10 other branches
Issue #35
Showing
4 changed files
with
63 additions
and
2 deletions
Show diff stats
16 KB
17 KB
index.html
@@ -54,11 +54,12 @@ | @@ -54,11 +54,12 @@ | ||
54 | </ul> | 54 | </ul> |
55 | 55 | ||
56 | <div id="proposal-group" class='hide'> | 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 | <div id="search-input-container"> | 58 | <div id="search-input-container"> |
59 | <input placeholder="palavra chave" id="search-input" type="text" /> | 59 | <input placeholder="palavra chave" id="search-input" type="text" /> |
60 | </div> | 60 | </div> |
61 | <ul> | 61 | <ul> |
62 | + | ||
62 | {{#list_proposal article.children}} | 63 | {{#list_proposal article.children}} |
63 | {{#link title id}}{{/link}} | 64 | {{#link title id}}{{/link}} |
64 | {{/list_proposal}} | 65 | {{/list_proposal}} |
@@ -221,8 +222,8 @@ | @@ -221,8 +222,8 @@ | ||
221 | <input id="user_password" name="password" type="password" placeholder="Senha"> | 222 | <input id="user_password" name="password" type="password" placeholder="Senha"> |
222 | </div> | 223 | </div> |
223 | <div class="actions"> | 224 | <div class="actions"> |
224 | - <a href="http://www.participa.br/account/forgot_password" target="_blank" class="forgot-password">Esqueci minha senha</a> | ||
225 | <a href="#" class="login-action">Acessar</a> | 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 | </div> | 227 | </div> |
227 | <div class="oauth"> | 228 | <div class="oauth"> |
228 | <div class="label">Acessar com:</div> | 229 | <div class="label">Acessar com:</div> |
sass/_proposal_detail.scss
@@ -453,6 +453,66 @@ | @@ -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 | } |