From 0454be5d260d64fc63bf30794c70249770a540d9 Mon Sep 17 00:00:00 2001
From: Sahil Batra <sahil@zulip.com>
Date: Tue, 20 Jun 2023 17:04:41 +0530
Subject: [PATCH] activity: Re-add bootstrap CSS for inputs in realm details
 page.

This commit re-adds bootstrap CSS for text inputs in realm details
page by using a more specific selector in activity.css. The CSS
added for search input includes bootstrap CSS applied using
".search-query" and "input[type="text"]" selectors.

We remove the CSS for search-query CSS from bootstrap.css
as the search element in app navbar already overrides the
bootstrap CSS.

This is a prep commit for removing bootstrap CSS for text type
inputs.
---
 web/styles/portico/activity.css       | 45 +++++++++++++++++----------
 web/third/bootstrap/css/bootstrap.css |  8 -----
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/web/styles/portico/activity.css b/web/styles/portico/activity.css
index 17ca7fad9d..d3f60f719f 100644
--- a/web/styles/portico/activity.css
+++ b/web/styles/portico/activity.css
@@ -75,6 +75,20 @@ tr.admin td:first-child {
 
     & input {
         width: 206px;
+        padding: 4px 6px;
+        border-radius: 4px;
+        border: 1px solid hsl(0deg 0% 80%);
+        color: hsl(0deg 0% 33%);
+        margin-bottom: 10px;
+        transition: border linear 0.2s, box-shadow linear 0.2s;
+        box-shadow: inset 0 1px 1px hsla(0deg 0% 0% / 7.5%);
+
+        &:focus {
+            border-color: hsl(206deg 80% 62% / 80%);
+            outline: 0;
+            box-shadow: inset 0 1px 1px hsl(0deg 0% 0% / 7.5%),
+                0 0 8px hsl(206.494deg 80% 62% / 60%);
+        }
     }
 }
 
@@ -92,23 +106,6 @@ tr.admin td:first-child {
 .support-discount-form {
     position: relative;
     top: -50px;
-
-    & input {
-        padding: 4px 6px;
-        border-radius: 4px;
-        border: 1px solid hsl(0deg 0% 80%);
-        color: hsl(0deg 0% 33%);
-        margin-bottom: 10px;
-        transition: border linear 0.2s, box-shadow linear 0.2s;
-        box-shadow: inset 0 1px 1px hsla(0deg 0 0 / 7.5%);
-
-        &:focus {
-            border-color: hsl(206deg 80% 62% / 80%);
-            outline: 0;
-            box-shadow: inset 0 1px 1px hsl(0deg 0% 0% / 7.5%),
-                0 0 8px hsl(206.494deg 80% 62% / 60%);
-        }
-    }
 }
 
 .support-plan-type-form {
@@ -164,6 +161,20 @@ tr.admin td:first-child {
 
 .search-query.input-xxlarge {
     width: 530px;
+    padding: 4px 14px;
+    margin-bottom: 0;
+    border-radius: 15px;
+    border: 1px solid hsl(0deg 0% 80%);
+    box-shadow: inset 0 1px 1px hsl(0deg 0% 0% / 7.5%);
+    transition: border linear 0.2s, box-shadow linear 0.2s;
+    color: hsl(0deg 0% 33%);
+
+    &:focus {
+        border-color: hsl(206deg 80% 62% / 80%);
+        outline: 0;
+        box-shadow: inset 0 1px 1px hsl(0deg 0% 0% / 7.5%),
+            0 0 8px hsl(206.494deg 80% 62% / 60%);
+    }
 }
 
 @media (width <= 767px) {
diff --git a/web/third/bootstrap/css/bootstrap.css b/web/third/bootstrap/css/bootstrap.css
index b17771e5fb..d87f6646c6 100644
--- a/web/third/bootstrap/css/bootstrap.css
+++ b/web/third/bootstrap/css/bootstrap.css
@@ -540,14 +540,6 @@ input:focus:invalid:focus {
   -moz-border-radius: 0 4px 4px 0;
   border-radius: 0 4px 4px 0;
 }
-input.search-query {
-  padding-right: 14px;
-  padding-left: 14px;
-  margin-bottom: 0;
-  -webkit-border-radius: 15px;
-  -moz-border-radius: 15px;
-  border-radius: 15px;
-}
 .form-inline input,
 .form-inline .help-inline,
 .form-inline .input-append {