mirror of
https://github.com/vector-im/element-web.git
synced 2024-09-09 22:55:12 +00:00
Merge remote-tracking branch 'origin/develop' into release-v0.9.8
This commit is contained in:
commit
d5b1db064f
3 changed files with 12 additions and 1 deletions
|
@ -133,9 +133,10 @@ limitations under the License.
|
|||
.mx_EventTile_redacted .mx_EventTile_line .mx_UnknownBody {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: 73px;
|
||||
height: 36px;
|
||||
background-image: $event-redacted-img;
|
||||
background-repeat: no-repeat;
|
||||
background-size: contain;
|
||||
}
|
||||
|
||||
.mx_EventTile.mx_EventTile_redacted .mx_EventTile_line {
|
||||
|
|
|
@ -139,4 +139,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
|
|||
requestNotificationPermission() : Promise {
|
||||
return q('granted');
|
||||
}
|
||||
|
||||
reload() {
|
||||
electron.remote.getCurrentWebContents().reload();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -206,4 +206,10 @@ export default class WebPlatform extends VectorBasePlatform {
|
|||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
reload() {
|
||||
// forceReload=false since we don't really need new HTML/JS files
|
||||
// we just need to restart the JS runtime.
|
||||
window.location.reload(false);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue