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

Fix position of timestamp on the chat panel in IRC layout and message edits history modal window #8464

Merged
merged 3 commits into from
May 7, 2022
Merged

Fix position of timestamp on the chat panel in IRC layout and message edits history modal window #8464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00c8641
Fix timestamp's position on the chat panel with a maximized widget in…
luixxiul Apr 30, 2022
fd68d35
Merge branch 'develop' into TimelineCard_IRCLayout
luixxiul May 6, 2022
5022953
Merge branch 'develop' into TimelineCard_IRCLayout
luixxiul May 7, 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
6 changes: 6 additions & 0 deletions res/css/views/dialogs/_MessageEditHistoryDialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ limitations under the License.
text-decoration: underline;
}

.mx_EventTile {
.mx_MessageTimestamp {
position: absolute;
}
}

.mx_EventTile_line, .mx_EventTile_content {
margin-right: 0px;
}
Expand Down
1 change: 1 addition & 0 deletions res/css/views/messages/_MessageTimestamp.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ limitations under the License.
color: $event-timestamp-color;
font-size: $font-10px;
font-variant-numeric: tabular-nums;
width: $MessageTimestamp_width;
}
18 changes: 13 additions & 5 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 @@ -51,31 +51,39 @@ limitations under the License.
}

.mx_EventTile:not([data-layout="bubble"]) {
$left-gutter: 36px;

.mx_EventTile_line {
padding-left: 36px;
padding-right: 36px;
padding-inline-start: $left-gutter;
padding-inline-end: 36px;
}

.mx_DisambiguatedProfile,
.mx_ReactionsRow,
.mx_ThreadSummary {
margin-inline-start: $left-gutter;
}

.mx_ReactionsRow {
padding: 0;

// See margin setting of ReactionsRow on _EventTile.scss
margin-left: 36px;
margin-right: 8px;
}

.mx_ThreadSummary {
margin-left: 36px;
margin-right: 0;
max-width: min(calc(100% - 36px), 600px);
}

.mx_EventTile_avatar {
position: absolute; // for IRC layout
top: 12px;
left: -3px;
}

.mx_MessageTimestamp {
position: absolute; // for modern layout and IRC layout
right: -4px;
left: auto;
}
Expand All @@ -86,7 +94,7 @@ limitations under the License.

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

.mx_EventTile_avatar {
Expand Down
3 changes: 1 addition & 2 deletions res/css/views/rooms/_GroupLayout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ $left-gutter: 64px;
}

.mx_MessageTimestamp {
position: absolute;
width: $MessageTimestamp_width;
position: absolute; // for modern layout
}

.mx_EventTile_line, .mx_EventTile_reply {
Expand Down
6 changes: 2 additions & 4 deletions res/css/views/rooms/_IRCLayout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ limitations under the License.
*/

$icon-width: 14px;
$timestamp-width: 45px;
$right-padding: 5px;
$irc-line-height: $font-18px;

Expand All @@ -28,7 +27,7 @@ $irc-line-height: $font-18px;
// timestamps are links which shouldn't be underlined
> a {
text-decoration: none;
min-width: 45px;
min-width: $MessageTimestamp_width;
}

display: flex;
Expand Down Expand Up @@ -85,7 +84,6 @@ $irc-line-height: $font-18px;

.mx_MessageTimestamp {
font-size: $font-10px;
width: $timestamp-width;
text-align: right;
}

Expand Down Expand Up @@ -141,7 +139,7 @@ $irc-line-height: $font-18px;

.mx_GenericEventListSummary {
> .mx_EventTile_line {
padding-left: calc(var(--name-width) + $icon-width + $timestamp-width + 3 * $right-padding); // 15 px of padding
padding-left: calc(var(--name-width) + $icon-width + $MessageTimestamp_width + 3 * $right-padding); // 15 px of padding
}

.mx_GenericEventListSummary_avatars {
Expand Down