From f9dd4f9a1236f7ca63df5669bfd60399f6575d6d Mon Sep 17 00:00:00 2001 From: Sayam Samal Date: Thu, 21 Nov 2024 18:00:51 +0530 Subject: [PATCH] portico: Remove `bootstrap-btn.css` dependency from portico. This commit removes the final vestiges of `bootstrap-btn.css` from portico, allowing us to move `bootstrap-btn.css` from `common.ts` bundle to just `app.ts` bundle. --- templates/zerver/development/integrations_dev_panel.html | 4 ++-- web/src/bundles/app.ts | 1 + web/src/bundles/common.ts | 1 - web/styles/portico/integrations_dev_panel.css | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/zerver/development/integrations_dev_panel.html b/templates/zerver/development/integrations_dev_panel.html index 42d973b760..b948daf30b 100644 --- a/templates/zerver/development/integrations_dev_panel.html +++ b/templates/zerver/development/integrations_dev_panel.html @@ -95,8 +95,8 @@
- - + +
diff --git a/web/src/bundles/app.ts b/web/src/bundles/app.ts index 0e8fbe6f31..1c90d1105c 100644 --- a/web/src/bundles/app.ts +++ b/web/src/bundles/app.ts @@ -23,6 +23,7 @@ import "katex/dist/katex.css"; import "flatpickr/dist/flatpickr.css"; import "flatpickr/dist/plugins/confirmDate/confirmDate.css"; import "../../third/bootstrap/css/bootstrap.app.css"; +import "../../third/bootstrap/css/bootstrap-btn.css"; import "../../styles/typeahead.css"; import "../../styles/app_variables.css"; import "../../styles/tooltips.css"; diff --git a/web/src/bundles/common.ts b/web/src/bundles/common.ts index e6c7f5e78c..5d5b1109dd 100644 --- a/web/src/bundles/common.ts +++ b/web/src/bundles/common.ts @@ -3,7 +3,6 @@ import "../../debug-require.cjs"; import "../alert_popup.ts"; import "../csrf.ts"; import "../blueslip.ts"; -import "../../third/bootstrap/css/bootstrap-btn.css"; import "simplebar/dist/simplebar.css"; import "font-awesome/css/font-awesome.css"; import "../../images/icons/zulip-icons.font.cjs"; diff --git a/web/styles/portico/integrations_dev_panel.css b/web/styles/portico/integrations_dev_panel.css index 4a82a9a51a..fdf156382f 100644 --- a/web/styles/portico/integrations_dev_panel.css +++ b/web/styles/portico/integrations_dev_panel.css @@ -116,9 +116,10 @@ margin-right: 2%; button { + padding: 6px 12px; color: hsl(0deg 0% 100%); background-color: hsl(208deg 56% 53%); - border-color: hsl(208deg 56% 47%); + border: 1px solid hsl(208deg 56% 47%); &:hover, &:active,