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

Fix threads with bubbles rendering #6971

Merged
merged 1 commit into from
Oct 18, 2021
Merged

Fix threads with bubbles rendering #6971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 23 additions & 1 deletion res/css/views/rooms/_EventBubbleTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ limitations under the License.
margin-left: 49px;
margin-right: 100px;
font-size: $font-14px;
flex-direction: column;
display: flex;

.mx_ThreadInfo {
max-width: 100%;
}

&.mx_EventTile_continuation {
margin-top: 2px;
Expand Down Expand Up @@ -85,6 +91,8 @@ limitations under the License.
}

&[data-self=false] {
align-items: flex-start;

.mx_EventTile_line {
border-bottom-right-radius: var(--cornerRadius);
}
Expand All @@ -98,11 +106,18 @@ limitations under the License.
}

--backgroundColor: $eventbubble-others-bg;

.mx_ThreadInfo {
align-self: flex-start;
margin-top: 8px;
margin-left: -10px;
margin-bottom: 8px;
}
}
&[data-self=true] {
align-items: flex-end;
.mx_EventTile_line {
border-bottom-left-radius: var(--cornerRadius);
float: right;
> a {
left: auto;
right: -68px;
Expand Down Expand Up @@ -132,6 +147,13 @@ limitations under the License.
}

--backgroundColor: $eventbubble-self-bg;

.mx_ThreadInfo {
align-self: flex-end;
margin-right: -14px;
margin-top: 8px;
margin-bottom: 4px;
}
}

.mx_EventTile_line {
Expand Down
2 changes: 2 additions & 0 deletions res/css/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,8 @@ $hover-select-border: 4px;
color: $secondary-content;
box-sizing: border-box;
justify-content: flex-start;
margin-right: 110px;
margin-left: 64px;

&:hover, &-active {
cursor: pointer;
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/rooms/EventTile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1335,9 +1335,9 @@ export default class EventTile extends React.Component<IProps, IState> {
{ keyRequestInfo }
{ actionBar }
{ this.props.layout === Layout.IRC && (reactionsRow) }
{ this.renderThreadInfo() }
</div>
{ this.props.layout !== Layout.IRC && (reactionsRow) }
{ this.renderThreadInfo() }
{ msgOption }
</>)
);
Expand Down