Download as
Browse Code »

Commit 9653487770f7ad06885b401316aa79a6922fdcb2

Authored by Rafael Diego
2 parents c5bd7f8f dcf57b4d
Exists in master and in 4 other branches feature-captcha, production, staging, the_glorious_return_of_piwik

Merge branch 'mensagem-ranking'

Showing 2 changed files with 5 additions and 2 deletions   Show diff stats
src/app/components/proposal-list/proposal-list.html
  Diff comments   View file @9653487
@@ -7,7 +7,10 @@ @@ -7,7 +7,10 @@
7 Colocação 7 Colocação
8 <a tabindex="0" class="btn btn-link btn-question" role="button" data-toggle="popover" data-trigger="focus">?</a> 8 <a tabindex="0" class="btn btn-link btn-question" role="button" data-toggle="popover" data-trigger="focus">?</a>
9 </th> 9 </th>
10 - <th>{{vm.proposals.length}} PROPOSTAS</th> 10 + <th>
  11 + <span>{{vm.proposals.length}} PROPOSTAS</span>
  12 + <span class="pull-right">Posição atualizada a cada x minutos</span>
  13 + </th>
11 </tr> 14 </tr>
12 </thead> 15 </thead>
13 <tbody> 16 <tbody>
@@ -15,6 +18,7 @@ @@ -15,6 +18,7 @@
15 <td class="color-theme-fg"> 18 <td class="color-theme-fg">
16 <span ng-show="proposal.ranking_position" class="position">{{::proposal.ranking_position}}º</span> 19 <span ng-show="proposal.ranking_position" class="position">{{::proposal.ranking_position}}º</span>
17 <span ng-show="proposal.position" class="position">{{::proposal.position}}º</span> 20 <span ng-show="proposal.position" class="position">{{::proposal.position}}º</span>
  21 +
18 </td> 22 </td>
19 <td> 23 <td>
20 <div class="row"> 24 <div class="row">
src/app/pages/programas/programa.html
  Diff comments   View file @9653487
@@ -138,7 +138,6 @@ @@ -138,7 +138,6 @@
138 <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> 138 <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
139 </button> 139 </button>
140 </div> 140 </div>
141 - <span class="pull-right font-140">Posição atualizada a cada x minutos</span>  
142 <div class="proposal-extended-section-content"> 141 <div class="proposal-extended-section-content">
143 <proposal-list proposals="pagePrograma.proposalsTopFive" archived="pagePrograma.article.archived"></proposal-list> 142 <proposal-list proposals="pagePrograma.proposalsTopFive" archived="pagePrograma.article.archived"></proposal-list>
144 <div class="row text-center"> 143 <div class="row text-center">