From 7bdabdf2b4b3f6a7116a080919690e3ec0ea42b0 Mon Sep 17 00:00:00 2001 From: Cinder Date: Thu, 25 Jul 2024 14:21:32 -0700 Subject: [PATCH] [CSS] Clean up colors and implement colorblind palettes (#682) --- app/helpers/tags_helper.rb | 2 +- app/helpers/takedowns_helper.rb | 8 ++-- .../src/javascripts/replacement_uploader.vue | 2 +- .../src/javascripts/uploader/file_input.vue | 4 +- .../src/javascripts/uploader/file_preview.vue | 4 +- .../src/javascripts/uploader/sources.vue | 2 +- .../src/javascripts/uploader/uploader.vue.erb | 12 +++--- app/javascript/src/styles/base.scss | 2 + app/javascript/src/styles/base/_base.scss | 12 ------ app/javascript/src/styles/base/_colors.scss | 33 ++++---------- app/javascript/src/styles/base/_palette.scss | 43 +++++++++++++++++++ app/javascript/src/styles/base/_themable.scss | 3 ++ .../src/styles/common/_helper_classes.scss | 14 +++--- .../src/styles/common/_helper_palette.scss | 17 ++++++++ app/javascript/src/styles/common/_scores.scss | 18 ++++---- .../src/styles/common/containers.scss | 23 +++------- app/javascript/src/styles/specific/blips.scss | 2 +- .../src/styles/specific/comments.scss | 2 +- app/javascript/src/styles/specific/forum.scss | 12 +++--- app/javascript/src/styles/specific/posts.scss | 6 +-- .../src/styles/specific/tickets.scss | 9 ++++ .../src/styles/specific/user_feedback.scss | 20 ++++----- .../styles/themes/_palette_deutranomaly.scss | 31 +++++++++++++ .../styles/themes/_palette_tritanomaly.scss | 32 ++++++++++++++ app/views/layouts/_theme_include.html.erb | 2 + .../user/email_changes/new.html.erb | 2 +- app/views/static/theme.html.erb | 19 +++++++- app/views/tag_relationships/_listing.html.erb | 2 +- app/views/takedowns/_editor.html.erb | 4 +- app/views/takedowns/index.html.erb | 2 +- app/views/takedowns/show.html.erb | 22 +++++----- app/views/tickets/index.html.erb | 4 +- app/views/tickets/types/_blip.html.erb | 6 +-- app/views/tickets/types/_comment.html.erb | 6 +-- app/views/tickets/types/_forum.html.erb | 6 +-- app/views/uploads/new.html.erb | 4 +- app/views/user_votes/_common_index.html.erb | 6 +-- app/views/users/new.html.erb | 2 +- 38 files changed, 257 insertions(+), 143 deletions(-) create mode 100644 app/javascript/src/styles/base/_palette.scss create mode 100644 app/javascript/src/styles/common/_helper_palette.scss create mode 100644 app/javascript/src/styles/themes/_palette_deutranomaly.scss create mode 100644 app/javascript/src/styles/themes/_palette_tritanomaly.scss diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb index 7d9324181..c441f8b81 100644 --- a/app/helpers/tags_helper.rb +++ b/app/helpers/tags_helper.rb @@ -2,7 +2,7 @@ module TagsHelper def format_transitive_item(transitive) - html = "#{transitive[0].to_s.titlecase} ".html_safe + html = "#{transitive[0].to_s.titlecase} ".html_safe if transitive[0] == :alias html << "#{transitive[2]} -> #{transitive[3]} will become #{transitive[2]} -> #{transitive[4]}" else diff --git a/app/helpers/takedowns_helper.rb b/app/helpers/takedowns_helper.rb index 23eb2c208..062991a0b 100644 --- a/app/helpers/takedowns_helper.rb +++ b/app/helpers/takedowns_helper.rb @@ -4,10 +4,10 @@ module TakedownsHelper def pretty_takedown_status(takedown) status = takedown.status.capitalize classes = { - "inactive" => "sect_grey", - "denied" => "sect_red", - "partial" => "sect_green", - "approved" => "sect_green", + "inactive" => "background-grey", + "denied" => "background-red", + "partial" => "background-green", + "approved" => "background-green", } tag.td(status, class: classes[takedown.status]) end diff --git a/app/javascript/src/javascripts/replacement_uploader.vue b/app/javascript/src/javascripts/replacement_uploader.vue index 0980ad65f..56e6ea3a4 100644 --- a/app/javascript/src/javascripts/replacement_uploader.vue +++ b/app/javascript/src/javascripts/replacement_uploader.vue @@ -25,7 +25,7 @@ -
+
{{ errorMessage }}
diff --git a/app/javascript/src/javascripts/uploader/file_input.vue b/app/javascript/src/javascripts/uploader/file_input.vue index 8b06db463..3f63fa168 100644 --- a/app/javascript/src/javascripts/uploader/file_input.vue +++ b/app/javascript/src/javascripts/uploader/file_input.vue @@ -1,7 +1,7 @@