mirror of https://github.com/vector-im/riot-web
Merge remote-tracking branch 'origin/develop' into develop
commit
bd2cf3bca8
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue