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

Commit 47da819

Browse files
authored
Merge pull request #6979 from matrix-org/gsouquet/fix-19431
2 parents 37949ef + df407ef commit 47da819

File tree

3 files changed

+11
-23
lines changed

3 files changed

+11
-23
lines changed

res/css/views/rooms/_EventBubbleTile.scss

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ limitations under the License.
2828
margin-left: 49px;
2929
margin-right: 100px;
3030
font-size: $font-14px;
31-
flex-direction: column;
32-
display: flex;
3331

3432
.mx_ThreadInfo {
35-
max-width: 100%;
33+
clear: both;
34+
width: fit-content;
3635
}
3736

3837
&.mx_EventTile_continuation {
@@ -91,8 +90,6 @@ limitations under the License.
9190
}
9291

9392
&[data-self=false] {
94-
align-items: flex-start;
95-
9693
.mx_EventTile_line {
9794
border-bottom-right-radius: var(--cornerRadius);
9895
}
@@ -106,23 +103,22 @@ limitations under the License.
106103
}
107104

108105
--backgroundColor: $eventbubble-others-bg;
109-
110-
.mx_ThreadInfo {
111-
align-self: flex-start;
112-
margin-top: 8px;
113-
margin-left: -10px;
114-
margin-bottom: 8px;
115-
}
116106
}
117107
&[data-self=true] {
118-
align-items: flex-end;
119108
.mx_EventTile_line {
120109
border-bottom-left-radius: var(--cornerRadius);
110+
float: right;
121111
> a {
122112
left: auto;
123113
right: -68px;
124114
}
125115
}
116+
117+
.mx_ThreadInfo {
118+
float: right;
119+
margin-right: calc(-1 * var(--gutterSize));
120+
}
121+
126122
.mx_SenderProfile {
127123
display: none;
128124
}
@@ -147,13 +143,6 @@ limitations under the License.
147143
}
148144

149145
--backgroundColor: $eventbubble-self-bg;
150-
151-
.mx_ThreadInfo {
152-
align-self: flex-end;
153-
margin-right: -14px;
154-
margin-top: 8px;
155-
margin-bottom: 4px;
156-
}
157146
}
158147

159148
.mx_EventTile_line {

res/css/views/rooms/_EventTile.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,8 +690,7 @@ $hover-select-border: 4px;
690690
color: $secondary-content;
691691
box-sizing: border-box;
692692
justify-content: flex-start;
693-
margin-right: 110px;
694-
margin-left: 64px;
693+
clear: both;
695694

696695
&:hover, &-active {
697696
cursor: pointer;

src/components/views/rooms/EventTile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1336,8 +1336,8 @@ export default class EventTile extends React.Component<IProps, IState> {
13361336
{ actionBar }
13371337
{ this.props.layout === Layout.IRC && (reactionsRow) }
13381338
</div>
1339-
{ this.props.layout !== Layout.IRC && (reactionsRow) }
13401339
{ this.renderThreadInfo() }
1340+
{ this.props.layout !== Layout.IRC && (reactionsRow) }
13411341
{ msgOption }
13421342
</>)
13431343
);

0 commit comments

Comments
 (0)