From 045efadab90e3a509b231419be614fc9e95cc438 Mon Sep 17 00:00:00 2001 From: Sayam Samal Date: Thu, 14 Nov 2024 15:33:08 +0530 Subject: [PATCH] bootstrap-btn: Rename btn -> bootstrap-btn. This commit is a part of the efforts to rename btn-related classes and variables to align with Zulip's no-abbreviations policy and streamline the search results. --- .../development/integrations_dev_panel.html | 4 ++-- web/styles/settings.css | 2 +- web/styles/subscriptions.css | 2 +- web/styles/zulip.css | 2 +- web/templates/filter_topics.hbs | 2 +- web/templates/left_sidebar.hbs | 4 ++-- web/templates/recent_view_filters.hbs | 6 +++--- web/templates/recent_view_table.hbs | 2 +- web/templates/right_sidebar.hbs | 2 +- web/templates/set_status_overlay.hbs | 2 +- web/templates/settings/bot_avatar_row.hbs | 12 +++++------ web/templates/settings/bot_settings.hbs | 2 +- .../stream_settings_overlay.hbs | 2 +- .../user_group_settings_overlay.hbs | 2 +- web/third/bootstrap/css/bootstrap-btn.css | 20 +++++++++---------- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/templates/zerver/development/integrations_dev_panel.html b/templates/zerver/development/integrations_dev_panel.html index a98f392918..42d973b760 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/styles/settings.css b/web/styles/settings.css index 400a8ea92a..277ae2009b 100644 --- a/web/styles/settings.css +++ b/web/styles/settings.css @@ -898,7 +898,7 @@ input[type="checkbox"] { background-color: transparent; } - .btn { + .bootstrap-btn { padding: 4px; } diff --git a/web/styles/subscriptions.css b/web/styles/subscriptions.css index 39987ca654..c026774c84 100644 --- a/web/styles/subscriptions.css +++ b/web/styles/subscriptions.css @@ -16,7 +16,7 @@ overflow-wrap: break-word; } -.subscription_settings .btn { +.subscription_settings .bootstrap-btn { border-radius: 2px; } diff --git a/web/styles/zulip.css b/web/styles/zulip.css index c3fe3a0b7f..68b503ad54 100644 --- a/web/styles/zulip.css +++ b/web/styles/zulip.css @@ -619,7 +619,7 @@ li, line-height: inherit; } -.btn { +.bootstrap-btn { font-size: inherit; height: auto; line-height: 100%; diff --git a/web/templates/filter_topics.hbs b/web/templates/filter_topics.hbs index 6ba373a143..3ad3d9093e 100644 --- a/web/templates/filter_topics.hbs +++ b/web/templates/filter_topics.hbs @@ -1,6 +1,6 @@
-
diff --git a/web/templates/left_sidebar.hbs b/web/templates/left_sidebar.hbs index 72a03e331d..cdeed80ea0 100644 --- a/web/templates/left_sidebar.hbs +++ b/web/templates/left_sidebar.hbs @@ -165,7 +165,7 @@
-
@@ -194,7 +194,7 @@
-
diff --git a/web/templates/recent_view_filters.hbs b/web/templates/recent_view_filters.hbs index 5449df3a0f..5ad57e3d0d 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"}} - - -
-
diff --git a/web/templates/right_sidebar.hbs b/web/templates/right_sidebar.hbs index 157a64a2f2..705d104ff6 100644 --- a/web/templates/right_sidebar.hbs +++ b/web/templates/right_sidebar.hbs @@ -4,7 +4,7 @@
diff --git a/web/templates/set_status_overlay.hbs b/web/templates/set_status_overlay.hbs index 35d789f37e..d00edeed95 100644 --- a/web/templates/set_status_overlay.hbs +++ b/web/templates/set_status_overlay.hbs @@ -5,7 +5,7 @@
- diff --git a/web/templates/settings/bot_avatar_row.hbs b/web/templates/settings/bot_avatar_row.hbs index f2918e9fbb..659bb00b1c 100644 --- a/web/templates/settings/bot_avatar_row.hbs +++ b/web/templates/settings/bot_avatar_row.hbs @@ -5,23 +5,23 @@
{{name}}
{{#if is_active}}
- - + - - - {{#if is_incoming_webhook_bot}} - {{/if}} diff --git a/web/templates/settings/bot_settings.hbs b/web/templates/settings/bot_settings.hbs index d9e742f4e9..2040afaabb 100644 --- a/web/templates/settings/bot_settings.hbs +++ b/web/templates/settings/bot_settings.hbs @@ -22,7 +22,7 @@
{{t 'Download config of all active outgoing webhook bots in Zulip Botserver format.' }} - +
diff --git a/web/templates/stream_settings/stream_settings_overlay.hbs b/web/templates/stream_settings/stream_settings_overlay.hbs index 924a6e6668..dd0a8da80a 100644 --- a/web/templates/stream_settings/stream_settings_overlay.hbs +++ b/web/templates/stream_settings/stream_settings_overlay.hbs @@ -22,7 +22,7 @@
-
diff --git a/web/templates/user_group_settings/user_group_settings_overlay.hbs b/web/templates/user_group_settings/user_group_settings_overlay.hbs index 6141c10923..79909373cf 100644 --- a/web/templates/user_group_settings/user_group_settings_overlay.hbs +++ b/web/templates/user_group_settings/user_group_settings_overlay.hbs @@ -22,7 +22,7 @@
-
diff --git a/web/third/bootstrap/css/bootstrap-btn.css b/web/third/bootstrap/css/bootstrap-btn.css index d78af5590c..9e634b97cb 100644 --- a/web/third/bootstrap/css/bootstrap-btn.css +++ b/web/third/bootstrap/css/bootstrap-btn.css @@ -31,7 +31,7 @@ THE SOFTWARE. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -.btn { +.bootstrap-btn { display: inline-block; padding: 6px 12px; margin-bottom: 0; @@ -50,27 +50,27 @@ THE SOFTWARE. border: 1px solid transparent; border-radius: 0px; } -.btn:focus, -.btn:active:focus, -.btn.active:focus { +.bootstrap-btn:focus, +.bootstrap-btn:active:focus, +.bootstrap-btn.active:focus { outline: thin dotted; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -.btn:hover, -.btn:focus { +.bootstrap-btn:hover, +.bootstrap-btn:focus { color: #333; text-decoration: none; } -.btn:active, -.btn.active { +.bootstrap-btn:active, +.bootstrap-btn.active { background-image: none; outline: 0; -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125); } -.btn.disabled, -.btn[disabled] { +.bootstrap-btn.disabled, +.bootstrap-btn[disabled] { pointer-events: none; cursor: not-allowed; -webkit-box-shadow: none;