Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 05:04:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix threads with bubbles rendering (#6971)"

Browse Source 
This reverts commit a2bc090607.
This commit is contained in:
Germain Souquet 2021-10-19 09:16:40 +01:00
parent 37949efb61
commit 9319f07291
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
res/css/views/rooms/_EventBubbleTile.scss
View File

@ -28,12 +28,6 @@ limitations under the License.
margin-left: 49px; margin-left: 49px;
margin-right: 100px; margin-right: 100px;
font-size: $font-14px; font-size: $font-14px;
flex-direction: column;
display: flex;
.mx_ThreadInfo {
max-width: 100%;
}
&.mx_EventTile_continuation { &.mx_EventTile_continuation {
margin-top: 2px; margin-top: 2px;
@ -91,8 +85,6 @@ limitations under the License.
} }
&[data-self=false] { &[data-self=false] {
align-items: flex-start;
.mx_EventTile_line { .mx_EventTile_line {
border-bottom-right-radius: var(--cornerRadius); border-bottom-right-radius: var(--cornerRadius);
} }
@ -106,18 +98,11 @@ limitations under the License.
} }
--backgroundColor: $eventbubble-others-bg; --backgroundColor: $eventbubble-others-bg;
.mx_ThreadInfo {
align-self: flex-start;
margin-top: 8px;
margin-left: -10px;
margin-bottom: 8px;
}
} }
&[data-self=true] { &[data-self=true] {
align-items: flex-end;
.mx_EventTile_line { .mx_EventTile_line {
border-bottom-left-radius: var(--cornerRadius); border-bottom-left-radius: var(--cornerRadius);
float: right;
> a { > a {
left: auto; left: auto;
right: -68px; right: -68px;
@ -147,13 +132,6 @@ limitations under the License.
} }
--backgroundColor: $eventbubble-self-bg; --backgroundColor: $eventbubble-self-bg;
.mx_ThreadInfo {
align-self: flex-end;
margin-right: -14px;
margin-top: 8px;
margin-bottom: 4px;
}
} }
.mx_EventTile_line { .mx_EventTile_line {

2
res/css/views/rooms/_EventTile.scss
View File

@ -690,8 +690,6 @@ $hover-select-border: 4px;
color: $secondary-content; color: $secondary-content;
box-sizing: border-box; box-sizing: border-box;
justify-content: flex-start; justify-content: flex-start;
margin-right: 110px;
margin-left: 64px;
&:hover, &-active { &:hover, &-active {
cursor: pointer; cursor: pointer;

2
src/components/views/rooms/EventTile.tsx
View File

@ -1335,9 +1335,9 @@ export default class EventTile extends React.Component<IProps, IState> {
{ keyRequestInfo } { keyRequestInfo }
{ actionBar } { actionBar }
{ this.props.layout === Layout.IRC && (reactionsRow) } { this.props.layout === Layout.IRC && (reactionsRow) }
{ this.renderThreadInfo() }
</div> </div>
{ this.props.layout !== Layout.IRC && (reactionsRow) } { this.props.layout !== Layout.IRC && (reactionsRow) }
{ this.renderThreadInfo() }
{ msgOption } { msgOption }
</>) </>)
); );