diff --git a/app/assets/javascripts/foundation_extras.js.coffee b/app/assets/javascripts/foundation_extras.js.coffee index 720b62047..69602f4e8 100644 --- a/app/assets/javascripts/foundation_extras.js.coffee +++ b/app/assets/javascripts/foundation_extras.js.coffee @@ -3,3 +3,4 @@ App.FoundationExtras = initialize: -> $(document).foundation() $(window).trigger "load.zf.sticky" + $(window).trigger "resize" diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index ed1322275..a796ab5e8 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -446,6 +446,8 @@ header { background: $brand; border-bottom: 1px solid $border; margin-bottom: $line-height; + position: relative; + z-index: 10; .selected { border-bottom: 1px solid #fff; diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index a9b4aca69..74f943349 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -551,6 +551,15 @@ } } +.fixed-mobile-content { + + @include breakpoint(medium down) { + background: #fff; + margin-bottom: rem-calc(-1) !important; + padding-top: $line-height / 2; + } +} + // 04. List participation // ---------------------- diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index a9f65c763..d87a27865 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -62,30 +62,44 @@ <% end %> -
-<%= t('.draft') %>
+<%= t('.draft') %>
++ <%= t("proposals.proposal.successful") %> +
+ <% elsif @proposal.archived? %> ++ <%= t("proposals.proposal.supports", count: @proposal.total_votes) %> +
+<%= t("proposals.proposal.archived") %>
+- <%= t("proposals.proposal.successful") %> -
- <% elsif @proposal.archived? %> -- <%= t("proposals.proposal.supports", count: @proposal.total_votes) %> -
-<%= t("proposals.proposal.archived") %>
-