Download as
Browse Code »

Commit 1e3ba2552f5e6ecd98d9191b942b915c98ed5358

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

Merge branch 'rafael'

Showing 2 changed files with 60 additions and 36 deletions   Show diff stats
src/app/pages/programas/programa.html
  Diff comments   View file @1e3ba25
... ... @@ -275,51 +275,60 @@
275 275 </div>
276 276 </div>
277 277 </div>
  278 + <div class="row">
  279 + <div class="col-sm-12">
  280 + <button class="btn btn-block btn-close-response pull-right color-theme-common-fg" ng-click="pagePrograma.toggleResponseVisibility(proposal)">
  281 + FECHAR
  282 + <div class="button-right-icon icon-circle icon-small icon-circle-close-response color-theme-common-bg pull-right">
  283 + <span class="glyphicon glyphicon-remove icon-white" aria-hidden="true"></span>
  284 + </div>
  285 + </button>
  286 + </div>
  287 + </div>
278 288 </div>
279 289 </div>
280 290 </div>
281   - </div>
282   - <div class="response--context vertical-padding">
283   - <div class="container">
284   - <div class="row">
285   - <div class="col-sm-5">
286   - <div class="button--themed">
287   - <a class="btn btn-block" ui-sref="respostas">
288   - <span>Veja todas as propostas</span>
289   - <br/>
290   - <span>Respondidas pelo governo</span>
291   - <span class="glyphicon glyphicon-chevron-right"></span>
292   - </a>
  291 + <div class="response--context vertical-padding">
  292 + <div class="container">
  293 + <div class="row">
  294 + <div class="col-sm-5">
  295 + <div class="button--themed">
  296 + <a class="btn btn-block" ui-sref="respostas">
  297 + <span>Veja todas as propostas</span>
  298 + <br/>
  299 + <span>Respondidas pelo governo</span>
  300 + <span class="glyphicon glyphicon-chevron-right"></span>
  301 + </a>
  302 + </div>
293 303 </div>
294   - </div>
295   - <div class="col-sm-2"></div>
296   - <div class="col-sm-5">
297   - <div class="button--themed">
298   - <button type="button" class="btn btn-block" ng-click="pagePrograma.toggleContentVisibility()">
299   - <span>Informações sobre o programa</span>
300   - <br/>
301   - <span>"{{::pagePrograma.article.title}}"</span>
302   - <span class="glyphicon glyphicon-chevron-right"></span>
303   - </button>
  304 + <div class="col-sm-2"></div>
  305 + <div class="col-sm-5">
  306 + <div class="button--themed">
  307 + <button type="button" class="btn btn-block" ng-click="pagePrograma.toggleContentVisibility()">
  308 + <span>Informações sobre o programa</span>
  309 + <br/>
  310 + <span>"{{::pagePrograma.article.title}}"</span>
  311 + <span class="glyphicon glyphicon-chevron-right"></span>
  312 + </button>
  313 + </div>
304 314 </div>
305 315 </div>
306 316 </div>
307 317 </div>
308   - </div>
309   - </section>
310   - <section class="section-content" ng-style="{ display: pagePrograma.article.archived ? 'none': 'block' }">
311   - <div ng-if="pagePrograma.article.archived">
312   - <div class="container">
313   - <div class="row">
314   - <div class="col-sm-12 color-theme-fg">
315   - <h3 style="font-weight: bold;">Sobre o programa:</h3>
  318 + </section>
  319 + <section class="section-content" ng-style="{ display: pagePrograma.article.archived ? 'none': 'block' }">
  320 + <div ng-if="pagePrograma.article.archived">
  321 + <div class="container">
  322 + <div class="row">
  323 + <div class="col-sm-12 color-theme-fg">
  324 + <h3 style="font-weight: bold;">Sobre o programa:</h3>
  325 + </div>
316 326 </div>
317 327 </div>
318 328 </div>
319   - </div>
320   - <article class="program-content" ng-if="pagePrograma.article" ng-class="pagePrograma.article.slug">
321   - <div ng-bind-html="pagePrograma.article.bodyTrusted"></div>
322   - </article>
323   - </section>
  329 + <article class="program-content" ng-if="pagePrograma.article" ng-class="pagePrograma.article.slug">
  330 + <div ng-bind-html="pagePrograma.article.bodyTrusted"></div>
  331 + </article>
  332 + </section>
  333 + </div>
324 334 </div>
325   -</div>
... ...
src/app/pages/programas/programas.scss
  Diff comments   View file @1e3ba25
... ... @@ -299,6 +299,21 @@
299 299 border-radius: 100%;
300 300 }
301 301 }
  302 +
  303 + }
  304 +
  305 + .btn-close-response {
  306 + font-weight: bold;
  307 + margin-bottom: 20px;
  308 + width: 120px;
  309 + background-color: #e1e1e1;
  310 +
  311 + .icon-circle-close-response {
  312 + width: 20px!important;
  313 + height: 20px!important;
  314 + color: #e1e1e1;
  315 + font-size: 14px;
  316 + }
302 317 }
303 318  
304 319 .gov-response--link-item {
... ...