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

Commit 9319f07

Browse files
author
Germain Souquet
committed
Revert "Fix threads with bubbles rendering (#6971)"
This reverts commit a2bc090.
1 parent 37949ef commit 9319f07

File tree

3 files changed

+2
-26
lines changed

3 files changed

+2
-26
lines changed

res/css/views/rooms/_EventBubbleTile.scss

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ limitations under the License.
2828
margin-left: 49px;
2929
margin-right: 100px;
3030
font-size: $font-14px;
31-
flex-direction: column;
32-
display: flex;
33-
34-
.mx_ThreadInfo {
35-
max-width: 100%;
36-
}
3731

3832
&.mx_EventTile_continuation {
3933
margin-top: 2px;
@@ -91,8 +85,6 @@ limitations under the License.
9185
}
9286

9387
&[data-self=false] {
94-
align-items: flex-start;
95-
9688
.mx_EventTile_line {
9789
border-bottom-right-radius: var(--cornerRadius);
9890
}
@@ -106,18 +98,11 @@ limitations under the License.
10698
}
10799

108100
--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-
}
116101
}
117102
&[data-self=true] {
118-
align-items: flex-end;
119103
.mx_EventTile_line {
120104
border-bottom-left-radius: var(--cornerRadius);
105+
float: right;
121106
> a {
122107
left: auto;
123108
right: -68px;
@@ -147,13 +132,6 @@ limitations under the License.
147132
}
148133

149134
--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-
}
157135
}
158136

159137
.mx_EventTile_line {

res/css/views/rooms/_EventTile.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,8 +690,6 @@ $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;
695693

696694
&:hover, &-active {
697695
cursor: pointer;

src/components/views/rooms/EventTile.tsx

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

0 commit comments

Comments
 (0)