Download as
Browse Code »

Commit 1f879050dd8b64b86c178c1ff91420749aca26aa

Authored by Leonardo Merlin
2 parents afeaf105 a2101729
Exists in master and in 6 other branches feature-captcha, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Merge branch 'fix-issues'

Showing 5 changed files with 25 additions and 16 deletions   Show diff stats
src/app/components/a11y-bar/a11y-bar.html
  Diff comments   View file @1f87905
1   -<div class="a11y-bar hidden-xs">
  1 +<div class="a11y-bar">
2 2 <div class="container">
3 3 <div class="row">
4 4 <div class="col-sm-6">
... ... @@ -25,7 +25,7 @@
25 25 </div>
26 26  
27 27 <div class="col-sm-6">
28   - <ul class="action-links list-inline list-unstyled pull-right">
  28 + <ul class="action-links list-inline list-unstyled">
29 29 <li>
30 30 <a id="siteaction-accessibility" class="color-theme-common-fg" href="http://portalpadrao.gov.br/acessibilidade" target="_blank" title="Acessibilidade" accesskey="5">Acessibilidade</a>
31 31 </li>
... ...
src/app/components/a11y-bar/a11y-bar.scss
  Diff comments   View file @1f87905
... ... @@ -14,5 +14,16 @@
14 14 .action-links {
15 15 text-transform: uppercase;
16 16 border-bottom: 1px dotted #262626;
  17 + float: right;
  18 +
  19 + @media screen and (max-width: $screen-sm) {
  20 + float: left;
  21 + // text-align: center;
  22 + }
  23 +
  24 + @media screen and (max-width: $screen-xs) {
  25 + float: none;
  26 + text-align: center;
  27 + }
17 28 }
18 29 }
... ...
src/app/components/navbar/navbar.html
  Diff comments   View file @1f87905
1 1 <div class="app-navbar">
2   - <nav id="navigation" class="header-navbar navbar navbar-static-top" role="navigation">
  2 + <nav id="navigation" class="header-navbar navbar" role="navigation">
3 3 <div class="navbar-header">
4 4 <div class="row">
5 5 <div class="row-height">
... ...
src/app/components/social-share/social-share.html
  Diff comments   View file @1f87905
... ... @@ -7,11 +7,11 @@
7 7 socialshare
8 8 socialshare-provider="facebook"
9 9 socialshare-type="feed"
10   - socialshare-via="vm.socialVia"
11   - socialshare-url="vm.socialUrl"
  10 + socialshare-via="{{vm.socialVia}}"
  11 + socialshare-url="{{vm.socialUrl}}"
12 12 socialshare-redirect-uri="https://dialoga.gov.br/"
13   - socialshare-media="vm.socialImage"
14   - socialshare-text="vm.socialText"
  13 + socialshare-media="{{vm.socialImage}}"
  14 + socialshare-text="{{vm.socialText}}"
15 15 title="Compartilhar no Facebook">
16 16 <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-facebook"><span class="icon icon-social-facebook"></span></span>
17 17 <span class="sr-only">Compartilhar no Facebook</span>
... ... @@ -21,8 +21,8 @@
21 21 <a href="#" role="button"
22 22 socialshare
23 23 socialshare-provider="twitter"
24   - socialshare-url="vm.socialUrl"
25   - socialshare-text="vm.socialText"
  24 + socialshare-url="{{vm.socialUrl}}"
  25 + socialshare-text="{{vm.socialText}}"
26 26 socialshare-hastags="dialogabrasil"
27 27 title="Compartilhar no Twitter">
28 28 <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-twitter"><span class="icon icon-social-twitter"></span></span>
... ... @@ -33,15 +33,15 @@
33 33 <a href="#" role="button"
34 34 socialshare
35 35 socialshare-provider="google+"
36   - socialshare-url="vm.socialUrl"
37   - socialshare-text="vm.socialText"
  36 + socialshare-url="{{vm.socialUrl}}"
  37 + socialshare-text="{{vm.socialText}}"
38 38 title="Compartilhar no Google Plus">
39 39 <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-googleplus"><span class="icon icon-social-googleplus"></span></span>
40 40 <span class="sr-only">Compartilhar no Google Plus</span>
41 41 </a>
42 42 </li>
43 43 <li>
44   - <a href="whatsapp://send?text=Aqui suas ideias viram propostas e você ajuda a melhorar as ações do governo http://dialoga.gov.br/" title="Compartilhar no WhatsApp">
  44 + <a href="whatsapp://send?text=Dialoga Brasil - {{vm.socialUrl}}" title="Compartilhar no WhatsApp">
45 45 <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-whatsapp"><span class="icon icon-social-whatsapp"></span></span>
46 46 <span class="sr-only">Compartilhar no WhatsApp</span>
47 47 </a>
... ...
src/app/index.scss
  Diff comments   View file @1f87905
... ... @@ -304,10 +304,8 @@ $common-color: #5E739E;
304 304 height: 33px !important;
305 305 }
306 306  
307   -@media only screen and (max-width: 959px){
308   - #barra-brasil ul.list {
309   - z-index: 9999;
310   - }
  307 +#barra-brasil ul.list {
  308 + z-index: 9999 !important;
311 309 }
312 310  
313 311 /**
... ...