Merge remote-tracking branch 'origin/master' into emojireacts

app/gabsocial/features/video/index.js

@@ -374,8 +374,21 @@ class Video extends React.PureComponent {
     this.props.onCloseVideo();
   }
 
+  getPreload = () => {
+    const { startTime, detailed } = this.props;
+    const { dragging, fullscreen } = this.state;
+
+    if (startTime || fullscreen || dragging) {
+      return 'auto';
+    } else if (detailed) {
+      return 'metadata';
+    } else {
+      return 'none';
+    }
+  }
+
   render() {
-    const { preview, src, inline, startTime, onOpenVideo, onCloseVideo, intl, alt, detailed, sensitive, link, aspectRatio } = this.props;
+    const { preview, src, inline, onOpenVideo, onCloseVideo, intl, alt, detailed, sensitive, link, aspectRatio } = this.props;
     const { containerWidth, currentTime, duration, volume, buffer, dragging, paused, fullscreen, hovered, muted, revealed } = this.state;
     const progress = (currentTime / duration) * 100;
 
@@ -400,16 +413,6 @@ class Video extends React.PureComponent {
       playerStyle.height = height;
     }
 
-    let preload;
-
-    if (startTime || fullscreen || dragging) {
-      preload = 'auto';
-    } else if (detailed) {
-      preload = 'metadata';
-    } else {
-      preload = 'none';
-    }
-
     let warning;
 
     if (sensitive) {
@@ -435,7 +438,7 @@ class Video extends React.PureComponent {
           ref={this.setVideoRef}
           src={src}
           poster={preview}
-          preload={preload}
+          // preload={this.getPreload()}
           loop
           role='button'
           tabIndex='0'

app/styles/gabsocial/components/sidebar-menu.scss

@@ -1,11 +1,10 @@
 .sidebar-menu {
   display: flex;
-  position: fixed;
+  position: absolute;
   flex-direction: column;
   width: 275px;
-  height: 100vh;
+  height: auto;
   top: 0;
-  bottom: 0;
   left: 0;
   background-color: #fff;
   transform: translateX(-275px);