bterkuile/fizzy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1176 from basecamp/collection-notifications-fix

Browse Source 
Collection notifications fix
This commit is contained in:
Andy Smith
2025-09-26 13:01:03 -05:00
committed by GitHub
parent 714cea5d34 ece2dae154
commit 50003668dd
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/icons.css
+2
View File
@@ -63,6 +63,8 @@
.icon--move { --svg: url("move.svg "); }
.icon--notification-bell-access-only { --svg: url("bell.svg "); }
.icon--notification-bell-watching { --svg: url("bell-off.svg "); }
.icon--notification-bell-reverse-access-only { --svg: url("bell-off.svg "); }
.icon--notification-bell-reverse-watching { --svg: url("bell.svg "); }
.icon--password { --svg: url("password.svg "); }
.icon--pencil { --svg: url("pencil.svg "); }
.icon--person { --svg: url("person.svg "); }
app/helpers/accesses_helper.rb
+2 -2
View File
@@ -51,10 +51,10 @@ module AccessesHelper
method: :put,
aria: { labelledby: involvement_label_id },
class: "btn",
params: { show_watchers: show_watchers, involvement: next_involvement(access.involvement) }
params: { show_watchers: show_watchers, involvement: next_involvement(access.involvement), icon_only: icon_only }
) do
safe_join([
icon_tag("notification-bell-#{access.involvement.dasherize}"),
icon_tag("notification-bell-#{icon_only ? 'reverse-' : nil}#{access.involvement.dasherize}"),
tag.span(
involvement_access_label(collection, access.involvement),
class: class_names("txt-nowrap txt-uppercase", "for-screen-reader": icon_only),
app/views/collections/involvements/update.html.erb
+1 -1
View File
@@ -1 +1 @@
<%= access_involvement_advance_button(@collection, Current.user, show_watchers: params[:show_watchers] == 'true') %>
<%= access_involvement_advance_button(@collection, Current.user, show_watchers: params[:show_watchers] == 'true', icon_only: params[:icon_only] == 'true') %>