Download as
Browse Code »

Commit 64e8677fb32f05d58850782e1054a461c6fca12d

Authored by Leandro Santos
2 parents 4ec6b09c 562baf0f
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 gitlab.com:participa/proposal-app

Showing 2 changed files with 22 additions and 1 deletions   Show diff stats
@@ -103,8 +103,18 @@ $.getJSON(noosferoAPI) @@ -103,8 +103,18 @@ $.getJSON(noosferoAPI)
103 $( '.proposal-category .go-back' ).click(function(event){ 103 $( '.proposal-category .go-back' ).click(function(event){
104 event.preventDefault(); 104 event.preventDefault();
105 105
  106 + var oldHash = window.location.hash;
  107 + var regexSubpages = /sobre-o-programa$/;
  108 + var isSubpage = regexSubpages.exec(oldHash) !== null;
  109 + var newHash = '#/temas'; // default page
  110 +
  111 + if(isSubpage){
  112 + // return to proposal page
  113 + newHash = oldHash.split('/sobre-o-programa')[0];
  114 + }
  115 +
106 // Update URL and Navigate 116 // Update URL and Navigate
107 - updateHash('#/temas'); 117 + updateHash(newHash);
108 }); 118 });
109 119
110 $( '.send-button a' ).click(function(event){ 120 $( '.send-button a' ).click(function(event){
sass/_proposal_detail.scss
  Diff comments   View file @64e8677
@@ -55,6 +55,8 @@ @@ -55,6 +55,8 @@
55 bottom: 140px; 55 bottom: 140px;
56 font-size: 14px; 56 font-size: 14px;
57 text-align: center; 57 text-align: center;
  58 + word-break: break-word;
  59 + word-wrap: break-word;
58 } 60 }
59 61
60 .show_body { 62 .show_body {
@@ -669,6 +671,15 @@ @@ -669,6 +671,15 @@
669 margin: 0 !important; 671 margin: 0 !important;
670 min-height: 0 !important; 672 min-height: 0 !important;
671 } 673 }
  674 + .send-experience-button {
  675 + text-align: center !important;
  676 + a {
  677 + position: relative !important;
  678 + left: inherit !important;
  679 + margin: auto !important;
  680 + bottom: inherit !important;
  681 + }
  682 + }
672 } 683 }
673 .talk-proposal-container { 684 .talk-proposal-container {
674 height: auto !important; 685 height: auto !important;