Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion app/assets/images/notification-bell-invisible.svg

This file was deleted.

4 changes: 0 additions & 4 deletions app/assets/stylesheets/application/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,6 @@ legend {
text-align: center;
}

.membership-item:has(.btn.invisible) {
opacity: 0.5;
}

/* Dialogs */
.dialog {
--width: 50ch;
Expand Down
15 changes: 5 additions & 10 deletions app/assets/stylesheets/application/buttons.css
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,13 @@

/* Default state: buttons have borders */
.btn.everything,
.btn.mentions,
.btn.invisible {
.btn.mentions {
border: var(--btn-border-size, 1px) solid var(--btn-border-color, var(--color-border-darker));
}

/* Remove borders only for involvement buttons in the sidebar */
[data-type="list_node"] .btn.everything,
[data-type="list_node"] .btn.mentions,
[data-type="list_node"] .btn.invisible {
[data-type="list_node"] .btn.mentions {
border: 0;
}

Expand Down Expand Up @@ -240,8 +238,7 @@ button {

/* Make involvement buttons in the navbar consistent with edit-room button */
.flex.gap-half.align-center .btn.everything,
.flex.gap-half.align-center .btn.mentions,
.flex.gap-half.align-center .btn.invisible {
.flex.gap-half.align-center .btn.mentions {
height: var(--navbar-btn-size);
width: var(--navbar-btn-size);
padding: 0;
Expand All @@ -251,8 +248,7 @@ button {
}

.flex.gap-half.align-center .btn.everything img,
.flex.gap-half.align-center .btn.mentions img,
.flex.gap-half.align-center .btn.invisible img {
.flex.gap-half.align-center .btn.mentions img {
width: 18px;
height: 18px;
}
Expand All @@ -272,8 +268,7 @@ a.btn[data-room-id] img {

/* Hide text in navbar involvement buttons to match other circular buttons */
.flex.gap-half.align-center .btn.everything .for-screen-reader,
.flex.gap-half.align-center .btn.mentions .for-screen-reader,
.flex.gap-half.align-center .btn.invisible .for-screen-reader {
.flex.gap-half.align-center .btn.mentions .for-screen-reader {
position: absolute;
width: 1px;
height: 1px;
Expand Down
10 changes: 3 additions & 7 deletions app/helpers/rooms/involvements_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,17 @@ def button_to_change_involvement(room, involvement, from_sidebar: false)
private
HUMANIZE_INVOLVEMENT = {
"mentions" => "Room in All Rooms",
"everything" => "Room in My Rooms",
"invisible" => "Room hidden from sidebar"
"everything" => "Room in My Rooms"
}

SHARED_INVOLVEMENT_ORDER = %w[ mentions everything invisible ]
SHARED_SIDEBAR_INVOLVEMENT_ORDER = %w[ mentions everything ]
SHARED_INVOLVEMENT_ORDER = %w[ mentions everything ]
DIRECT_INVOLVEMENT_ORDER = %w[ everything nothing ]

def next_involvement_for(room, involvement:, from_sidebar: false)
if room.direct?
DIRECT_INVOLVEMENT_ORDER[DIRECT_INVOLVEMENT_ORDER.index(involvement) + 1] || DIRECT_INVOLVEMENT_ORDER.first
elsif from_sidebar
SHARED_SIDEBAR_INVOLVEMENT_ORDER[(SHARED_SIDEBAR_INVOLVEMENT_ORDER.index(involvement) || 0) + 1] || SHARED_SIDEBAR_INVOLVEMENT_ORDER.first
else
SHARED_INVOLVEMENT_ORDER[SHARED_INVOLVEMENT_ORDER.index(involvement) + 1] || SHARED_INVOLVEMENT_ORDER.first
SHARED_INVOLVEMENT_ORDER[(SHARED_INVOLVEMENT_ORDER.index(involvement) || 0) + 1] || SHARED_INVOLVEMENT_ORDER.first
end
end
end
2 changes: 1 addition & 1 deletion app/models/rooms/thread.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def default_involvement(user: nil)
if user.present? && (user == creator || user == parent_message&.creator)
"everything"
else
"invisible"
"mentions"
end
end
end