Commit 92111acdc5b64b9d5ff5605a6688de837659198c
Exists in
master
and in
6 other branches
Fix merge into sass of proposal_detail
Showing
17 changed files
with
87 additions
and
12 deletions
Show diff stats
.gitignore
1.48 KB
15.2 KB
1.52 KB
1.73 KB
15.5 KB
1.93 KB
1.79 KB
15.4 KB
1.72 KB
2.04 KB
15.7 KB
2.17 KB
index.html
| ... | ... | @@ -97,7 +97,12 @@ |
| 97 | 97 | <h1><a href="#">{{article.title}}</a></h1> |
| 98 | 98 | <a id="display-contrast" href="#">Alto Contraste</a> |
| 99 | 99 | <div class="social"> |
| 100 | - <a href="#" class="fb-share" data-description="Aqui suas ideias viram propostas e você ajuda a melhorar as ações do governo">Compartilhar</a> | |
| 100 | + <ul> | |
| 101 | + <li><a href="#" class="fb-share icon icon-facebook" data-description="Aqui suas ideias viram propostas e você ajuda a melhorar as ações do governo">Compartilhar no Facebook</a></li> | |
| 102 | + <li><a class="tw-share disabled icon icon-twitter">Compartilhar no Twitter</a></li> | |
| 103 | + <li><a class="gp-share disabled icon icon-gplus">Compartilhar no Google Plus</a></li> | |
| 104 | + <li><a class="ws-share disabled icon icon-whatsapp">Compartilhar no WhatsApp</a></li> | |
| 105 | + </ul> | |
| 101 | 106 | </div> |
| 102 | 107 | </header> |
| 103 | 108 | |
| ... | ... | @@ -290,7 +295,13 @@ |
| 290 | 295 | <a href="#" class="vote-result">Resultados</a> |
| 291 | 296 | </div> |
| 292 | 297 | <div class="social"> |
| 293 | - <a href="#/programas/{{parent.id}}/propostas/{{id}}" class="fb-share" data-caption="{{parent.title}}" data-description="{{stripTags abstract}}">Compartilhar</a> | |
| 298 | + <span>Compartilhe esta proposta</span> | |
| 299 | + <ul> | |
| 300 | + <li><a href="#/programas/{{parent.id}}/propostas/{{id}}" class="fb-share icon icon-facebook" data-caption="{{parent.title}}" data-description="{{stripTags abstract}}">Compartilhar no Facebook</a></li> | |
| 301 | + <li><a class="tw-share disabled icon icon-twitter">Compartilhar no Twitter</a></li> | |
| 302 | + <li><a class="gp-share disabled icon icon-gplus">Compartilhar no Google Plus</a></li> | |
| 303 | + <li><a class="ws-share disabled icon icon-whatsapp">Compartilhar no WhatsApp</a></li> | |
| 304 | + </ul> | |
| 294 | 305 | </div> |
| 295 | 306 | </script> |
| 296 | 307 | ... | ... |
sass/_proposal_detail.scss
| ... | ... | @@ -433,6 +433,7 @@ |
| 433 | 433 | min-height: $container-height; |
| 434 | 434 | position: relative; |
| 435 | 435 | margin: 0 0 20px 10px; |
| 436 | + overflow: auto; | |
| 436 | 437 | .alert{ |
| 437 | 438 | width: 95%; |
| 438 | 439 | margin: 0 auto; |
| ... | ... | @@ -464,7 +465,7 @@ |
| 464 | 465 | color: white; |
| 465 | 466 | width: 60%; |
| 466 | 467 | border: none; |
| 467 | - margin: 0; | |
| 468 | + margin: 20px auto 0; | |
| 468 | 469 | -webkit-border-radius: 6px; |
| 469 | 470 | -moz-border-radius: 6px; |
| 470 | 471 | border-radius: 6px; |
| ... | ... | @@ -472,10 +473,10 @@ |
| 472 | 473 | text-decoration: none; |
| 473 | 474 | padding: 20px 0; |
| 474 | 475 | display: block; |
| 475 | - position: absolute; | |
| 476 | - bottom: 40px; | |
| 477 | - left: 50%; | |
| 478 | - margin-left: -30%; | |
| 476 | + // position: absolute; | |
| 477 | + // bottom: 40px; | |
| 478 | + // left: 50%; | |
| 479 | + // margin-left: -30%; | |
| 479 | 480 | |
| 480 | 481 | transition: background-color .2s; |
| 481 | 482 | |
| ... | ... | @@ -490,14 +491,14 @@ |
| 490 | 491 | color: #000; |
| 491 | 492 | font-weight: bold; |
| 492 | 493 | text-decoration: none; |
| 493 | - margin: 0; | |
| 494 | + margin: 15px 0 -35px; | |
| 494 | 495 | display: block; |
| 495 | 496 | width: 100%; |
| 496 | 497 | text-align: center; |
| 497 | - position: absolute; | |
| 498 | - bottom: 10px; | |
| 498 | + // position: absolute; | |
| 499 | + // bottom: 10px; | |
| 499 | 500 | left: 0; |
| 500 | - text-decoration: none; | |
| 501 | + text-decoration: underline; | |
| 501 | 502 | color: $color; |
| 502 | 503 | |
| 503 | 504 | &:hover, |
| ... | ... | @@ -506,6 +507,12 @@ |
| 506 | 507 | } |
| 507 | 508 | } |
| 508 | 509 | } |
| 510 | + .social { | |
| 511 | + span { | |
| 512 | + color: $color; | |
| 513 | + font-weight: 700; | |
| 514 | + } | |
| 515 | + } | |
| 509 | 516 | } |
| 510 | 517 | .experience-proposal-container{ |
| 511 | 518 | float: left; | ... | ... |
| ... | ... | @@ -0,0 +1,53 @@ |
| 1 | +.social { | |
| 2 | + margin-top: 45px; | |
| 3 | + position: relative; | |
| 4 | + z-index: 1; | |
| 5 | + span { | |
| 6 | + display: block; | |
| 7 | + margin-bottom: 10px; | |
| 8 | + } | |
| 9 | + ul { | |
| 10 | + list-style: none; | |
| 11 | + padding-left: 0; | |
| 12 | + } | |
| 13 | + li { | |
| 14 | + display: inline-block; | |
| 15 | + padding: 0 2px !important; | |
| 16 | + } | |
| 17 | + .icon { | |
| 18 | + background-color: transparent !important; | |
| 19 | + background-repeat: no-repeat; | |
| 20 | + background-position: 50% !important; | |
| 21 | + background-size: auto !important; | |
| 22 | + display: inline-block; | |
| 23 | + height: 36px; | |
| 24 | + min-width: 0 !important; | |
| 25 | + padding: 0 !important; | |
| 26 | + text-indent: -999999px; | |
| 27 | + width: 36px; | |
| 28 | + &-facebook { | |
| 29 | + background-image: url(images/icons/icon-facebook.png) !important; | |
| 30 | + &.disabled { | |
| 31 | + background-image: url(images/icons/icon-facebook-disabled.png) !important; | |
| 32 | + } | |
| 33 | + } | |
| 34 | + &-twitter { | |
| 35 | + background-image: url(images/icons/icon-twitter.png) !important; | |
| 36 | + &.disabled { | |
| 37 | + background-image: url(images/icons/icon-twitter-disabled.png) !important; | |
| 38 | + } | |
| 39 | + } | |
| 40 | + &-gplus { | |
| 41 | + background-image: url(images/icons/icon-gplus.png) !important; | |
| 42 | + &.disabled { | |
| 43 | + background-image: url(images/icons/icon-gplus-disabled.png) !important; | |
| 44 | + } | |
| 45 | + } | |
| 46 | + &-whatsapp { | |
| 47 | + background-image: url(images/icons/icon-whatsapp.png) !important; | |
| 48 | + &.disabled { | |
| 49 | + background-image: url(images/icons/icon-whatsapp-disabled.png) !important; | |
| 50 | + } | |
| 51 | + } | |
| 52 | + } | |
| 53 | +} | |
| 0 | 54 | \ No newline at end of file | ... | ... |
sass/style.scss