From 852d86b9e33a0a69e30e914d8ed7d61ef9f73c15 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Mon, 10 Dec 2018 22:26:48 -0800
Subject: [PATCH] fix: fix media in grouped mode in focused threads (#774)
---
routes/_components/AutoplayVideo.html | 13 +++----------
routes/_components/LazyImage.html | 4 ++--
routes/_components/NonAutoplayGifv.html | 4 ++--
routes/_components/status/Status.html | 1 +
4 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/routes/_components/AutoplayVideo.html b/routes/_components/AutoplayVideo.html
index d9144ea9..14fb6a77 100644
--- a/routes/_components/AutoplayVideo.html
+++ b/routes/_components/AutoplayVideo.html
@@ -1,8 +1,8 @@
-<div class="autoplay-wrapper {$largeInlineMedia ? '' : 'fixed-size'}"
+<div class="autoplay-wrapper {$largeInlineMedia ? '' : 'autoplay-video-fixed-size'}"
style="width: {width}px; height: {height}px;"
>
<video
- class="autoplay-video {$largeInlineMedia ? '' : 'fixed-size'}"
+ class="autoplay-video {$largeInlineMedia ? '' : 'autoplay-video-fixed-size'}"
aria-label={ariaLabel || ''}
style="{focusStyle} background-image: url({poster}); "
{poster}
@@ -30,19 +30,12 @@
display: flex;
}
- .fixed-size {
+ .autoplay-video-fixed-size {
position: absolute;
width: 100%;
height: 100%;
overflow: hidden;
}
-
-
- .fixed-size {
- overflow: hidden;
- width: 100%;
- height: 100%;
- }
</style>
<script>
import { store } from '../_store/store'
diff --git a/routes/_components/LazyImage.html b/routes/_components/LazyImage.html
index 1c2ca2bb..95142606 100644
--- a/routes/_components/LazyImage.html
+++ b/routes/_components/LazyImage.html
@@ -1,4 +1,4 @@
-<div class="lazy-image {fillFixSize ? 'fixed-size': ''}" style={computedStyle} >
+<div class="lazy-image {fillFixSize ? 'lazy-image-fixed-size': ''}" style={computedStyle} >
<img
class="{fillFixSize ? 'fixed-size-img': ''}"
aria-hidden={ariaHidden}
@@ -23,7 +23,7 @@
width: 100%;
height: 100%;
}
- .fixed-size {
+ .lazy-image-fixed-size {
position: absolute;
width: 100%;
height: 100%;
diff --git a/routes/_components/NonAutoplayGifv.html b/routes/_components/NonAutoplayGifv.html
index fe090c6c..7d3f893c 100644
--- a/routes/_components/NonAutoplayGifv.html
+++ b/routes/_components/NonAutoplayGifv.html
@@ -1,4 +1,4 @@
-<div class="non-autoplay-gifv {$largeInlineMedia ? '' : 'fixed-size'}"
+<div class="non-autoplay-gifv {$largeInlineMedia ? '' : 'non-autoplay-gifv-fixed-size'}"
style="width: {width}px; height: {height}px;"
on:mouseover="onMouseOver(event)"
ref:node
@@ -35,7 +35,7 @@
padding: 0;
}
- .fixed-size {
+ .non-autoplay-gifv-fixed-size {
position: absolute;
width: 100%;
height: 100%;
diff --git a/routes/_components/status/Status.html b/routes/_components/status/Status.html
index cb755d7c..07c20546 100644
--- a/routes/_components/status/Status.html
+++ b/routes/_components/status/Status.html
@@ -74,6 +74,7 @@
"spoiler-btn spoiler-btn"
"mentions mentions"
"content content"
+ "media-grp media-grp"
"media media"
"details details"
"toolbar toolbar"