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

Augusto dos Anjos Almeida
2 parents 750c12a4 03dd39e7
Showing 4 changed files with 10 additions and 8 deletions Show diff stats
index.html
js/main.js
sass/_proposal_detail.scss
sass/style.scss
@@ -24,7 +24,7 @@
       </header>
       <div id="content">
-        <p>{{article.body}}</p>
+        {{{article.body}}}
       </div>
       <nav>
@@ -143,7 +143,7 @@
                   <div class="message"></div>
                   <div>
                     <div><label for="article_abstract">Descrição</label></div>
-                    <textarea id="article_abstract" class="countdown" name="article[abstract]" placeholder="Descrição" maxlength="200"></textarea>
+                    <textarea id="article_abstract" class="countdown" name="article[abstract]" placeholder="Descrição" maxlength="5000"></textarea>
                   </div>
                   <input id='content_type' name='content_type' value='ProposalsDiscussionPlugin::Story' type='hidden'>
                   <input type='submit' id='make-experience-button' class='make-experience-button'  name='make-experience-button' value='Enviar'>
@@ -173,6 +173,7 @@
               </div>
             </div>
           </div>
+          <div class="clearfix"></div>
         </div>
       {{/each}}
     </script>
@@ -196,6 +196,7 @@ function loadRandomProposal(topic_id, private_token) {
           $('.results-container').html(resultsTemplate(data));
           $('.results-container .loading').hide();
           $('.results-container .results-content').show();
+          $("html, body").animate({ scrollTop: $(document).height() }, "fast");
         });
         $('.experience-proposal-container').hide();
         $('.talk-proposal-container').hide();
@@ -302,6 +303,6 @@ function display_proposal_detail(){
   $('.talk-proposal-container').hide();
   $('.body').show();
+  $("html, body").animate({ scrollTop: 0 }, "fast");
   event.preventDefault();
-  
 }
@@ -379,8 +379,8 @@
       .experience-proposal-container{
         float: left;
         width: 50%;
-        height: $container-height;
-        min-height: $container-height;
+        // height: $container-height;
+        // min-height: $container-height;
         position: relative;
         text-align: center;
         .experience-proposal{
@@ -413,8 +413,8 @@
       .talk-proposal-container{
         width: 50%;
         float: left;
-        height: $container-height;
-        min-height: $container-height;
+        // height: $container-height;
+        // min-height: $container-height;
         position: relative;
         text-align: center;
         .talk-proposal {
@@ -40,7 +40,7 @@ h1 {
 #proposal-result {
   width: 90%;
-  margin: 0 auto;
+  margin: 0 auto 40px auto;
 }
 #content {
	@@ -40,7 +40,7 @@ h1 {		@@ -40,7 +40,7 @@ h1 {
40		40
41	#proposal-result {	41	#proposal-result {
42	width: 90%;	42	width: 90%;
43	- margin: 0 auto;	43	+ margin: 0 auto 40px auto;
44	}	44	}
45		45
46	#content {	46	#content {