Skip to content

fix various linter errors #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
coslajohn wants to merge 2 commits into
base: production
Choose a base branch
from
Open

fix various linter errors #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f161845
fix various linter errors
coslajohn Jan 9, 2026
14905f3
fix various linter errors
coslajohn Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 44 additions & 44 deletions app/assets/stylesheets/custom/tenants.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
--main-header: var(--brand);
--brand-contrast: #FFFFFF;
--main-header-contrast: #FFFFFF;
// Import shared styles
@import "cosla_shared";
@include shared-styles;
// Import shared styles
@import "cosla_shared";
@include shared-styles;
}

.tenant-flotta {
Expand All @@ -67,23 +67,23 @@
--main-header: var(--brand);
--brand-contrast: #FFFFFF;
--main-header-contrast: #FFFFFF;
// Import shared styles
@import "cosla_shared";
@include shared-styles;
// Import shared styles
@import "cosla_shared";
@include shared-styles;
}

.tenant-test {
--anchor-color: #008585;
--anchor-color-hover: #74a892;
--brand: #c7522a;
--brand-secondary: #e5c185;
--button-background-hover: #fbf2c4;
--button-background-hover-contrast: #{$black};
--footer: #e6e6e6;
--main-header: #74a892;
--top-links: var(--main-header);
--subnavigation: #c7522a;
}
--anchor-color: #008585;
--anchor-color-hover: #74a892;
--brand: #c7522a;
--brand-secondary: #e5c185;
--button-background-hover: #fbf2c4;
--button-background-hover-contrast: #{$black};
--footer: #e6e6e6;
--main-header: #74a892;
--top-links: var(--main-header);
--subnavigation: #c7522a;
}

.tenant-arb {
--brand: #10069F;
Expand All @@ -92,56 +92,56 @@
--footer: #023C19;
--footer-contrast: #FFFFFF;
--main-header-contrast: #FFFFFF;
--top-links: var(--brand-secondary);
--top-links: var(--brand-secondary);
--top-links-contrast: #FFFFFF;
@import "cosla_shared";
@include shared-styles;
@include shared-styles;
}

.tenant-inverc {
.tenant-inverc {
--brand: #36808c;
--brand-secondary: #75a5ad;
--brand-contrast: #FFFFFF;
--footer: #d7e5e7;
--main-header-contrast: #FFFFFF;
--top-links: #75a5ad ;
--top-links: #75a5ad;
--top-links-contrast: #FFFFFF;
@import "cosla_shared";
@include shared-styles;
@import "cosla_shared";
@include shared-styles;
}

.tenant-edi {
--brand: #6D3465;
--brand: #6D3465;
--brand-secondary: #492445;
--brand-contrast: #FFFFFF;
--footer: #D0E0F4;
--main-header-contrast: #FFFFFF;
--top-links: var(--brand-secondary);
--top-links: var(--brand-secondary);
--top-links-contrast: #FFFFFF;
@import "cosla_shared";
@include shared-styles;
@include shared-styles;
}

.tenant-aberdeen {
--main-header: #EF5D9E;
--brand: #45D3A1;
--brand-secondary: #6CBEEC;
--brand-contrast: #FF;
--footer: #eee6db;
--main-header-contrast: #FFFFFF;
--top-links: #eee6db;
--top-links-contrast: #FF;
--main-header: #EF5D9E;
--brand: #45D3A1;
--brand-secondary: #6CBEEC;
--brand-contrast: #FF;
--footer: #eee6db;
--main-header-contrast: #FFFFFF;
--top-links: #eee6db;
--top-links-contrast: #FF;
}

.tenant-sac {
--brand: #005293;
--brand: #005293;
--brand-secondary: #002F59;
--footer: #CEDBEA;
--brand-contrast: #FFFFFF;
--main-header-contrast: #FFFFFF;
--top-links: var(--brand-secondary);
--top-links-contrast: #FFFFFF;
@import "cosla_shared";
@import "cosla_shared";
@include shared-styles;
}

Expand All @@ -152,10 +152,10 @@
--footer: #023C19;
--footer-contrast: #FFFFFF;
--main-header-contrast: #FFFFFF;
--top-links: var(--brand-secondary);
--top-links: var(--brand-secondary);
--top-links-contrast: #FFFFFF;
@import "cosla_shared";
@include shared-styles;
@include shared-styles;
}

.tenant-highland {
Expand All @@ -169,9 +169,9 @@
--main-header: var(--brand);
--brand-contrast: #FFFFFF;
--main-header-contrast: #FFFFFF;
// Import shared styles
@import "cosla_shared";
@include shared-styles;
// Import shared styles
@import "cosla_shared";
@include shared-styles;
}

.tenant-hlc {
Expand All @@ -185,7 +185,7 @@
--main-header: var(--brand);
--brand-contrast: #FFFFFF;
--main-header-contrast: #FFFFFF;
// Import shared styles
@import "cosla_shared";
@include shared-styles;
// Import shared styles
@import "cosla_shared";
@include shared-styles;
}
4 changes: 2 additions & 2 deletions app/views/admin/postcodes/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
</div>

<div class="small-12 medium-6 large-4 column end">
<%= f.collection_select :geozone_id, Geozone.all, :id, :name, prompt:true, hint: t("admin.postcodes.postcode.geozone_help") %>
<%= f.collection_select :geozone_id, Geozone.all, :id, :name, prompt: true, hint: t("admin.postcodes.postcode.geozone_help") %>
</div>
</div>

<div class="small-12 column">
<%= f.submit(value: t("admin.postcodes.edit.form.submit_button"),
class: "button success") %>
class: "button success") %>
</div>
<% end %>
42 changes: 21 additions & 21 deletions app/views/admin/postcodes/ncsv_review.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,39 @@
<br>
<table>
<thead>
<tr>
<th><%= t("admin.postcodes.postcode.postcode") %></th>
<th><%= t("admin.postcodes.postcode.ward") %></th>
<th><%= t("admin.postcodes.postcode.geozone_id") %></th>
</tr>
<tr>
<th><%= t("admin.postcodes.postcode.postcode") %></th>
<th><%= t("admin.postcodes.postcode.ward") %></th>
<th><%= t("admin.postcodes.postcode.geozone_id") %></th>
</tr>
</thead>

<tbody>
<% if @rejected_entries.length == 0 %>
<% if @rejected_entries.length == 0 %>
<tr>
<td><%= t("admin.postcodes.index.no_record") %></td>
</tr>
<% else %>
<% @rejected_entries.each do |rejected_entry| %>
<tr>
<td><%= t("admin.postcodes.index.no_record") %></td>
<% rejected_entry.each do |key, value| %>
<td><%= value %></td>
<% end %>
</tr>
<% else %>
<% @rejected_entries.each do |rejected_entry| %>
<tr>
<% rejected_entry.each do |key, value| %>
<td><%= value %></td>
<% end %>
</tr>
<% end %>
<% end %>
<% end %>
</tbody>
</table>

<h4>Created records (<%= @accepted_entries.length %>)</h4>

<table>
<thead>
<tr>
<th><%= t("admin.postcodes.postcode.postcode") %></th>
<th><%= t("admin.postcodes.postcode.ward") %></th>
<th><%= t("admin.postcodes.postcode.geozone_id") %></th>
</tr>
<tr>
<th><%= t("admin.postcodes.postcode.postcode") %></th>
<th><%= t("admin.postcodes.postcode.ward") %></th>
<th><%= t("admin.postcodes.postcode.geozone_id") %></th>
</tr>
</thead>

<tbody>
Expand All @@ -61,4 +61,4 @@
<% end %>
<% end %>
</tbody>
</table>
</table>
104 changes: 52 additions & 52 deletions app/views/budgets/results/_results_table.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,76 +6,76 @@

<table id="budget-investments-<%= results_type %>" class="table-for-mobile">
<thead>
<tr>
<th scope="col">
<%= t("budgets.results.investment_title") %>
</th>
<tr>
<th scope="col">
<%= t("budgets.results.investment_title") %>
</th>
<th scope="col" class="text-center">
<%= t("budgets.results.ballot_lines_count") %>
</th>
<% if @budget.show_money? %>
<th scope="col" class="text-center">
<%= t("budgets.results.ballot_lines_count") %>
<%= t("budgets.results.price") %>
</th>
<% if @budget.show_money? %>
<th scope="col" class="text-center">
<%= t("budgets.results.price") %>
<% if results_type == :compatible %>
<th scope="col" class="text-right">
<small><%= t("budgets.results.amount_available") %></small><br>
<%= @budget.formatted_amount(heading_price) %><br>
</th>
<% if results_type == :compatible %>
<th scope="col" class="text-right">
<small><%= t("budgets.results.amount_available") %></small><br>
<%= @budget.formatted_amount(heading_price) %><br>
</th>
<% end %>
<% end %>
</tr>
<% end %>
</tr>
</thead>

<tbody>
<% amount_available = heading_price %>
<% investments.each do |investment| %>
<tr id="<%= dom_id(investment) %>"
class="budget-investments <%= investment.winner? ? "success" : "js-discarded" %>"
style="<%= investment.winner? ? "" : "display: none" %>">
<td>
<% if investment.winner? %>
<% amount_available = heading_price %>
<% investments.each do |investment| %>
<tr id="<%= dom_id(investment) %>"
class="budget-investments <%= investment.winner? ? "success" : "js-discarded" %>"
style="<%= investment.winner? ? "" : "display: none" %>">
<td>
<% if investment.winner? %>
<span class="icon-check" style="color: <%= @budget.part_fund && investment.winner && amount_available - investment.price < 0 ? 'orange' : '' %>">
<span class="show-for-sr">
<%= t("budgets.results.accepted") %>
</span>
</span>
<% else %>
<% else %>
<span class="icon-x delete">
<span class="show-for-sr">
<%= t("budgets.results.discarded") %>
</span>
</span>
<% end %>
<%= link_to investment.title, budget_investment_path(@budget, investment) %>
</td>
<td class="text-center">
<%= investment.ballot_lines_count %>
</td>
<% if @budget.show_money? %>
<td class="text-center" >
<% if @budget.part_fund && investment.winner && amount_available - investment.price < 0 %>
<%= @budget.formatted_amount(investment.price) %>(Part Fund)
<% else %>
<%= @budget.formatted_amount(investment.price) %>
<% end %>
</td>
<% if results_type == :compatible %>
<% if @budget.part_fund && investment.winner && amount_available - investment.price < 0 %>
<% amount_after_investment = amount_available - investment.price %>
<td class="small text-right" title="<%= @budget.formatted_amount(amount_available) %> - <%= @budget.formatted_amount(investment.price) %>">
<%= @budget.formatted_amount(amount_after_investment) %>
</td>
<% else %>
<td class="small text-right" title="<%= @budget.formatted_amount(amount_available) %> - <%= @budget.formatted_amount(investment.price) %> ">
<%= @budget.formatted_amount(amount_available - investment.price) %>
<% amount_available -= investment.price if investment.winner? %>
</td>
<% end %>
<% end %>
<%= link_to investment.title, budget_investment_path(@budget, investment) %>
</td>
<td class="text-center">
<%= investment.ballot_lines_count %>
</td>
<% if @budget.show_money? %>
<td class="text-center">
<% if @budget.part_fund && investment.winner && amount_available - investment.price < 0 %>
<%= @budget.formatted_amount(investment.price) %>(Part Fund)
<% else %>
<%= @budget.formatted_amount(investment.price) %>
<% end %>
<% end %>
</tr>
<% end %>
</td>
<% if results_type == :compatible %>
<% if @budget.part_fund && investment.winner && amount_available - investment.price < 0 %>
<% amount_after_investment = amount_available - investment.price %>
<td class="small text-right" title="<%= @budget.formatted_amount(amount_available) %> - <%= @budget.formatted_amount(investment.price) %>">
<%= @budget.formatted_amount(amount_after_investment) %>
</td>
<% else %>
<td class="small text-right" title="<%= @budget.formatted_amount(amount_available) %> - <%= @budget.formatted_amount(investment.price) %> ">
<%= @budget.formatted_amount(amount_available - investment.price) %>
<% amount_available -= investment.price if investment.winner? %>
</td>
<% end %>
<% end %>
<% end %>
</tr>
<% end %>
</tbody>
</table>
</div>
Loading
Loading