Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Sayam Samal 2024-11-20 23:34:13 +05:30 committed by Tim Abbott
parent 6c981d9385
commit 35ba96bd9d
4 changed files with 16 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/styles/dark_theme.css
View File

@ -510,19 +510,11 @@
} }
.recent_view_container #recent_view_table .button-recent-filters { .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 { &:focus {
background-color: hsl(0deg 0% 0% / 50%) !important; background-color: hsl(0deg 0% 0% / 50%) !important;
outline: 0;
} }
&.fake_disabled_button { &.fake_disabled_button {
cursor: not-allowed;
opacity: 0.5;
&:hover { &:hover {
background-color: hsl(0deg 0% 0% / 50%); background-color: hsl(0deg 0% 0% / 50%);
border-color: hsl(0deg 0% 0%); border-color: hsl(0deg 0% 0%);

13
web/styles/recent_view.css
View File

@ -162,8 +162,21 @@
} }
.button-recent-filters { .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; border-radius: 40px;
margin: 0 5px 10px 0; 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 { &:focus {
background-color: hsl(0deg 0% 80%); background-color: hsl(0deg 0% 80%);

6
web/templates/recent_view_filters.hbs
View File

@ -1,5 +1,5 @@
{{> ./dropdown_widget widget_name="recent-view-filter"}} {{> ./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}} {{#if filter_pm}}
<i class="fa fa-check-square-o"></i> <i class="fa fa-check-square-o"></i>
{{else}} {{else}}
@ -7,7 +7,7 @@
{{/if}} {{/if}}
{{t 'Include DMs' }} {{t 'Include DMs' }}
</button> </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}} {{#if filter_unread}}
<i class="fa fa-check-square-o"></i> <i class="fa fa-check-square-o"></i>
{{else}} {{else}}
@ -15,7 +15,7 @@
{{/if}} {{/if}}
{{t 'Unread' }} {{t 'Unread' }}
</button> </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}} {{#if filter_participated}}
<i class="fa fa-check-square-o"></i> <i class="fa fa-check-square-o"></i>
{{else}} {{else}}

30
web/third/bootstrap/css/bootstrap-btn.css vendored
View File

@ -77,33 +77,3 @@ THE SOFTWARE.
box-shadow: none; box-shadow: none;
opacity: .65; 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;
}