gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-08-06 19:10:34 +00:00
parent 8b1650c382 a98c734eb5
commit b75402e772
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/skins/vector/css/matrix-react-sdk/views/elements/_MemberEventListSummary.scss
View File

@ -50,11 +50,22 @@ limitations under the License.
} }
.mx_MatrixChat_useCompactLayout { .mx_MatrixChat_useCompactLayout {
.mx_MemberEventListSummary {
font-size: 13px;
.mx_EventTile_line {
line-height: 20px;
}
}
.mx_MemberEventListSummary_line { .mx_MemberEventListSummary_line {
line-height: 22px; line-height: 22px;
} }
.mx_MemberEventListSummary_toggle { .mx_MemberEventListSummary_toggle {
margin-top: 2px; margin-top: 3px;
}
.mx_TextualEvent.mx_MemberEventListSummary_summary {
font-size: 13px;
} }
} }

24
src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
View File

@ -403,7 +403,15 @@ limitations under the License.
} }
.mx_EventTile.mx_EventTile_info { .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: 13px;
.mx_EventTile_line {
line-height: 20px;
}
.mx_EventTile_avatar {
top: 4px;
}
} }
.mx_EventTile .mx_SenderProfile { .mx_EventTile .mx_SenderProfile {
@ -411,6 +419,7 @@ limitations under the License.
} }
.mx_EventTile.mx_EventTile_emote { .mx_EventTile.mx_EventTile_emote {
// 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 {
top: 2px; top: 2px;
@ -438,10 +447,6 @@ limitations under the License.
top: 2px; top: 2px;
} }
.mx_EventTile.mx_EventTile_info .mx_EventTile_avatar {
top: 5px;
}
.mx_EventTile_e2eIcon { .mx_EventTile_e2eIcon {
top: 7px; top: 7px;
} }
@ -455,12 +460,21 @@ limitations under the License.
} }
.mx_EventTile_continuation .mx_EventTile_readAvatars, .mx_EventTile_continuation .mx_EventTile_readAvatars,
.mx_EventTile_info .mx_EventTile_readAvatars,
.mx_EventTile_emote .mx_EventTile_readAvatars { .mx_EventTile_emote .mx_EventTile_readAvatars {
top: 5px; top: 5px;
} }
.mx_EventTile_info .mx_EventTile_readAvatars {
top: 4px;
}
.mx_RoomView_MessageList h2 { .mx_RoomView_MessageList h2 {
margin-top: 6px; margin-top: 6px;
} }
.mx_EventTile_content .markdown-body {
p, ul, ol, dl, blockquote, pre, table {
margin-bottom: 4px; // 1/4 of the non-compact margin-bottom
}
}
} }