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

Tidy style rules of TimelineCard up #8315

Merged
turt2live merged 10 commits into from
Apr 14, 2022
Merged

Tidy style rules of TimelineCard up #8315

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
726b035
.mx_EventTile_line
luixxiul Apr 14, 2022
60139e0
.mx_ReactionsRow
luixxiul Apr 14, 2022
e0190e5
.mx_ThreadInfo
luixxiul Apr 14, 2022
77843b7
.mx_EventTile_avatar
luixxiul Apr 14, 2022
a18c10a
.mx_MessageTimestamp
luixxiul Apr 14, 2022
3137bc2
.mx_EventTile_msgOption
luixxiul Apr 14, 2022
a14c493
&.mx_EventTile_info
luixxiul Apr 14, 2022
a74ddb6
.mx_GroupLayout
luixxiul Apr 14, 2022
e92ce10
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-…
luixxiul Apr 14, 2022
dad0c49
lint
luixxiul Apr 14, 2022
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
70 changes: 38 additions & 32 deletions res/css/views/right_panel/_TimelineCard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,21 +68,48 @@ limitations under the License.
margin-left: 36px;
margin-right: 8px;
}
}

.mx_EventTile:not([data-layout="bubble"]) .mx_ThreadInfo {
margin-left: 36px;
margin-right: 0;
max-width: min(calc(100% - 36px), 600px);
}
.mx_ThreadInfo {
margin-left: 36px;
margin-right: 0;
max-width: min(calc(100% - 36px), 600px);
}

.mx_GroupLayout .mx_EventTile > .mx_DisambiguatedProfile {
margin-left: 36px;
.mx_EventTile_avatar {
top: 12px;
left: -3px;
}

.mx_MessageTimestamp {
right: -4px;
left: auto;
}

.mx_EventTile_msgOption {
margin-right: 2px;
}

&.mx_EventTile_info {
.mx_EventTile_line {
padding-left: 36px;
}

.mx_EventTile_avatar {
left: 18px;
}
}
}

.mx_EventTile:not([data-layout="bubble"]) .mx_EventTile_avatar {
top: 12px;
left: -3px;
.mx_GroupLayout {
.mx_EventTile {
> .mx_DisambiguatedProfile {
margin-left: 36px;
}

.mx_EventTile_line {
padding-bottom: 8px;
}
}
}

.mx_CallEvent_wrapper {
Expand All @@ -93,36 +120,15 @@ limitations under the License.
}
}

.mx_EventTile:not([data-layout="bubble"]) .mx_MessageTimestamp {
right: -4px;
left: auto;
}

.mx_EventTile:not([data-layout="bubble"]) .mx_EventTile_msgOption {
margin-right: 2px;
}

.mx_GenericEventListSummary:not([data-layout=bubble]) .mx_EventTile_line,
.mx_GenericEventListSummary:not([data-layout=bubble]) > .mx_GenericEventListSummary_unstyledList > .mx_EventTile_info .mx_EventTile_avatar ~ .mx_EventTile_line {
padding-left: 36px;
}

.mx_GroupLayout .mx_EventTile .mx_EventTile_line {
padding-bottom: 8px;
}

.mx_EventTile_readAvatars {
top: -10px;
}

.mx_EventTile:not([data-layout="bubble"]).mx_EventTile_info .mx_EventTile_line {
padding-left: 36px;
}

.mx_EventTile:not([data-layout="bubble"]).mx_EventTile_info .mx_EventTile_avatar {
left: 18px;
}

.mx_WhoIsTypingTile {
margin-left: -12px; // undo padding on the message list
}
Expand Down