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

Merge pull request #2071 from matrix-org/dbkr/persistedelement_border

Browse source 
Fix border around persisted widgets
This commit is contained in:
Bruno Windels 2018-07-20 12:23:02 +01:00 committed by GitHub
commit 6f278ceab0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/css/views/rooms/_AppsDrawer.scss
View file

@ -61,6 +61,10 @@ limitations under the License.
background-color: $dialog-background-bg-color;
}
.mx_AppTile_persistedWrapper {
height: 280px;
}
.mx_AppTile:last-child {
margin-right: 1px;
}

8
src/components/views/elements/AppTile.js
View file

@ -575,9 +575,13 @@ export default class AppTile extends React.Component {
// re-mounted later when we do.
if (this.props.whitelistCapabilities.includes('m.always_on_screen')) {
const PersistedElement = sdk.getComponent("elements.PersistedElement");
appTileBody = <PersistedElement persistKey={this._persistKey}>
// Also wrap the PersistedElement in a div to fix the height, otherwise
// AppTile's border is in the wrong place
appTileBody = <div className="mx_AppTile_persistedWrapper">
<PersistedElement persistKey={this._persistKey}>
{appTileBody}
</PersistedElement>;
</PersistedElement>
</div>;
}
}
} else {