Download as
Browse Code »

Commit 11f8476c23e6371ef42aa2bc9c82f6e6073105c8

Authored by Augusto dos Anjos Almeida
2 parents 750c12a4 03dd39e7
Exists in master and in 10 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, staging

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

Showing 4 changed files with 10 additions and 8 deletions   Show diff stats
index.html
  Diff comments   View file @11f8476
... ... @@ -24,7 +24,7 @@
24 24 </header>
25 25  
26 26 <div id="content">
27   - <p>{{article.body}}</p>
  27 + {{{article.body}}}
28 28 </div>
29 29  
30 30 <nav>
... ... @@ -143,7 +143,7 @@
143 143 <div class="message"></div>
144 144 <div>
145 145 <div><label for="article_abstract">Descrição</label></div>
146   - <textarea id="article_abstract" class="countdown" name="article[abstract]" placeholder="Descrição" maxlength="200"></textarea>
  146 + <textarea id="article_abstract" class="countdown" name="article[abstract]" placeholder="Descrição" maxlength="5000"></textarea>
147 147 </div>
148 148 <input id='content_type' name='content_type' value='ProposalsDiscussionPlugin::Story' type='hidden'>
149 149 <input type='submit' id='make-experience-button' class='make-experience-button' name='make-experience-button' value='Enviar'>
... ... @@ -173,6 +173,7 @@
173 173 </div>
174 174 </div>
175 175 </div>
  176 + <div class="clearfix"></div>
176 177 </div>
177 178 {{/each}}
178 179 </script>
... ...
js/main.js
  Diff comments   View file @11f8476
... ... @@ -196,6 +196,7 @@ function loadRandomProposal(topic_id, private_token) {
196 196 $('.results-container').html(resultsTemplate(data));
197 197 $('.results-container .loading').hide();
198 198 $('.results-container .results-content').show();
  199 + $("html, body").animate({ scrollTop: $(document).height() }, "fast");
199 200 });
200 201 $('.experience-proposal-container').hide();
201 202 $('.talk-proposal-container').hide();
... ... @@ -302,6 +303,6 @@ function display_proposal_detail(){
302 303 $('.talk-proposal-container').hide();
303 304  
304 305 $('.body').show();
  306 + $("html, body").animate({ scrollTop: 0 }, "fast");
305 307 event.preventDefault();
306   -
307 308 }
... ...
sass/_proposal_detail.scss
  Diff comments   View file @11f8476
... ... @@ -379,8 +379,8 @@
379 379 .experience-proposal-container{
380 380 float: left;
381 381 width: 50%;
382   - height: $container-height;
383   - min-height: $container-height;
  382 + // height: $container-height;
  383 + // min-height: $container-height;
384 384 position: relative;
385 385 text-align: center;
386 386 .experience-proposal{
... ... @@ -413,8 +413,8 @@
413 413 .talk-proposal-container{
414 414 width: 50%;
415 415 float: left;
416   - height: $container-height;
417   - min-height: $container-height;
  416 + // height: $container-height;
  417 + // min-height: $container-height;
418 418 position: relative;
419 419 text-align: center;
420 420 .talk-proposal {
... ...
sass/style.scss
  Diff comments   View file @11f8476
... ... @@ -40,7 +40,7 @@ h1 {
40 40  
41 41 #proposal-result {
42 42 width: 90%;
43   - margin: 0 auto;
  43 + margin: 0 auto 40px auto;
44 44 }
45 45  
46 46 #content {
... ...