PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4675 from JorikSchellekens/joriks/fix-compact-layout-regression

Browse source 
Increase specificity of compact layout selectors
This commit is contained in:
Jorik Schellekens 2020-06-01 18:11:52 +01:00 committed by GitHub
commit 50124d3476
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 61 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
res/css/views/rooms/_GroupLayout.scss
View file

@ -53,11 +53,15 @@ $left-gutter: 65px;
/* Compact layout overrides */ /* Compact layout overrides */
.mx_MatrixChat_useCompactLayout { .mx_MatrixChat_useCompactLayout {
.mx_EventTile { .mx_EventTile_line, .mx_EventTile_reply {
padding-top: 4px; padding-top: 0px;
padding-bottom: 0px;
} }
.mx_EventTile.mx_EventTile_info { .mx_EventTile {
padding-top: 4px;
&.mx_EventTile_info {
// same as the padding for non-compact .mx_EventTile.mx_EventTile_info // same as the padding for non-compact .mx_EventTile.mx_EventTile_info
padding-top: 0px; padding-top: 0px;
font-size: $font-13px; font-size: $font-13px;
@ -69,11 +73,11 @@ $left-gutter: 65px;
} }
} }
.mx_EventTile .mx_SenderProfile { .mx_SenderProfile {
font-size: $font-13px; font-size: $font-13px;
} }
.mx_EventTile.mx_EventTile_emote { &.mx_EventTile_emote {
// add a bit more space for emotes so that avatars don't collide // add a bit more space for emotes so that avatars don't collide
padding-top: 8px; padding-top: 8px;
.mx_EventTile_avatar { .mx_EventTile_avatar {
@ -85,7 +89,7 @@ $left-gutter: 65px;
} }
} }
.mx_EventTile.mx_EventTile_emote.mx_EventTile_continuation { &.mx_EventTile_emote.mx_EventTile_continuation {
padding-top: 0; padding-top: 0;
.mx_EventTile_line, .mx_EventTile_reply { .mx_EventTile_line, .mx_EventTile_reply {
padding-top: 0px; padding-top: 0px;
@ -93,11 +97,6 @@ $left-gutter: 65px;
} }
} }
.mx_EventTile_line, .mx_EventTile_reply {
padding-top: 0px;
padding-bottom: 0px;
}
.mx_EventTile_avatar { .mx_EventTile_avatar {
top: 2px; top: 2px;
} }
@ -119,13 +118,14 @@ $left-gutter: 65px;
top: 4px; top: 4px;
} }
.mx_RoomView_MessageList h2 {
margin-top: 6px;
}
.mx_EventTile_content .markdown-body { .mx_EventTile_content .markdown-body {
p, ul, ol, dl, blockquote, pre, table { p, ul, ol, dl, blockquote, pre, table {
margin-bottom: 4px; // 1/4 of the non-compact margin-bottom margin-bottom: 4px; // 1/4 of the non-compact margin-bottom
} }
} }
}
.mx_RoomView_MessageList h2 {
margin-top: 6px;
}
} }