Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Commit

Permalink
[MM-26334] Fixes direct messages loading screen misalignment (#6813)
Browse files Browse the repository at this point in the history
Summary:
Reduces the height of the loading screen so it is more centered and/or unintrusive(small screens) enough to remove the scroll bar during loading.

Ticket Link:
Fixes mattermost/mattermost#15926
  • Loading branch information
ZombiMigz authored Nov 27, 2020
1 parent d9fabb8 commit 7fb49bf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,7 @@ exports[`components/SearchableChannelList should match init snapshot 1`] = `
>
<LoadingScreen
position="relative"
style={
Object {
"marginTop": "50%",
}
}
style={Object {}}
/>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/searchable_channel_list.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export default class SearchableChannelList extends React.PureComponent {
let previousButton;

if (this.props.loading && channels.length === 0) {
listContent = <LoadingScreen style={{marginTop: '50%'}}/>;
listContent = <LoadingScreen/>;
} else if (channels.length === 0) {
listContent = (
<div className='no-channel-message'>
Expand Down
6 changes: 5 additions & 1 deletion sass/components/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,11 @@
}

.more-modal {
.loading-screen{
padding: 1.9em 1em;
font-size: 1.25em;
height: auto;
}
.Select-input {
>input {
padding: 8px 0;
Expand Down Expand Up @@ -923,7 +928,6 @@
>div {
flex: 1 1 auto;
}

.multi-select__wrapper {
display: flex;
flex-direction: column;
Expand Down

0 comments on commit 7fb49bf

Please sign in to comment.