From ea6330a64b8b95e601ac425ff9d3cf98ef5336c7 Mon Sep 17 00:00:00 2001 From: adityagarud Date: Sun, 19 Oct 2025 10:30:34 +0530 Subject: [PATCH 1/3] Fix star icon to toggle between My Rooms and All Rooms without hiding rooms --- app/helpers/rooms/involvements_helper.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/helpers/rooms/involvements_helper.rb b/app/helpers/rooms/involvements_helper.rb index 63d1908f..36caf685 100644 --- a/app/helpers/rooms/involvements_helper.rb +++ b/app/helpers/rooms/involvements_helper.rb @@ -19,17 +19,14 @@ def button_to_change_involvement(room, involvement, from_sidebar: false) "invisible" => "Room hidden from sidebar" } - 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 From 8bd5424f0f400d44d712aacab6a2bbf1d6fcdce6 Mon Sep 17 00:00:00 2001 From: adityagarud Date: Sun, 19 Oct 2025 10:37:36 +0530 Subject: [PATCH 2/3] Remove invisible/hidden room feature from UI and navbar --- app/assets/stylesheets/application/base.css | 4 ---- app/assets/stylesheets/application/buttons.css | 15 +++++---------- app/helpers/rooms/involvements_helper.rb | 3 +-- app/models/rooms/thread.rb | 2 +- 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/application/base.css b/app/assets/stylesheets/application/base.css index 179bd234..a07c15ad 100644 --- a/app/assets/stylesheets/application/base.css +++ b/app/assets/stylesheets/application/base.css @@ -98,10 +98,6 @@ legend { text-align: center; } -.membership-item:has(.btn.invisible) { - opacity: 0.5; -} - /* Dialogs */ .dialog { --width: 50ch; diff --git a/app/assets/stylesheets/application/buttons.css b/app/assets/stylesheets/application/buttons.css index 06bf9950..ee4ba1ee 100644 --- a/app/assets/stylesheets/application/buttons.css +++ b/app/assets/stylesheets/application/buttons.css @@ -122,16 +122,14 @@ /* 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; } @@ -251,8 +249,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; @@ -262,8 +259,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; } @@ -283,8 +279,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; diff --git a/app/helpers/rooms/involvements_helper.rb b/app/helpers/rooms/involvements_helper.rb index 36caf685..bb518ab8 100644 --- a/app/helpers/rooms/involvements_helper.rb +++ b/app/helpers/rooms/involvements_helper.rb @@ -15,8 +15,7 @@ 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 ] diff --git a/app/models/rooms/thread.rb b/app/models/rooms/thread.rb index 5fdf1041..11498352 100644 --- a/app/models/rooms/thread.rb +++ b/app/models/rooms/thread.rb @@ -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 From 344c25427845fe76ab41779e426219ba48b7ffbb Mon Sep 17 00:00:00 2001 From: adityagarud Date: Sun, 19 Oct 2025 10:39:40 +0530 Subject: [PATCH 3/3] Remove unused invisible icon asset --- app/assets/images/notification-bell-invisible.svg | 1 - 1 file changed, 1 deletion(-) delete mode 100644 app/assets/images/notification-bell-invisible.svg diff --git a/app/assets/images/notification-bell-invisible.svg b/app/assets/images/notification-bell-invisible.svg deleted file mode 100644 index 7d18107c..00000000 --- a/app/assets/images/notification-bell-invisible.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file