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

Reduce bottom margin of ReplyChain on compact modern layout #8972

Merged
merged 4 commits into from
Mar 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 res/css/views/elements/_ReplyChain.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
*/

.mx_ReplyChain {
margin: 0 0 $spacing-8 0;
margin: 0; // Reset default blockquote margin
padding-left: 10px; // TODO: Use a spacing variable
border-left: 2px solid var(--username-color); // TODO: Use a spacing variable
border-radius: 2px; // TODO: Use a spacing variable
Expand Down
12 changes: 12 additions & 0 deletions res/css/views/rooms/_EventTile.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,10 @@ $left-gutter: 64px;
.mx_EventTileBubble {
margin-inline: auto;
}

.mx_ReplyChain {
margin-bottom: $spacing-8;
}
}

&[data-layout="irc"] {
Expand All @@ -291,6 +295,10 @@ $left-gutter: 64px;
}
}

.mx_ReplyChain {
margin: 0;
}

.mx_ReplyTile .mx_EventTileBubble {
left: unset; /* Cancel the value specified above for the tile inside ReplyTile */
}
Expand Down Expand Up @@ -1248,6 +1256,10 @@ $left-gutter: 64px;
padding-block: var(--MatrixChat_useCompactLayout_line-spacing-block);
}

.mx_ReplyChain {
margin-bottom: $spacing-4;
}

&.mx_EventTile_info {
padding-top: 0; /* same as the padding for non-compact .mx_EventTile.mx_EventTile_info */
font-size: $font-13px;
Expand Down
1 change: 0 additions & 1 deletion res/css/views/rooms/_IRCLayout.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ $irc-line-height: $font-18px;
}

.mx_ReplyChain {
margin: 0;
.mx_DisambiguatedProfile {
order: unset;
width: unset;
Expand Down