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

Merge pull request #2746 from matrix-org/bwindels/flairnolayout

Browse source 
Prevent flair pushing timeline downwards
This commit is contained in:
Bruno Windels 2019-03-05 15:34:09 +01:00 committed by GitHub
commit 96196d8c3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,12 +58,16 @@ limitations under the License.
.mx_EventTile .mx_SenderProfile .mx_Flair {
opacity: 0.7;
margin-left: 5px;
}
display: inline-block;
vertical-align: top;
height: 16px;
overflow: hidden;
.mx_EventTile .mx_SenderProfile .mx_Flair img {
vertical-align: -2px;
margin-right: 2px;
border-radius: 8px;
img {
vertical-align: -2px;
margin-right: 2px;
border-radius: 8px;
}
}
.mx_EventTile .mx_MessageTimestamp {

2
src/components/views/elements/Flair.js
View file

@ -117,7 +117,7 @@ export default class Flair extends React.Component {
render() {
if (this.state.profiles.length === 0) {
return <div />;
return <span className="mx_Flair" />;
}
const avatars = this.state.profiles.map((profile, index) => {
return <FlairAvatar key={index} groupProfile={profile} />;