Download as
Browse Code »

Commit 72135857b03ab0792e2a0c58e78805ce5fbfe8a4

Authored by Leandro Santos
2 parents e352b9c3 c37d5578
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

fixing conflit

Showing 3 changed files with 14 additions and 3 deletions   Show diff stats
@@ -132,8 +132,15 @@ $.getJSON(noosferoAPI) @@ -132,8 +132,15 @@ $.getJSON(noosferoAPI)
132 $( "#search-input" ).autocomplete({ 132 $( "#search-input" ).autocomplete({
133 source: availableTags, 133 source: availableTags,
134 minLength: 3, 134 minLength: 3,
135 - select: function( event, ui ) { display_proposal(ui.item['value' ].replace('#','')); },  
136 - appendTo: '#search-input-container' 135 + select: function( event, ui ) {
  136 + updateHash(ui.item.value);
  137 + return false;
  138 + },
  139 + appendTo: '#search-input-container',
  140 + messages: {
  141 + noResults: '',
  142 + results: function() {}
  143 + }
137 }); 144 });
138 145
139 146
sass/_proposal_categories.scss
  Diff comments   View file @7213585
@@ -84,7 +84,7 @@ @@ -84,7 +84,7 @@
84 84
85 .proposal-item { 85 .proposal-item {
86 width: 48%; 86 width: 48%;
87 - height: 166px; 87 + min-height: 166px;
88 margin: 0.5%; 88 margin: 0.5%;
89 background: #fff; 89 background: #fff;
90 border-radius: 5px; 90 border-radius: 5px;
sass/style.scss
  Diff comments   View file @7213585
@@ -127,4 +127,8 @@ form { @@ -127,4 +127,8 @@ form {
127 color: #333; 127 color: #333;
128 background-color: #fff; 128 background-color: #fff;
129 border-color: #ccc; 129 border-color: #ccc;
  130 +}
  131 +
  132 +.ui-helper-hidden-accessible{
  133 + display: none;
130 } 134 }
131 \ No newline at end of file 135 \ No newline at end of file