From 3cd25297916c56e049f9b38c8088d09965abca63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 6 Aug 2021 23:52:35 +0200 Subject: [PATCH] Fix huge header in participatory budgets The budget header was supposed to be huge, but only in the participatory budgets index or show actions. It was still huge, with plenty of empty space, when there was no budget, or in the "submit my ballot" and "select a heading" pages. --- .../stylesheets/budgets/ballot/show.scss | 8 ++ .../stylesheets/budgets/groups/show.scss | 7 ++ app/assets/stylesheets/budgets/index.scss | 8 ++ app/assets/stylesheets/mixins/budgets.scss | 2 +- app/assets/stylesheets/participation.scss | 4 + app/views/budgets/ballot/_ballot.html.erb | 26 ++-- app/views/budgets/ballot/show.html.erb | 4 +- app/views/budgets/groups/show.html.erb | 118 +++++++++--------- app/views/budgets/index.html.erb | 38 +++--- 9 files changed, 118 insertions(+), 97 deletions(-) create mode 100644 app/assets/stylesheets/budgets/ballot/show.scss create mode 100644 app/assets/stylesheets/budgets/groups/show.scss create mode 100644 app/assets/stylesheets/budgets/index.scss diff --git a/app/assets/stylesheets/budgets/ballot/show.scss b/app/assets/stylesheets/budgets/ballot/show.scss new file mode 100644 index 000000000..472070c81 --- /dev/null +++ b/app/assets/stylesheets/budgets/ballot/show.scss @@ -0,0 +1,8 @@ +.budget-ballot-show { + + > header { + @extend %budget-header; + @include grid-column-gutter; + padding-bottom: $line-height; + } +} diff --git a/app/assets/stylesheets/budgets/groups/show.scss b/app/assets/stylesheets/budgets/groups/show.scss new file mode 100644 index 000000000..f337ec2e2 --- /dev/null +++ b/app/assets/stylesheets/budgets/groups/show.scss @@ -0,0 +1,7 @@ +.budget-group-show { + + > header { + @extend %budget-header; + @include grid-column-gutter; + } +} diff --git a/app/assets/stylesheets/budgets/index.scss b/app/assets/stylesheets/budgets/index.scss new file mode 100644 index 000000000..29e76fc71 --- /dev/null +++ b/app/assets/stylesheets/budgets/index.scss @@ -0,0 +1,8 @@ +.budgets-index { + + > header { + @extend %budget-header; + @include grid-column-gutter; + margin-bottom: $line-height; + } +} diff --git a/app/assets/stylesheets/mixins/budgets.scss b/app/assets/stylesheets/mixins/budgets.scss index 32ab8c285..60de96b53 100644 --- a/app/assets/stylesheets/mixins/budgets.scss +++ b/app/assets/stylesheets/mixins/budgets.scss @@ -7,7 +7,7 @@ h1 { font-size: rem-calc(60); - padding: $line-height * 2 0 $line-height; + padding: $line-height 0; } h1, diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index 79358f267..e36986a15 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -1108,6 +1108,10 @@ background-size: cover; } + h1 { + padding-top: $line-height * 2; + } + .budget-title { font-weight: bold; text-transform: uppercase; diff --git a/app/views/budgets/ballot/_ballot.html.erb b/app/views/budgets/ballot/_ballot.html.erb index 13d9eac88..54d7a0358 100644 --- a/app/views/budgets/ballot/_ballot.html.erb +++ b/app/views/budgets/ballot/_ballot.html.erb @@ -1,20 +1,18 @@ -
-
- <%= back_link_to session[:ballot_referer] %> +
+ <%= back_link_to session[:ballot_referer] %> -

<%= t("budgets.ballots.show.title") %>

+

<%= t("budgets.ballots.show.title") %>

-
-

- <%= sanitize(t("budgets.ballots.show.voted", count: @ballot.investments.count)) %> -

-

- <%= t("budgets.ballots.show.voted_info") %> -

-

<%= t("budgets.ballots.show.voted_info_2") %>

-
+
+

+ <%= sanitize(t("budgets.ballots.show.voted", count: @ballot.investments.count)) %> +

+

+ <%= t("budgets.ballots.show.voted_info") %> +

+

<%= t("budgets.ballots.show.voted_info_2") %>

-
+
<% ballot_groups = @ballot.groups.sort_by_name %> diff --git a/app/views/budgets/ballot/show.html.erb b/app/views/budgets/ballot/show.html.erb index b4aaa2d46..0b9edf168 100644 --- a/app/views/budgets/ballot/show.html.erb +++ b/app/views/budgets/ballot/show.html.erb @@ -1,3 +1,3 @@ -
+
<%= render "budgets/ballot/ballot" %> -
+ diff --git a/app/views/budgets/groups/show.html.erb b/app/views/budgets/groups/show.html.erb index aa1786f6b..75b082dd4 100644 --- a/app/views/budgets/groups/show.html.erb +++ b/app/views/budgets/groups/show.html.erb @@ -2,72 +2,70 @@ <%= render "shared/canonical", href: budget_group_url(filter: @current_filter) %> <% end %> -
-
-
- <%= back_link_to budget_path(@budget) %> -

<%= t("budgets.groups.show.title") %>

-
-
-
+
+
+ <%= back_link_to budget_path(@budget) %> +

<%= t("budgets.groups.show.title") %>

+
-<% if @current_filter == "unfeasible" %> -
-
-

<%= t("budgets.groups.show.unfeasible_title") %>

+ <% if @current_filter == "unfeasible" %> +
+
+

<%= t("budgets.groups.show.unfeasible_title") %>

+
-
-<% elsif @current_filter == "unselected" %> -
-
-

<%= t("budgets.groups.show.unselected_title") %>

+ <% elsif @current_filter == "unselected" %> +
+
+

<%= t("budgets.groups.show.unselected_title") %>

+
-
-<% end %> + <% end %> -
-
-
- <% @group.headings.sort_by_name.each_slice(7) do |slice| %> -
- <% slice.each do |heading| %> - - <%= link_to heading.name, - budget_investments_path(heading_id: heading.id, - filter: @current_filter) %>
- - <% end %> +
+
+
+ <% @group.headings.sort_by_name.each_slice(7) do |slice| %> +
+ <% slice.each do |heading| %> + + <%= link_to heading.name, + budget_investments_path(heading_id: heading.id, + filter: @current_filter) %>
+ + <% end %> +
+ <% end %> +
+
+ +
+ <%= image_tag(image_path_for("map.jpg")) %> +
+
+ + <% if @budget.balloting_or_later? %> + <% unless @current_filter == "unfeasible" %> +
+
+ + <%= link_to t("budgets.groups.show.unfeasible"), + budget_group_path(@budget, @group, filter: "unfeasible") %> +
- <% end %> -
-
- -
- <%= image_tag(image_path_for("map.jpg")) %> -
-
- -<% if @budget.balloting_or_later? %> - <% unless @current_filter == "unfeasible" %> -
-
- - <%= link_to t("budgets.groups.show.unfeasible"), - budget_group_path(@budget, @group, filter: "unfeasible") %> -
-
- <% end %> + <% end %> - <% unless @current_filter == "unselected" %> -
-
- - <%= link_to t("budgets.groups.show.unselected"), - budget_group_path(@budget, @group, filter: "unselected") %> - + <% unless @current_filter == "unselected" %> +
+
+ + <%= link_to t("budgets.groups.show.unselected"), + budget_group_path(@budget, @group, filter: "unselected") %> + +
-
+ <% end %> <% end %> -<% end %> +
diff --git a/app/views/budgets/index.html.erb b/app/views/budgets/index.html.erb index 53f65ea9f..cad36ad83 100644 --- a/app/views/budgets/index.html.erb +++ b/app/views/budgets/index.html.erb @@ -6,28 +6,26 @@ <%= render "shared/canonical", href: budgets_url %> <% end %> -<% if @budget.present? %> - <%= render Budgets::BudgetComponent.new(@budget) %> +
+ <% if @budget.present? %> + <%= render Budgets::BudgetComponent.new(@budget) %> + + <% if @finished_budgets.present? %> + <%= render "finished", budgets: @finished_budgets %> + <% end %> + <% else %> +
+

<%= t("budgets.index.title") %>

+
- <% if @finished_budgets.present? %> - <%= render "finished", budgets: @finished_budgets %> - <% end %> -<% else %> -
-
-

<%= t("budgets.index.title") %>

+
+
+ <%= t("budgets.index.empty_budgets") %> +
-
+ <% end %> -
-
-
- <%= t("budgets.index.empty_budgets") %> -
-
-
-<% end %> - -<%= render Budgets::FooterComponent.new %> + <%= render Budgets::FooterComponent.new %> +