Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust CSS to prevent scrollbars on message panel spinner #6131

Merged
merged 4 commits into from
Feb 15, 2018
Merged

Adjust CSS to prevent scrollbars on message panel spinner #6131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85c0b8d
Adjust CSS to prevent scrollbars on message panel spinner
lukebarnard1 Feb 13, 2018
b3bb2d2
Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first
lukebarnard1 Feb 14, 2018
7ac350e
Give mx_RoomView_messageListWrapper its `min-height: 100%` back
lukebarnard1 Feb 14, 2018
5c354dd
Fix messagePanelSpinner flex order in RightPanel
lukebarnard1 Feb 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/skins/vector/css/matrix-react-sdk/structures/_NotificationPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ limitations under the License.
left: 0px;
}

.mx_NotificationPanel .mx_EventTile .mx_SenderProfile,
.mx_NotificationPanel .mx_EventTile .mx_SenderProfile,
.mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp {
color: $primary-fg-color;
font-size: 12px;
Expand Down
5 changes: 5 additions & 0 deletions src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ limitations under the License.
order: 2;
}

.mx_RoomView_body .mx_RoomView_messagePanelSpinner {
order: 2;
margin: auto;
}

.mx_RoomView_body .mx_RoomView_statusArea {
order: 3;
}
Expand Down
5 changes: 5 additions & 0 deletions src/skins/vector/css/vector-web/structures/_RightPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ limitations under the License.
flex: 1 1 0;
}

.mx_RightPanel .mx_RoomView_messagePanelSpinner {
order: 2;
margin: auto;
}

.mx_RightPanel_footer {
order: 3;

Expand Down