From 35ba96bd9d49ac2e720028d9fc73f9d568740f97 Mon Sep 17 00:00:00 2001
From: Sayam Samal <sayam@zulip.com>
Date: Wed, 20 Nov 2024 23:34:13 +0530
Subject: [PATCH] recent_view: Remove bootstrap classes from recent view
 buttons.

This commit removes the final vestiges of `bootstrap-btn-default` class
from the codebase, by moving the relevant styles from the
`bootstrap-btn` and `bootstrap-btn-default` classes to the
`button-recent-filters` class.
---
 web/styles/dark_theme.css                 |  8 ------
 web/styles/recent_view.css                | 13 ++++++++++
 web/templates/recent_view_filters.hbs     |  6 ++---
 web/third/bootstrap/css/bootstrap-btn.css | 30 -----------------------
 4 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/web/styles/dark_theme.css b/web/styles/dark_theme.css
index 489dbd021f..fad5bd2e21 100644
--- a/web/styles/dark_theme.css
+++ b/web/styles/dark_theme.css
@@ -510,19 +510,11 @@
     }
 
     .recent_view_container #recent_view_table .button-recent-filters {
-        background-color: hsl(211deg 29% 14%);
-        border-color: hsl(0deg 0% 0%);
-        color: hsl(0deg 0% 100%);
-
         &:focus {
             background-color: hsl(0deg 0% 0% / 50%) !important;
-            outline: 0;
         }
 
         &.fake_disabled_button {
-            cursor: not-allowed;
-            opacity: 0.5;
-
             &:hover {
                 background-color: hsl(0deg 0% 0% / 50%);
                 border-color: hsl(0deg 0% 0%);
diff --git a/web/styles/recent_view.css b/web/styles/recent_view.css
index f2ae4d5264..c864c29dfb 100644
--- a/web/styles/recent_view.css
+++ b/web/styles/recent_view.css
@@ -162,8 +162,21 @@
     }
 
     .button-recent-filters {
+        color: var(--color-text-default);
+        background-color: var(--color-background-zulip-button);
+        border: 1px solid var(--color-border-zulip-button);
         border-radius: 40px;
         margin: 0 5px 10px 0;
+        padding: 6px 12px;
+        line-height: 100%;
+
+        &:hover {
+            background-color: var(--color-background-zulip-button-hover);
+        }
+
+        &:active {
+            background-color: var(--color-background-zulip-button-active);
+        }
 
         &:focus {
             background-color: hsl(0deg 0% 80%);
diff --git a/web/templates/recent_view_filters.hbs b/web/templates/recent_view_filters.hbs
index 5ad57e3d0d..c63de33017 100644
--- a/web/templates/recent_view_filters.hbs
+++ b/web/templates/recent_view_filters.hbs
@@ -1,5 +1,5 @@
 {{> ./dropdown_widget widget_name="recent-view-filter"}}
-<button data-filter="include_private" type="button" class="bootstrap-btn bootstrap-btn-default button-recent-filters {{#if is_spectator}}fake_disabled_button{{/if}}" role="checkbox" aria-checked="true">
+<button data-filter="include_private" type="button" class="button-recent-filters {{#if is_spectator}}fake_disabled_button{{/if}}" role="checkbox" aria-checked="true">
     {{#if filter_pm}}
     <i class="fa fa-check-square-o"></i>
     {{else}}
@@ -7,7 +7,7 @@
     {{/if}}
     {{t 'Include DMs' }}
 </button>
-<button data-filter="unread" type="button" class="bootstrap-btn bootstrap-btn-default button-recent-filters {{#if is_spectator}}fake_disabled_button{{/if}}" role="checkbox" aria-checked="false">
+<button data-filter="unread" type="button" class="button-recent-filters {{#if is_spectator}}fake_disabled_button{{/if}}" role="checkbox" aria-checked="false">
     {{#if filter_unread}}
     <i class="fa fa-check-square-o"></i>
     {{else}}
@@ -15,7 +15,7 @@
     {{/if}}
     {{t 'Unread' }}
 </button>
-<button data-filter="participated" type="button" class="bootstrap-btn bootstrap-btn-default button-recent-filters {{#if is_spectator}}fake_disabled_button{{/if}}" role="checkbox" aria-checked="false">
+<button data-filter="participated" type="button" class="button-recent-filters {{#if is_spectator}}fake_disabled_button{{/if}}" role="checkbox" aria-checked="false">
     {{#if filter_participated}}
     <i class="fa fa-check-square-o"></i>
     {{else}}
diff --git a/web/third/bootstrap/css/bootstrap-btn.css b/web/third/bootstrap/css/bootstrap-btn.css
index 9e634b97cb..76b1ab5a01 100644
--- a/web/third/bootstrap/css/bootstrap-btn.css
+++ b/web/third/bootstrap/css/bootstrap-btn.css
@@ -77,33 +77,3 @@ THE SOFTWARE.
           box-shadow: none;
   opacity: .65;
 }
-.bootstrap-btn-default {
-  color: #333;
-  background-color: #fff;
-  border-color: #ccc;
-}
-.bootstrap-btn-default:hover,
-.bootstrap-btn-default:focus,
-.bootstrap-btn-default:active,
-.bootstrap-btn-default.active {
-  color: #333;
-  background-color: #ebebeb;
-  border-color: #adadad;
-}
-.bootstrap-btn-default:active,
-.bootstrap-btn-default.active {
-  background-image: none;
-}
-.bootstrap-btn-default.disabled,
-.bootstrap-btn-default[disabled],
-.bootstrap-btn-default.disabled:hover,
-.bootstrap-btn-default[disabled]:hover,
-.bootstrap-btn-default.disabled:focus,
-.bootstrap-btn-default[disabled]:focus,
-.bootstrap-btn-default.disabled:active,
-.bootstrap-btn-default[disabled]:active,
-.bootstrap-btn-default.disabled.active,
-.bootstrap-btn-default[disabled].active {
-  background-color: #fff;
-  border-color: #ccc;
-}