mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 02:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6979 from matrix-org/gsouquet/fix-19431

Browse source
This commit is contained in:
Germain 2021-10-19 10:20:33 +01:00 committed by GitHub
commit 47da819ce0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
res/css/views/rooms/_EventBubbleTile.scss
View file

@ -28,11 +28,10 @@ limitations under the License.
margin-left: 49px;
margin-right: 100px;
font-size: $font-14px;
flex-direction: column;
display: flex;
.mx_ThreadInfo {
max-width: 100%;
clear: both;
width: fit-content;
}
&.mx_EventTile_continuation {
@ -91,8 +90,6 @@ limitations under the License.
}
&[data-self=false] {
align-items: flex-start;
.mx_EventTile_line {
border-bottom-right-radius: var(--cornerRadius);
}
@ -106,23 +103,22 @@ 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;
}
}
.mx_ThreadInfo {
float: right;
margin-right: calc(-1 * var(--gutterSize));
}
.mx_SenderProfile {
display: none;
}
@ -147,13 +143,6 @@ 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 {

3
res/css/views/rooms/_EventTile.scss
View file

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

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

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