From 7becda96edd307872d8370313a6e889edd28f0f0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 9 Aug 2017 18:33:09 +0200 Subject: [PATCH] fixes heading inside ul html issue --- app/assets/stylesheets/layout.scss | 4 +-- .../budgets/results/_results_table.html.erb | 4 +-- app/views/budgets/results/show.html.erb | 27 +++++++++---------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 7a5705f60..7361691ec 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -216,9 +216,8 @@ a { } .menu.vertical { - background: #fff; margin: $line-height 0; - padding: $line-height; + padding: $line-height 0; li { margin-bottom: $line-height; @@ -416,6 +415,7 @@ header { .menu { &.is-dropdown-submenu { + background: #fff; margin: 0; margin-top: rem-calc(-24); padding: 0; diff --git a/app/views/budgets/results/_results_table.html.erb b/app/views/budgets/results/_results_table.html.erb index e7cfadaff..7cc7a7d1a 100644 --- a/app/views/budgets/results/_results_table.html.erb +++ b/app/views/budgets/results/_results_table.html.erb @@ -2,9 +2,9 @@ style="<%= results_type != :compatible ? 'display: none' : '' %>" id="<%= results_type %>-container"> -

+

<%= title %> -

+ diff --git a/app/views/budgets/results/show.html.erb b/app/views/budgets/results/show.html.erb index a566b32d4..c276a4c6f 100644 --- a/app/views/budgets/results/show.html.erb +++ b/app/views/budgets/results/show.html.erb @@ -37,21 +37,20 @@
-
-
+ + <% @budget.headings.order('id ASC').each do |heading| %> +
  • + <%= link_to heading.name, + budget_results_path(@budget, heading_id: heading.to_param), + class: heading.to_param == @heading.to_param ? 'active' : '' %> +
  • + <% end %> +
    <%= link_to t("budgets.results.show_all_link"), "#", class: "js-toggle-link button hollow margin-bottom", data: {'toggle-selector' => '.js-discarded', 'toggle-text' => t("budgets.results.hide_discarded_link")} %>