Merge branch 'develop' of github.com:havfo/multiparty-meeting into feat/file-sharing

* 'develop' of github.com:havfo/multiparty-meeting:
  Create HOC to handle chat scrolling
  Support fading elements with a previously set opacity without flicker
  Add missing keyframe file
  Fade out fullscreen button
This commit is contained in:
Torjus
2018-08-02 09:48:07 +02:00
6 changed files with 101 additions and 25 deletions
+2 -2
View File
@@ -179,13 +179,13 @@
.room-controls {
visibility: hidden;
animation: fade-out 0.5s;
animation: fade-out 0.3s;
opacity: 0;
&.visible {
visibility: visible;
opacity: 1;
animation: fade-in 0.5s;
animation: fade-in 0.3s;
}
}
+1
View File
@@ -5,6 +5,7 @@ global-reset();
@import './mixins';
@import './fonts';
@import './reset';
@import './keyframes';
html {
height: 100%;
+21
View File
@@ -0,0 +1,21 @@
@keyframes fade-in {
from {
opacity: 0;
visibility: hidden;
}
to {
visibility: visible;
}
}
@keyframes fade-out {
from {
visibility: visible;
}
to {
opacity: 0;
visibility: hidden;
}
}