Download as
Browse Code »

Commit a1a5950b9ae7d5c37dacb575f60c6078f35f7e85

Authored by Leonardo Merlin
1 parent 0b9646f7
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

Small fixes (at PR)

Showing 6 changed files with 39 additions and 50 deletions   Show diff stats
src/app/components/event-list/event-list.html
  Diff comments   View file @a1a5950
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 </div> 13 </div>
14 <div class="col-sm-6 text-right"> 14 <div class="col-sm-6 text-right">
15 <h2 class="event-bar--trigger-toggle text-right"> 15 <h2 class="event-bar--trigger-toggle text-right">
16 - <span><b>18</b> bate papos <b>agendados</b></span> 16 + <span><b>{{vm.events.length}}</b> bate papos <b>agendados</b></span>
17 <span ng-if="vm.isCollapsed" class="glyphicon glyphicon-menu-down" aria-hidden="true"></span> 17 <span ng-if="vm.isCollapsed" class="glyphicon glyphicon-menu-down" aria-hidden="true"></span>
18 <span ng-if="!vm.isCollapsed" class="glyphicon glyphicon-menu-up" aria-hidden="true"></span> 18 <span ng-if="!vm.isCollapsed" class="glyphicon glyphicon-menu-up" aria-hidden="true"></span>
19 </h2> 19 </h2>
src/app/components/navbar/navbar.html
  Diff comments   View file @a1a5950
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 </button> 9 </button>
10 <a class="navbar-brand" ui-sref="inicio"> 10 <a class="navbar-brand" ui-sref="inicio">
11 <img src="/assets/images/logo.png" alt="Dialoga Brasil | O país fica melhor quando você participa" /> 11 <img src="/assets/images/logo.png" alt="Dialoga Brasil | O país fica melhor quando você participa" />
12 - <!-- <span class="glyphicon glyphicon-home"></span> Início -->  
13 </a> 12 </a>
14 </div> 13 </div>
15 14
@@ -24,53 +23,40 @@ @@ -24,53 +23,40 @@
24 <li class="dropdown"> 23 <li class="dropdown">
25 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Compartilhar <span aria-hidden="true" class="icon icon-social-share-small"></span></a> 24 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Compartilhar <span aria-hidden="true" class="icon icon-social-share-small"></span></a>
26 <social-share class="dropdown-menu dropdown-menu-right" arrow-class="social-share--arrow"></social-share> 25 <social-share class="dropdown-menu dropdown-menu-right" arrow-class="social-share--arrow"></social-share>
27 - <!-- <ul class="dropdown-menu dropdown-menu-right dropdown-menu-social">  
28 - <li>  
29 - <a socialshare  
30 - socialshare-provider="facebook"  
31 - socialshare-url="http://dialoga.gov.br"  
32 - socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."  
33 - title="Compartilhar no Facebook">  
34 - <span class="icon-circle icon-small icon-circle-social-facebook"><span class="icon icon-social-facebook"></span></span>  
35 - <span class="sr-only">Compartilhar no Facebook</span>  
36 - </a>  
37 - </li>  
38 - <li>  
39 - <a socialshare  
40 - socialshare-provider="twitter"  
41 - socialshare-url="http://dialoga.gov.br"  
42 - socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."  
43 - socialshare-hastags="dialogabrasil"  
44 - title="Compartilhar no Twitter">  
45 - <span class="icon-circle icon-small icon-circle-social-twitter"><span class="icon icon-social-twitter"></span></span>  
46 - <span class="sr-only">Compartilhar no Twitter</span>  
47 - </a>  
48 - </li>  
49 - <li>  
50 - <a socialshare  
51 - socialshare-provider="gplus"  
52 - socialshare-url="http://dialoga.gov.br"  
53 - socialshare-text="Conheça o Dialoga Brasil. Dialoga Brasil | O País fica melhor quando VOCÊ PARTICIPA."  
54 - title="Compartilhar no Google Plus">  
55 - <span class="icon-circle icon-small icon-circle-social-googleplus"><span class="icon icon-social-googleplus"></span></span>  
56 - <span class="sr-only">Compartilhar no Google Plus</span>  
57 - </a>  
58 - </li>  
59 - <li>  
60 - <a href="mailto:contato@dialoga.gov.br?subject=Conheça o Dialoga Brasil" title="Enviar por email">  
61 - <span class="icon-circle icon-small icon-circle-social-whatsapp"><span class="icon icon-social-whatsapp"></span></span>  
62 - <span class="sr-only">Enviar por email</span>  
63 - </a>  
64 - </li>  
65 - </ul> -->  
66 </li> 26 </li>
67 </ul> 27 </ul>
68 </div> 28 </div>
69 </nav> 29 </nav>
  30 +
70 <div id="dialoga-nas-redes"> 31 <div id="dialoga-nas-redes">
71 <div class="text text-right"> 32 <div class="text text-right">
72 - <p>DIALOGA<br>NAS REDES</p> 33 + <p>DIALOGA<br><b>NAS REDES</b></p>
73 </div> 34 </div>
74 - <social-share></social-share> 35 + <ul class="social-share list-inline">
  36 + <li>
  37 + <a href="https://www.facebook.com/DialogaBrasil" target="_blank">
  38 + <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-facebook"><span class="icon icon-social-facebook"></span></span>
  39 + <span class="sr-only">Visitar perfil no Facebook</span>
  40 + </a>
  41 + </li>
  42 + <li>
  43 + <a href="https://twitter.com/dialogabrasil" target="_blank">
  44 + <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-twitter"><span class="icon icon-social-twitter"></span></span>
  45 + <span class="sr-only">Visitar perfil no Twitter</span>
  46 + </a>
  47 + </li>
  48 + <li>
  49 + <a href="https://www.youtube.com/channel/UCtjaJwOWwGu2legqFVAzhIA" target="_blank">
  50 + <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-youtube"><span class="icon icon-social-youtube"></span></span>
  51 + <span class="sr-only">Visitar canal no Youtube</span>
  52 + </a>
  53 + </li>
  54 + <li>
  55 + <a href="https://www.flickr.com/photos/dialogabrasil" target="_blank">
  56 + <span aria-hidden="true" class="icon-circle icon-small icon-circle-social-flickr"><span class="icon icon-social-flickr"></span></span>
  57 + <span class="sr-only">Visitar canal no Flickr</span>
  58 + </a>
  59 + </li>
  60 + </ul>
75 </div> 61 </div>
76 </div> 62 </div>
src/app/components/proposal-stats/proposal-stats.html
  Diff comments   View file @a1a5950
1 <div class="proposal-stats"> 1 <div class="proposal-stats">
2 <ul class="list-inline"> 2 <ul class="list-inline">
3 - <li class="proposal-stats-views">  
4 - <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>  
5 - <span>{{proposal.hits}}</span> 3 + <li class="proposal-stats-up">
  4 + <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
  5 + <span>{{proposal.votes_for}}</span>
6 </li> 6 </li>
7 <li class="proposal-stats-down"> 7 <li class="proposal-stats-down">
8 <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> 8 <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
9 <span>{{proposal.votes_against}}</span> 9 <span>{{proposal.votes_against}}</span>
10 </li> 10 </li>
11 - <li class="proposal-stats-up">  
12 - <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>  
13 - <span>{{proposal.votes_for}}</span> 11 + <li class="proposal-stats-views">
  12 + <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
  13 + <span>{{proposal.hits}}</span>
14 </li> 14 </li>
15 </ul> 15 </ul>
16 </div> 16 </div>
src/app/components/social-share/social-share.scss
  Diff comments   View file @a1a5950
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
16 margin: 0; 16 margin: 0;
17 width: 45px; 17 width: 45px;
18 text-align: center; 18 text-align: center;
  19 + transform: scale(0.9);
19 20
20 & > a { 21 & > a {
21 padding: 0; 22 padding: 0;
src/app/pages/auth/signin.html
  Diff comments   View file @a1a5950
@@ -21,6 +21,8 @@ @@ -21,6 +21,8 @@
21 <div class="row"> 21 <div class="row">
22 <div class="col-sm-4"></div> 22 <div class="col-sm-4"></div>
23 <div class="col-sm-8 text-center-sm"> 23 <div class="col-sm-8 text-center-sm">
  24 + <!-- <div ng-if="pageSignin.redirect > 0">
  25 + </div> -->
24 <div ng-if="pageSignin.countdown > 0"> 26 <div ng-if="pageSignin.countdown > 0">
25 <p> 27 <p>
26 Você será redirecionado em menos de <b>{{pageSignin.countdown}} segundos</b>... 28 Você será redirecionado em menos de <b>{{pageSignin.countdown}} segundos</b>...
src/app/pages/programas/programas.html
  Diff comments   View file @a1a5950
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <div class="container"> 11 <div class="container">
12 <div class="row"> 12 <div class="row">
13 <div class="col-sm-12"> 13 <div class="col-sm-12">
14 - <h1>Programas de governo</h1> 14 + <h1>Programas</h1>
15 </div> 15 </div>
16 </div> 16 </div>
17 </div> 17 </div>