OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Prevent flair pushing timeline downwards
pull/21833/head
Bruno Windels 2019-03-05 15:34:09 +01:00 committed by GitHub
parent 534ca0e18a 624572daa9
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

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

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

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

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