Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240

2021-06-28 21:00:36 -06:00
parent 964a97d59e
commit d6cf2346fe
5 changed files with 68 additions and 81 deletions
@@ -27,9 +27,14 @@ limitations under the License.
    display: flex;
    align-items: center;

+    contain: content;
+
    .mx_Waveform {
        .mx_Waveform_bar {
            background-color: $voice-record-waveform-incomplete-fg-color;
+            height: 100%;
+            /* Variable set by a JS component */
+            transform: scaleY(max(0.05, var(--barHeight)));

            &.mx_Waveform_bar_100pct {
                // Small animation to remove the mechanical feel of progress