mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-11-04 02:02:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Weblate 2018-07-20 11:23:07 +00:00
commit ad6397a7f4
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; background-color: $dialog-background-bg-color;
} }
.mx_AppTile_persistedWrapper {
height: 280px;
}
.mx_AppTile:last-child { .mx_AppTile:last-child {
margin-right: 1px; margin-right: 1px;
} }

10
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. // re-mounted later when we do.
if (this.props.whitelistCapabilities.includes('m.always_on_screen')) { if (this.props.whitelistCapabilities.includes('m.always_on_screen')) {
const PersistedElement = sdk.getComponent("elements.PersistedElement"); const PersistedElement = sdk.getComponent("elements.PersistedElement");
appTileBody = <PersistedElement persistKey={this._persistKey}> // Also wrap the PersistedElement in a div to fix the height, otherwise
{appTileBody} // AppTile's border is in the wrong place
</PersistedElement>; appTileBody = <div className="mx_AppTile_persistedWrapper">
<PersistedElement persistKey={this._persistKey}>
{appTileBody}
</PersistedElement>
</div>;
} }
} }
} else { } else {