From 625b5a567bb94a557572176357cd2381ac17a06d Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Wed, 15 Aug 2018 19:38:56 +0200
Subject: [PATCH] Get rid of the Content Warning rainbows (#8129)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Disable the animated rainbow text when the “Reduce motion†setting is set
* Get rid of the Content Warning rainbows
* Revert to default color for CWs in admin view
Since that colorscheme is apparently broken for some colorblind people.
* Use HTML5's details and summary for statuses with CWs in admin interface
---
app/javascript/styles/mastodon/tables.scss | 16 ++++------------
app/views/admin/reports/_status.html.haml | 12 +++++++-----
2 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss
index e54c55947e..c2206cf55d 100644
--- a/app/javascript/styles/mastodon/tables.scss
+++ b/app/javascript/styles/mastodon/tables.scss
@@ -1,9 +1,3 @@
-@keyframes Swag {
- 0% { background-position: 0% 0%; }
- 50% { background-position: 100% 0%; }
- 100% { background-position: 200% 0%; }
-}
-
.table {
width: 100%;
max-width: 100%;
@@ -191,14 +185,12 @@ a.table-action-link {
.status__content {
padding-top: 0;
+ summary {
+ display: list-item;
+ }
+
strong {
font-weight: 700;
- background: linear-gradient(to right, orange , yellow, green, cyan, blue, violet,orange , yellow, green, cyan, blue, violet);
- background-size: 200% 100%;
- -webkit-background-clip: text;
- background-clip: text;
- color: transparent;
- animation: Swag 2s linear 0s infinite;
}
}
}
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
index 5e174f312e..5b410ec84d 100644
--- a/app/views/admin/reports/_status.html.haml
+++ b/app/views/admin/reports/_status.html.haml
@@ -3,11 +3,13 @@
= f.check_box :status_ids, { multiple: true, include_hidden: false }, status.id
.batch-table__row__content
.status__content><
- - unless status.proper.spoiler_text.blank?
- %p><
- %strong> Content warning: #{Formatter.instance.format_spoiler(status.proper)}
-
- = Formatter.instance.format(status.proper, custom_emojify: true)
+ - if status.proper.spoiler_text.blank?
+ = Formatter.instance.format(status.proper, custom_emojify: true)
+ - else
+ %details<
+ %summary><
+ %strong> Content warning: #{Formatter.instance.format_spoiler(status.proper)}
+ = Formatter.instance.format(status.proper, custom_emojify: true)
- unless status.proper.media_attachments.empty?
- if status.proper.media_attachments.first.video?
--
GitLab