diff --git a/app/assets/fonts/icons.eot b/app/assets/fonts/icons.eot index 5fe0c1d3d..f1420b532 100644 Binary files a/app/assets/fonts/icons.eot and b/app/assets/fonts/icons.eot differ diff --git a/app/assets/fonts/icons.svg b/app/assets/fonts/icons.svg index 51044c3e2..a7f352c4f 100644 --- a/app/assets/fonts/icons.svg +++ b/app/assets/fonts/icons.svg @@ -49,4 +49,9 @@ + + + + + diff --git a/app/assets/fonts/icons.ttf b/app/assets/fonts/icons.ttf index b0b156581..16401c79b 100644 Binary files a/app/assets/fonts/icons.ttf and b/app/assets/fonts/icons.ttf differ diff --git a/app/assets/fonts/icons.woff b/app/assets/fonts/icons.woff index edcc9bc61..83689755d 100644 Binary files a/app/assets/fonts/icons.woff and b/app/assets/fonts/icons.woff differ diff --git a/app/assets/javascripts/comments.js.coffee b/app/assets/javascripts/comments.js.coffee index dd8006b9b..876a89b20 100644 --- a/app/assets/javascripts/comments.js.coffee +++ b/app/assets/javascripts/comments.js.coffee @@ -30,11 +30,11 @@ App.Comments = $("#js-comment-form-#{id}").toggle() toggle_arrow: (id) -> - arrow = "i##{id}_arrow" - if $(arrow).hasClass("icon-angle-right") - $(arrow).removeClass("icon-angle-right").addClass("icon-angle-down") + arrow = "span##{id}_arrow" + if $(arrow).hasClass("icon-arrow-right") + $(arrow).removeClass("icon-arrow-right").addClass("icon-arrow-down") else - $(arrow).removeClass("icon-angle-down").addClass("icon-angle-right") + $(arrow).removeClass("icon-arrow-down").addClass("icon-arrow-right") initialize: -> $('body .js-add-comment-link').each -> diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss index 2c06f745a..a92a3b61a 100644 --- a/app/assets/stylesheets/icons.scss +++ b/app/assets/stylesheets/icons.scss @@ -163,3 +163,12 @@ .icon-whatsapp:before { content: "\50"; } +.icon-arrow-down:before { + content: "\52"; +} +.icon-arrow-left:before { + content: "\54"; +} +.icon-arrow-right:before { + content: "\55"; +} diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 75f8cf741..24a433285 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -161,7 +161,7 @@ a { margin-top: rem-calc(-24); } -.padding { +.padding { padding-bottom: $line-height; padding-top: $line-height; } @@ -533,6 +533,7 @@ footer { .footer { background: $footer-bg; border-top: 6px solid $brand; + margin-top: $line-height*2; padding-top: $line-height; } @@ -1586,6 +1587,13 @@ table { margin: rem-calc(6) 0; padding: rem-calc(6); + [class^="icon-arrow"] { + font-size: rem-calc(18); + left: -20px; + position: absolute; + top: 0; + } + .divider { color: $text-light; } diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index d897a2a28..8ede20c2b 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -541,16 +541,27 @@ color: $border; } +.investment-project-show p { + word-break: break-word; +} + // 04. List participation // - - - - - - - - - - - - - - - - - - - - - - - - - -.debates-list, .proposals-list { +.debates-list, .proposals-list, .investment-projects-list { @media (min-width: $small-breakpoint) { margin-bottom: rem-calc(48); } } +.investment-projects-list { + + @media (min-width: $small-breakpoint) { + min-height: $line-height*15; + } +} + .debate, .proposal, .investment-project { margin-bottom: 0; margin-top: 0; @@ -820,7 +831,7 @@ border-left: 1px solid $border; margin: 0 rem-calc(-12); min-height: rem-calc(180); - padding-top: $line-height*2; + padding-top: $line-height*1.5; &:after { content: none; @@ -860,6 +871,15 @@ .no-supports-allowed p, .no-supports-allowed a { color: white; } + + .share-supported { + + .social-share-button-twitter, + .social-share-button-facebook, + .social-share-button-google_plus { + color: $budget; + } + } } } diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index 2561c9e4d..4c0830234 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -73,8 +73,8 @@ <% if comment.children.size > 0 %> - <%= link_to "", class: "js-toggle-children", data: {'id': "#{dom_id(comment)}"} do %> - <%= t("comments.comment.responses", count: comment.children.size) %> + <%= link_to "", class: "js-toggle-children relative", data: {'id': "#{dom_id(comment)}"} do %> + <%= t("comments.comment.responses", count: comment.children.size) %> <% end %> <% else %> <%= t("comments.comment.responses", count: 0) %>