Merge branch 'master' into mw_migrate_video_realm

Author: michelinewu

app/components-react/editor/elements/mixer/GLVolmeters.tsx

@@ -11,8 +11,9 @@ import { assertIsDefined, getDefined } from 'util/properties-type-guards';
 // Configuration
 const CHANNEL_HEIGHT = 3;
 const SPACE_BETWEEN_CHANNELS = 2;
+// When height of audio mixer elements changes, these paddings values also should be updated
 const PADDING_TOP = 39;
-const PADDING_BOTTOM = 49;
+const PADDING_BOTTOM = 57;
 const PEAK_WIDTH = 4;
 const PEAK_HOLD_CYCLES = 100;
 const WARNING_LEVEL = -20;
@@ -375,11 +376,7 @@ class GLVolmetersController {
       offsetTop += PADDING_TOP;
       const volmeter = this.subscriptions[sourceId];
       this.drawVolmeterWebgl(volmeter, offsetTop);
-
-      offsetTop +=
-        CHANNEL_HEIGHT * volmeter.channelsCount +
-        SPACE_BETWEEN_CHANNELS * (volmeter.channelsCount - 1) +
-        PADDING_BOTTOM;
+      offsetTop += PADDING_BOTTOM;
     });
   }
 

app/components-react/highlighter/ClipPreview.m.less

@@ -110,6 +110,7 @@
   background-color: #00000070;
   border-radius: 4px;
   color: white;
+  font-size: 14px;
 }
 
 .flame-hypescore-wrapper {