Skip to content

Aesthetic fixes #71

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
wants to merge 6 commits into
base: master
Choose a base branch
from
+15 −16
Open

Aesthetic fixes #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26ced0b
Updated saved scenario tailwinds so updated at is aligned, version ta…
louispt1 Feb 13, 2025
96aaf6f
Updating links for docs and removing bad translation from header span
louispt1 Feb 13, 2025
b8acc55
Ensure buttons are never hidden by the hovercards - enhancing the pre…
louispt1 Feb 13, 2025
0c1a378
Fixing fallout from rebase
louispt1 Mar 13, 2025
1da35c8
Reverting changes to minimise PR
louispt1 Mar 17, 2025
ff585b1
Merge branch 'master' into aesthetic-fixes
louispt1 Apr 22, 2025
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
8 changes: 4 additions & 4 deletions app/components/hovercard/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
>
<%= content %>

<%# static card %>
<%# should make text optional and setup the @path with turbo see: https://boringrails.com/articles/hovercards-stimulus/ %>
<%# static card %>
<%# should make text optional and setup the @path with turbo see: https://boringrails.com/articles/hovercards-stimulus/ %>
<div class="relative opacity-0 transition delay-500 duration-300" data-hovercard-target="card">
<div data-tooltip-arrow class="absolute top-0 <%= placement_class %> z-50 shadow-lg rounded-lg p-3 min-w-max bg-midnight-300 text-midnight-800">
<div class="flex flex-col space-x-3 w-48 text-sm">
<div data-tooltip-arrow class="absolute top-0 <%= placement_class %> z-10 shadow-lg rounded-lg p-3 min-w-max bg-midnight-300 text-midnight-800">
<div class="flex space-x-3 text-sm">
<%= @text %>
</div>
</div>
Expand Down
20 changes: 10 additions & 10 deletions app/components/saved_scenarios/row/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<%= link_to @path, data: { turbo_frame: "_top" }, class: "grid grid-cols-4 w-full transition mb-5 p-2 pr-4 rounded-md hover:bg-midnight-600" do %>
<div class="flex col-span-2">
<span class="bg-midnight-900 rounded-md h-8 w-8 mr-5 pt-1 mt-1 text-center text-midnight-200"><%= initials_for(first_owner) %></span>
<div class="flex flex-col">
<div>
<span><%= @saved_scenario.title %></span>
<span class="text-midnight-400"> #<%= @saved_scenario.version.tag %></span>
</div>
<div class="text-sm text-midnight-400">
<span><%= t("areas.#{@saved_scenario.area_code}") %></span>
<span><%= @saved_scenario.end_year %></span>
</div>
<span class="bg-midnight-900 rounded-md h-8 w-8 mr-5 pt-1 mt-1 text-center text-midnight-200 flex-none"><%= initials_for(first_owner) %></span>
<div class="flex flex-col">
<div>
<span><%= @saved_scenario.title %></span>
<span class="text-midnight-400"> #<%= @saved_scenario.version.tag %></span>
</div>
<div class="text-sm text-midnight-400">
<span><%= t("areas.#{@saved_scenario.area_code}") %></span>
<span><%= @saved_scenario.end_year %></span>
</div>
</div>
</div>
<span class="text-midnight-400 text-sm mt-3">
<%= t('last_updated', when: time_ago_in_words(@saved_scenario.updated_at)) %>
</span>
Expand Down
1 change: 0 additions & 1 deletion app/javascript/controllers/hovercard_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,3 @@ export default class extends Controller {
}
}
}

2 changes: 1 addition & 1 deletion app/views/saved_scenario_history/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% content_for(:title) { "#{@saved_scenario.title} <% #{t('meta.title')}" } %>
<% content_for(:title) { "#{@saved_scenario.title}" } %>
<% content_for :menu_title, @saved_scenario.localized_title(I18n.locale) %>
<%= render(partial: "saved_scenarios/block_right_menu", locals: { saved_scenario: @saved_scenario }) %>

Expand Down
Loading