diff options
author | David Yip <yipdw@member.fsf.org> | 2017-09-09 23:56:21 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-09-09 23:56:21 -0500 |
commit | 67ad4533732f2e5cfc8c7f7ad3abaf7a5eb2647b (patch) | |
tree | 011ea44fc94bcff6f8ec4e23c3edf887359243d2 /app/javascript/styles/components.scss | |
parent | 3dff74eecf5387b92b862893248710d2efb90eec (diff) | |
parent | 90712d42933efd9978e4bbae82f81a4650aa4d84 (diff) |
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss
Diffstat (limited to 'app/javascript/styles/components.scss')
-rw-r--r-- | app/javascript/styles/components.scss | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss index 557355260..16a87fcd8 100644 --- a/app/javascript/styles/components.scss +++ b/app/javascript/styles/components.scss @@ -2716,22 +2716,6 @@ button.icon-button.active i.fa-retweet { } } -.media-spoiler__video { - align-items: center; - background: $base-overlay-background; - color: $primary-text-color; - cursor: pointer; - display: flex; - flex-direction: column; - border: 0; - width: 100%; - height: 100%; - justify-content: center; - position: relative; - text-align: center; - z-index: 100; -} - .media-spoiler__warning { display: block; font-size: 14px; @@ -4302,6 +4286,9 @@ button.icon-button.active i.fa-retweet { margin-left: -68px; width: calc(100% + 80px); } + + border: 0; + display: block; } .media-spoiler-video-play-icon { |