mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 20:38:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Weblate 2018-05-09 16:12:19 +00:00
commit bd2cf3bca8
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -266,6 +266,19 @@ form.mx_Custom_Widget_Form div {
right: 0;
}
.mx_AppLoading_spinner_fadeIn {
animation-fill-mode: backwards;
animation-duration: 200ms;
animation-delay: 500ms;
animation-name: mx_AppLoading_spinner_fadeIn_animation;
}
@keyframes mx_AppLoading_spinner_fadeIn_animation {
from { opacity: 0 }
to { opacity: 1 }
}
.mx_AppLoading iframe {
display: none;
}

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

@ -534,7 +534,7 @@ export default class AppTile extends React.Component {
if (this.props.show) {
const loadingElement = (
<div>
<div className="mx_AppLoading_spinner_fadeIn">
<MessageSpinner msg='Loading...' />
</div>
);