diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss index 7078c6718..e2b32577e 100644 --- a/app/assets/stylesheets/debates.scss +++ b/app/assets/stylesheets/debates.scss @@ -679,6 +679,7 @@ .comment-user { margin-top: rem-calc(6); padding: rem-calc(6) 0; + overflow: hidden; @each $n in ("1", "2", "3","4", "5") { &.level-#{$n} { diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index cb7ff289f..a14d6f67f 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -925,6 +925,18 @@ form { margin-bottom: rem-calc(12); } + .note-marked { + @extend .note; + background: yellow; + display: inline-block; + + em { + background: white; + display: inline-block; + padding-left: rem-calc(6); + } + } + .ckeditor { min-height: rem-calc(312); } diff --git a/app/assets/stylesheets/proposals.scss b/app/assets/stylesheets/proposals.scss index 9cb27b0c3..ba737596f 100644 --- a/app/assets/stylesheets/proposals.scss +++ b/app/assets/stylesheets/proposals.scss @@ -634,6 +634,7 @@ .comment-user { margin-top: rem-calc(6); padding: rem-calc(6) 0; + overflow: hidden; @each $n in ("1", "2", "3","4", "5") { &.level-#{$n} { diff --git a/app/helpers/proposals_helper.rb b/app/helpers/proposals_helper.rb index 85edd6e07..42090a276 100644 --- a/app/helpers/proposals_helper.rb +++ b/app/helpers/proposals_helper.rb @@ -8,4 +8,14 @@ module ProposalsHelper end end + def supports_percentage(proposal) + percentage = (proposal.cached_votes_up.to_f * 100 / Proposal.votes_needed_for_success) + case percentage + when 0 then "0%" + when 0..(0.1) then "0.1%" + when (0.1)..100 then number_to_percentage(percentage, strip_insignificant_zeros: true, precision: 1) + else "100%" + end + end + end \ No newline at end of file diff --git a/app/views/comments/_errors.html.erb b/app/views/comments/_errors.html.erb index 777225f64..e70eed258 100644 --- a/app/views/comments/_errors.html.erb +++ b/app/views/comments/_errors.html.erb @@ -1,2 +1,3 @@ -