Download as
Browse Code »

Commit a72e04ad6daa285eda71dc674774d59ddeff6f4c

Authored by Evandro Junior
2 parents 00baa11e 1ab2ee96
Exists in master and in 6 other branches build, build2, capa, contigency_plan_recaptcha, production, staging

Merge branch 'master' of https://gitlab.com/participa/proposal-app

Showing 2 changed files with 22 additions and 15 deletions   Show diff stats
index.html
  Diff comments   View file @a72e04a
... ... @@ -121,12 +121,14 @@
121 121  
122 122 <article id="proposal-categories">
123 123 <div id="proposal-categories-container">
  124 + <ul class="themes">
124 125 {{#each article.categories}}
125 126 <li id="proposal-category-{{slug}}" class="proposal-category" data-category="{{slug}}">
126 127 <a href="#/temas/{{slug}}/{{id}}" class="proposal-link hvr-float-shadow" data-target="proposal-item-{{id}}">{{name}}</a>
127 128 <div class="arrow-box" style="display: none"></div>
128 129 </li>
129 130 {{/each}}
  131 + </ul>
130 132 {{#each article.categories}}
131 133 <section id="proposal-item-{{id}}" class="proposal-category-items proposal-category-items-{{slug}} hide proposal-container clearfix {{slug}}" data-category="{{slug}}">
132 134 <div class="header">
... ... @@ -148,7 +150,7 @@
148 150 <div id="search-input-container">
149 151 <input placeholder="palavra chave" id="search-input" type="text" name="search" />
150 152 </div>
151   - <ul>
  153 + <ul class="proposal-list">
152 154 {{#list_proposal article.children}}
153 155 {{#link title id}}{{/link}}
154 156 {{/list_proposal}}
... ... @@ -211,11 +213,11 @@
211 213 </div>
212 214  
213 215 <div class="make-proposal-container">
214   - <div class="make-proposal">
215   - <div class="container-title">Faça Uma Proposta</div>
216   - <div class="subtitle">Qual a sua sugestão para melhorar este programa?</div>
217   - <div class="info">Esta consulta termina em julho de 2015. Até lá, todas as propostas serão lidas e as cinco mais pontuadas em cada programa receberão resposta oficial do governo.</div>
218   - <div class="send-proposal-button send-button"><a href="#"><span>Envie sua proposta</span></a></div>
  216 + <section class="make-proposal box box-propostas">
  217 + <div class="container-title box-title">Faça Uma Proposta</div>
  218 + <div class="subtitle box-subtitle">Qual a sua sugestão para melhorar este programa?</div>
  219 + <div class="info box-info">Esta consulta termina em julho de 2015. Até lá, todas as propostas serão lidas e as cinco mais pontuadas em cada programa receberão resposta oficial do governo.</div>
  220 + <div class="send-proposal-button send-button box-footer"><a href="#"><span>Envie sua proposta</span></a></div>
219 221 <div class="login-container hide">Login</div>
220 222 <form class="make-proposal-form save-article-form require-login hide" id="make-proposal-form-{{id}}" action="{{proposal_action ../article . }}" method="post">
221 223 <div class="message hide"></div>
... ... @@ -232,12 +234,12 @@
232 234 <a href="#">Faça nova proposta</a>
233 235 </div>
234 236 <div class="clearfix"></div>
235   - </div>
  237 + </section>
236 238 </div>
237 239  
238 240 <div class="support-proposal-container">
239   - <div class="support-proposal">
240   - <div class="container-title"> Apoie outras propostas</div>
  241 + <section class="support-proposal box box-propostas box-center box-apoie">
  242 + <div class="container-title box-title"> Apoie outras propostas</div>
241 243 <div class="alert alert-warning hide" role="alert">
242 244 <i class="fa fa-warning"></i><strong>Proposta não encontrada</strong>
243 245 </div>
... ... @@ -248,13 +250,13 @@
248 250 </div>
249 251 <div class="login-container hide">Login</div>
250 252 <div class="send-button"><a href="#"><span>Login</span></a></div>
251   - </div>
  253 + </section>
252 254 </div>
253 255  
254   - <div class="results-container hide"></div>
  256 + <div class="results-container hide box box-propostas"></div>
255 257  
256 258 <div class="talk-proposal-container">
257   - <div class="talk-proposal">
  259 + <section class="talk-proposal box box-propostas">
258 260 <div class="container-title">Bate-papo com os ministros</div>
259 261 <p>Confira as datas e horários:</p>
260 262 <ul class="calendar saude" data-slick='{"infinite": false, "rows": 2}'>
... ... @@ -285,7 +287,7 @@
285 287 <div class="date"><i class="fa fa-calendar"></i> 18/06/2015</div><div class="time"><i class="fa fa-clock-o"></i> 19:00</div>
286 288 </li>
287 289 </ul>
288   - </div>
  290 + </section>
289 291 </div>
290 292  
291 293 <div class="clearfix"></div>
... ... @@ -394,10 +396,10 @@
394 396 <label for="user_password_confirmation" class="label">Confirme a senha:</label>
395 397 <input id="user_password_confirmation" name="password_confirmation" type="password" placeholder="Confirme a senha">
396 398 </div>
397   - <div class="captcha">
  399 + <div class="captcha col-sm-12">
398 400 <div id="g-recaptcha"></div>
399 401 </div>
400   - <div class="actions">
  402 + <div class="actions col-sm-12">
401 403 <div class="row">
402 404 <div class="col-sm-4">
403 405 <a href="#" class="confirm-signup button">Confirmar</a>
... ...
sass/style.scss
  Diff comments   View file @a72e04a
... ... @@ -156,6 +156,11 @@ form {
156 156 }
157 157  
158 158 .captcha{
  159 + display: table;
  160 + margin: 20px 0;
  161 + position: relative;
  162 + width: 100%;
  163 + z-index: 1;
159 164 }
160 165  
161 166 @media (max-width: 480px) {
... ...