consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify HTML class for budget header

Browse Source 
There were some issues using `.budget.expanded`, like a link having that
class which would force us to a `:not(.button)` selector or similar,
making the CSS more complex.
This commit is contained in:
Javi Martín
2021-03-09 20:04:16 +01:00
parent 909071c48b
commit 1d42fe54f0
7 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/layout.scss
View File

@@ -2155,7 +2155,7 @@ table {
} }
} }
+ .budget.expanded, + .budget-header,
+ .jumbo { + .jumbo {
margin-top: 0; margin-top: 0;
} }

5
app/assets/stylesheets/participation.scss
View File

@@ -1136,9 +1136,7 @@
// 06. Budgets // 06. Budgets
// ----------- // -----------
.expanded { .budget-header {
&.budget {
background: $budget; background: $budget;
margin-top: -$line-height; margin-top: -$line-height;
@@ -1182,7 +1180,6 @@
text-transform: uppercase; text-transform: uppercase;
} }
} }
}
} }
.jumbo-budget { .jumbo-budget {

2
app/views/budgets/ballot/_ballot.html.erb
View File

@@ -1,4 +1,4 @@
<div class="expanded budget no-margin-top padding"> <div class="budget-header no-margin-top padding">
<div class="row"> <div class="row">
<%= back_link_to @ballot_referer %> <%= back_link_to @ballot_referer %>

2
app/views/budgets/groups/show.html.erb
View File

@@ -2,7 +2,7 @@
<%= render "shared/canonical", href: budget_group_url(filter: @current_filter) %> <%= render "shared/canonical", href: budget_group_url(filter: @current_filter) %>
<% end %> <% end %>
<div class="expanded budget no-margin-top"> <div class="budget-header no-margin-top">
<div class="row"> <div class="row">
<div class="small-12 medium-9 column padding"> <div class="small-12 medium-9 column padding">
<%= back_link_to budgets_path %> <%= back_link_to budgets_path %>

4
app/views/budgets/index.html.erb
View File

@@ -7,7 +7,7 @@
<% end %> <% end %>
<% if current_budget.present? %> <% if current_budget.present? %>
<div id="budget_heading" class="expanded budget"> <div class="budget-header">
<div class="row" data-equalizer data-equalizer-on="medium"> <div class="row" data-equalizer data-equalizer-on="medium">
<div class="small-12 medium-9 column padding" data-equalizer-watch> <div class="small-12 medium-9 column padding" data-equalizer-watch>
@@ -121,7 +121,7 @@
<% end %> <% end %>
</div> </div>
<% else %> <% else %>
<div class="expanded budget no-margin-top margin-bottom"> <div class="budget-header no-margin-top margin-bottom">
<div class="row"> <div class="row">
<div class="small-12 medium-9 column padding"> <div class="small-12 medium-9 column padding">
<h1><%= t("budgets.index.title") %></h1> <h1><%= t("budgets.index.title") %></h1>

2
app/views/budgets/show.html.erb
View File

@@ -2,7 +2,7 @@
<%= render "shared/canonical", href: budget_url(@budget, filter: @current_filter) %> <%= render "shared/canonical", href: budget_url(@budget, filter: @current_filter) %>
<% end %> <% end %>
<div class="expanded budget no-margin-top"> <div class="budget-header no-margin-top">
<div class="row" data-equalizer data-equalizer-on="medium"> <div class="row" data-equalizer data-equalizer-on="medium">
<div class="small-12 medium-9 column padding" data-equalizer-watch> <div class="small-12 medium-9 column padding" data-equalizer-watch>
<%= back_link_to budgets_path %> <%= back_link_to budgets_path %>

4
spec/system/budgets/budgets_spec.rb
View File

@@ -38,7 +38,7 @@ describe "Budgets" do
visit budgets_path visit budgets_path
within("#budget_heading") do within(".budget-header") do
expect(page).to have_content(budget.name) expect(page).to have_content(budget.name)
expect(page).to have_content(budget.description) expect(page).to have_content(budget.description)
expect(page).to have_link("Help with participatory budgets") expect(page).to have_link("Help with participatory budgets")
@@ -51,7 +51,7 @@ describe "Budgets" do
budget.update!(phase: "publishing_prices") budget.update!(phase: "publishing_prices")
visit budgets_path visit budgets_path
within("#budget_heading") do within(".budget-header") do
expect(page).to have_content("Publishing projects prices") expect(page).to have_content("Publishing projects prices")
end end