Download as
Browse Code »

Commit 6d07895da963ba9b3889162a9001f04dc1d5c141

Authored by Victor Costa
1 parent eb225cf6
Exists in master and in 11 other branches build, build2, capa, captcha, contigency_plan_recaptcha, jasmine-testing, make_harder_to_vote_twice, production, refactory-sass, session_cookie, staging

Fix program columns

Showing 2 changed files with 10 additions and 7 deletions   Show diff stats
js/handlebars-helpers.js
  Diff comments   View file @6d07895
@@ -2,7 +2,7 @@ Handlebars.registerHelper('link', function(text, url) { @@ -2,7 +2,7 @@ Handlebars.registerHelper('link', function(text, url) {
2 text = Handlebars.Utils.escapeExpression(text); 2 text = Handlebars.Utils.escapeExpression(text);
3 url = Handlebars.Utils.escapeExpression(url); 3 url = Handlebars.Utils.escapeExpression(url);
4 4
5 - var result = '<a id="#' + url + '" href="#proposal-item-' + url + '">' + text + '</a>'; 5 + var result = '<a id="#' + url + '" href="#proposal-item-' + url + '" class="proposal-link">' + text + '</a>';
6 6
7 return new Handlebars.SafeString(result); 7 return new Handlebars.SafeString(result);
8 }); 8 });
@@ -11,7 +11,7 @@ Handlebars.registerHelper(&#39;list_proposal&#39;, function(proposals, options) { @@ -11,7 +11,7 @@ Handlebars.registerHelper(&#39;list_proposal&#39;, function(proposals, options) {
11 11
12 var ret = ""; 12 var ret = "";
13 for(var i=0, j=proposals.length; i<j; i++) { 13 for(var i=0, j=proposals.length; i<j; i++) {
14 - element = "<li class='proposal-item'>"; 14 + element = "<li class='proposal-item'><div class='item'>";
15 element = element + "<ul class='category'>"; 15 element = element + "<ul class='category'>";
16 16
17 for(var x=0, y=proposals[i].categories.length; x<y; x++) { 17 for(var x=0, y=proposals[i].categories.length; x<y; x++) {
@@ -27,7 +27,7 @@ Handlebars.registerHelper(&#39;list_proposal&#39;, function(proposals, options) { @@ -27,7 +27,7 @@ Handlebars.registerHelper(&#39;list_proposal&#39;, function(proposals, options) {
27 element = element + '</ul>'; 27 element = element + '</ul>';
28 element = element + options.fn(proposals[i]); 28 element = element + options.fn(proposals[i]);
29 element = element + '<p>' + (proposals[i].abstract ? proposals[i].abstract : '') + '</p>'; 29 element = element + '<p>' + (proposals[i].abstract ? proposals[i].abstract : '') + '</p>';
30 - ret = ret + element + '</li>'; 30 + ret = ret + element + '</div></li>';
31 } 31 }
32 return ret; 32 return ret;
33 }); 33 });
sass/_proposal_categories.scss
  Diff comments   View file @6d07895
@@ -63,7 +63,11 @@ @@ -63,7 +63,11 @@
63 text-align: left; 63 text-align: left;
64 } 64 }
65 65
66 - .proposal-item > a { 66 + .proposal-item .item {
  67 + padding: 15px;
  68 + }
  69 +
  70 + .proposal-item .proposal-link {
67 border-top: 1px dotted #045312; 71 border-top: 1px dotted #045312;
68 padding-top: 10px; 72 padding-top: 10px;
69 display: block; 73 display: block;
@@ -77,12 +81,11 @@ @@ -77,12 +81,11 @@
77 } 81 }
78 82
79 .proposal-item { 83 .proposal-item {
80 - width: 46%;  
81 - height: 134px; 84 + width: 48%;
  85 + height: 166px;
82 margin: 0.5%; 86 margin: 0.5%;
83 background: #fff; 87 background: #fff;
84 border-radius: 5px; 88 border-radius: 5px;
85 - padding: 15px;  
86 vertical-align: top; 89 vertical-align: top;
87 border: 1px solid #03316f; 90 border: 1px solid #03316f;
88 } 91 }