Commit 7c60e448f0174b29c2c1bf4a90591d101c018de7
1 parent
1fad9fe4
Exists in
master
and in
11 other branches
Added ellipsis to proposal description
Showing
3 changed files
with
12 additions
and
3 deletions
Show diff stats
index.html
| @@ -6,6 +6,7 @@ | @@ -6,6 +6,7 @@ | ||
| 6 | <script src='js/jquery-2.1.3.min.js'></script> | 6 | <script src='js/jquery-2.1.3.min.js'></script> |
| 7 | <script src='js/handlebars-v3.0.1.js'></script> | 7 | <script src='js/handlebars-v3.0.1.js'></script> |
| 8 | <script src='js/handlebars-helpers.js'></script> | 8 | <script src='js/handlebars-helpers.js'></script> |
| 9 | + <script src='js/jquery.dotdotdot.min.js'></script> | ||
| 9 | <!-- | 10 | <!-- |
| 10 | <script src='js/layout.js'></script> | 11 | <script src='js/layout.js'></script> |
| 11 | --> | 12 | --> |
| @@ -41,7 +42,7 @@ | @@ -41,7 +42,7 @@ | ||
| 41 | <div class="name">{{name}}</div> | 42 | <div class="name">{{name}}</div> |
| 42 | <div class="description"></div> | 43 | <div class="description"></div> |
| 43 | </div> | 44 | </div> |
| 44 | - <ul> | 45 | + <ul class="proposal-list"> |
| 45 | {{#list_proposal ../article.children category=slug}} | 46 | {{#list_proposal ../article.children category=slug}} |
| 46 | {{#link title id}}{{/link}} | 47 | {{#link title id}}{{/link}} |
| 47 | {{/list_proposal}} | 48 | {{/list_proposal}} |
js/main.js
| @@ -69,6 +69,7 @@ $.getJSON(noosferoAPI) | @@ -69,6 +69,7 @@ $.getJSON(noosferoAPI) | ||
| 69 | //Display Topics or Discussion by category | 69 | //Display Topics or Discussion by category |
| 70 | $('.proposal-category-items').hide(); | 70 | $('.proposal-category-items').hide(); |
| 71 | $('#' + item).show(); | 71 | $('#' + item).show(); |
| 72 | + $(".proposal-item").dotdotdot(); | ||
| 72 | } | 73 | } |
| 73 | event.preventDefault(); | 74 | event.preventDefault(); |
| 74 | }); | 75 | }); |
sass/_proposal_categories.scss
| 1 | @import "utilities/variables"; | 1 | @import "utilities/variables"; |
| 2 | 2 | ||
| 3 | -#proposal-categories{ | 3 | +#proposal-categories { |
| 4 | background: #fff; | 4 | background: #fff; |
| 5 | clear: both; | 5 | clear: both; |
| 6 | margin: 0; | 6 | margin: 0; |
| @@ -77,7 +77,7 @@ | @@ -77,7 +77,7 @@ | ||
| 77 | 77 | ||
| 78 | .proposal-category-items .proposal-item { | 78 | .proposal-category-items .proposal-item { |
| 79 | width: 290px; | 79 | width: 290px; |
| 80 | - min-height: 134px; | 80 | + height: 134px; |
| 81 | margin: 10px; | 81 | margin: 10px; |
| 82 | background: #fff; | 82 | background: #fff; |
| 83 | border-radius: 5px; | 83 | border-radius: 5px; |
| @@ -85,6 +85,13 @@ | @@ -85,6 +85,13 @@ | ||
| 85 | vertical-align: top; | 85 | vertical-align: top; |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | + .proposal-category-items { | ||
| 89 | + text-align: left; | ||
| 90 | + .proposal-list { | ||
| 91 | + padding-left: 20px; | ||
| 92 | + } | ||
| 93 | + } | ||
| 94 | + | ||
| 88 | #proposal-categories-container { | 95 | #proposal-categories-container { |
| 89 | display: inline; | 96 | display: inline; |
| 90 | width: auto; | 97 | width: auto; |