imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into matthew/slate

Browse source
This commit is contained in:
Matthew Hodgson 2018-05-13 19:50:55 +01:00
commit 721410b710
30 changed files with 908 additions and 278 deletions
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
res/css/views/rooms/_MessageComposer.scss
View file

@ -34,7 +34,7 @@ limitations under the License.
width: 100%;
}
.mx_MessageComposer_row div:last-child{
.mx_MessageComposer_row > div:last-child{
padding-right: 0;
}