diff --git a/app/components/DS/dialog_controller.js b/app/components/DS/dialog_controller.js index 5391d42ae..2092700c6 100644 --- a/app/components/DS/dialog_controller.js +++ b/app/components/DS/dialog_controller.js @@ -27,9 +27,18 @@ export default class extends Controller { close() { this.element.close(); + this.#clearParentModalFrame(); if (this.reloadOnCloseValue) { Turbo.visit(window.location.href); } } + + // When the dialog lives inside a top-level , + // emptying the frame on close stops Turbo's page cache from snapshotting + // an open dialog and reopening it on browser back. + #clearParentModalFrame() { + const frame = this.element.closest('turbo-frame[id="modal"]'); + if (frame) frame.innerHTML = ""; + } } diff --git a/app/components/savings/goal_card_component.rb b/app/components/savings/goal_card_component.rb index 5799cdd14..0abe159f3 100644 --- a/app/components/savings/goal_card_component.rb +++ b/app/components/savings/goal_card_component.rb @@ -16,8 +16,8 @@ class Savings::GoalCardComponent < ApplicationComponent case goal.status when :reached then "var(--color-green-600)" when :behind then "var(--color-yellow-600)" - when :on_track then "var(--text-primary)" - else "var(--text-subdued)" + when :on_track then "var(--color-green-500)" + else "var(--color-gray-400)" end end diff --git a/app/javascript/controllers/savings_goal_projection_chart_controller.js b/app/javascript/controllers/savings_goal_projection_chart_controller.js index 57df9c9ab..07b24042f 100644 --- a/app/javascript/controllers/savings_goal_projection_chart_controller.js +++ b/app/javascript/controllers/savings_goal_projection_chart_controller.js @@ -86,7 +86,7 @@ export default class extends Controller { .append("linearGradient") .attr("id", `saved-fill-${this._id()}`) .attr("x1", 0).attr("y1", 0).attr("x2", 0).attr("y2", 1); - gradient.append("stop").attr("offset", "0%").attr("stop-color", textPrimary).attr("stop-opacity", 0.10); + gradient.append("stop").attr("offset", "0%").attr("stop-color", textPrimary).attr("stop-opacity", 0.22); gradient.append("stop").attr("offset", "100%").attr("stop-color", textPrimary).attr("stop-opacity", 0); if (targetAmount > 0) { diff --git a/app/views/savings_goals/_contributions_list.html.erb b/app/views/savings_goals/_contributions_list.html.erb index ddceafad1..880628cba 100644 --- a/app/views/savings_goals/_contributions_list.html.erb +++ b/app/views/savings_goals/_contributions_list.html.erb @@ -7,7 +7,7 @@ <% else %>