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

Fix: Message shield alignment is not right. #11703

Merged
merged 4 commits into from
Oct 17, 2023
Merged

Fix: Message shield alignment is not right. #11703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27d6997
Message shield alignment fixed
manancodes Oct 3, 2023
21b4e03
Alignment fixed in all layouts
manancodes Oct 5, 2023
d84f2b8
Fixed for all font sizes
manancodes Oct 16, 2023
da156ef
Merge branch 'develop' into manancodes/Message_shield_alignment
manancodes Oct 16, 2023
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
3 changes: 3 additions & 0 deletions res/css/views/rooms/_EventBubbleTile.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,9 @@ limitations under the License.

.mx_EventTile_e2eIcon {
flex-shrink: 0; /* keep it at full size */

// Keep height equal to text for shield alignment, additional 2px because of 1px padding on text
height: calc($font-18px + 2px);
}
}

Expand Down
9 changes: 6 additions & 3 deletions res/css/views/rooms/_EventTile.pcss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,11 @@ $left-gutter: 64px;
}

.mx_EventTile_e2eIcon {
inset: 6px 0 0 44px;
inset: 0 0 0 44px;

// Keep height equal to text for alignment
height: var(--EventTile_group_line-line-height);
margin: 1px;
}

.mx_EventTile_msgOption {
Expand Down Expand Up @@ -1350,7 +1354,6 @@ $left-gutter: 64px;
.mx_EventTile[data-layout="group"] {
--MatrixChat_useCompactLayout_group-padding-top: $spacing-4;
--MatrixChat_useCompactLayout-top-avatar: 2px;
--MatrixChat_useCompactLayout-top-e2eIcon: 3px;
--MatrixChat_useCompactLayout_line-spacing-block: 0px;

padding-top: var(--MatrixChat_useCompactLayout_group-padding-top);
Expand Down Expand Up @@ -1410,7 +1413,7 @@ $left-gutter: 64px;
}

.mx_EventTile_e2eIcon {
top: var(--MatrixChat_useCompactLayout-top-e2eIcon);
margin: 0px;
}

.mx_DisambiguatedProfile {
Expand Down