mirror of https://github.com/zulip/zulip.git
settings: Fix filter alignment under headings in all settings panels.
Previously, when resizing the window, the filters/buttons and the header did not fit on the same row, the filters/buttons were pushed onto the next row but not put directly below the heading. This changes the settings_panel_list_header and add_default_streams_button_container into flex containers and properly aligns the items below the heading when changing window size. Fixes: #30353
This commit is contained in:
parent
ded6bfd3f2
commit
90e42ca8ed
|
@ -602,8 +602,9 @@ input[type="checkbox"] {
|
||||||
}
|
}
|
||||||
|
|
||||||
#add-custom-profile-field-button {
|
#add-custom-profile-field-button {
|
||||||
float: right;
|
margin-top: auto;
|
||||||
margin-top: 4px;
|
margin-bottom: 12px;
|
||||||
|
padding: 4px 14px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#user-notification-settings {
|
#user-notification-settings {
|
||||||
|
@ -712,23 +713,17 @@ input[type="checkbox"] {
|
||||||
}
|
}
|
||||||
|
|
||||||
.add_default_streams_button_container {
|
.add_default_streams_button_container {
|
||||||
float: right;
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
margin-top: auto;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
gap: 6px;
|
||||||
|
|
||||||
#show-add-default-streams-modal {
|
#show-add-default-streams-modal {
|
||||||
/* We want this button to have the same height as the filter
|
|
||||||
button on its right. We're overriding the default vertical
|
|
||||||
button padding and setting it to 0. Having the
|
|
||||||
height fixed will mean that the vertical whitespace will
|
|
||||||
adjust itself for different font-sizes without changing the
|
|
||||||
height.
|
|
||||||
*/
|
|
||||||
padding-top: 0;
|
padding-top: 0;
|
||||||
padding-bottom: 0;
|
padding-bottom: 0;
|
||||||
height: 30px;
|
|
||||||
|
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
margin-top: 12px;
|
|
||||||
margin-right: 6px;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1995,6 +1990,10 @@ $option_title_width: 180px;
|
||||||
|
|
||||||
.settings_panel_list_header {
|
.settings_panel_list_header {
|
||||||
position: relative;
|
position: relative;
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
|
||||||
& h3 {
|
& h3 {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
@ -2002,15 +2001,35 @@ $option_title_width: 180px;
|
||||||
|
|
||||||
.user_filters {
|
.user_filters {
|
||||||
display: flex;
|
display: flex;
|
||||||
float: right;
|
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
|
margin-top: auto;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
gap: 6px;
|
||||||
|
|
||||||
& .dropdown-widget-button {
|
& .dropdown-widget-button {
|
||||||
height: 30px;
|
height: 30px;
|
||||||
max-width: 160px;
|
max-width: 160px;
|
||||||
margin-right: 12px;
|
|
||||||
margin-top: 12px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
& input.search {
|
||||||
|
/* Margins need to be only handled by the container holding the
|
||||||
|
filters to keep them aligned in .settings_panel_list_header */
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.add_default_streams_button_container {
|
||||||
|
& input.search {
|
||||||
|
/* Margins need to be only handled by the container holding the
|
||||||
|
filters to keep them aligned in .settings_panel_list_header */
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.alert-notification {
|
||||||
|
margin-top: auto;
|
||||||
|
margin-bottom: 12px;
|
||||||
|
margin-right: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
& input.search {
|
& input.search {
|
||||||
|
@ -2023,7 +2042,8 @@ $option_title_width: 180px;
|
||||||
float: right;
|
float: right;
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
max-width: 160px;
|
max-width: 160px;
|
||||||
margin-top: 12px;
|
margin-top: auto;
|
||||||
|
margin-bottom: 12px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue