From d7f489b68e1f7973bf538c5cc8aadf0e2912bfe2 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Mon, 13 Jul 2020 11:19:37 -0500
Subject: [PATCH] users: get rid of the .with-style class.

Replace with `body[data-current-user-style-usernames="true"]` instead.
---
 app/helpers/application_helper.rb             |  1 -
 .../src/javascripts/autocomplete.js.erb       |  3 --
 .../src/styles/common/user_styles.scss        | 36 ++++++++++---------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 26be0501f..b1fdc0816 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -190,7 +190,6 @@ module ApplicationHelper
     user_class += " user-post-approver" if user.can_approve_posts?
     user_class += " user-post-uploader" if user.can_upload_free?
     user_class += " user-banned" if user.is_banned?
-    user_class += " with-style" if CurrentUser.user.style_usernames?
     link_to(user.pretty_name, user_path(user), :class => user_class)
   end
 
diff --git a/app/javascript/src/javascripts/autocomplete.js.erb b/app/javascript/src/javascripts/autocomplete.js.erb
index afe3a854a..ae493b63b 100644
--- a/app/javascript/src/javascripts/autocomplete.js.erb
+++ b/app/javascript/src/javascripts/autocomplete.js.erb
@@ -249,9 +249,6 @@ Autocomplete.render_item = function(list, item) {
   } else if (item.type === "user") {
     var level_class = "user-" + item.level.toLowerCase();
     $link.addClass(level_class);
-    if (CurrentUser.data("style-usernames")) {
-      $link.addClass("with-style");
-    }
   } else if (item.type === "pool") {
     $link.addClass("pool-category-" + item.category);
   }
diff --git a/app/javascript/src/styles/common/user_styles.scss b/app/javascript/src/styles/common/user_styles.scss
index 8c92cba98..52cc6453f 100644
--- a/app/javascript/src/styles/common/user_styles.scss
+++ b/app/javascript/src/styles/common/user_styles.scss
@@ -1,23 +1,25 @@
-a.user-admin.with-style {
-  color: var(--user-admin-color);
-}
+body[data-current-user-style-usernames="true"] {
+  a.user-admin {
+    color: var(--user-admin-color);
+  }
 
-a.user-moderator.with-style {
-  color: var(--user-moderator-color);
-}
+  a.user-moderator {
+    color: var(--user-moderator-color);
+  }
 
-a.user-builder.with-style {
-  color: var(--user-builder-color);
-}
+  a.user-builder {
+    color: var(--user-builder-color);
+  }
 
-a.user-platinum.with-style {
-  color: var(--user-platinum-color);
-}
+  a.user-platinum {
+    color: var(--user-platinum-color);
+  }
 
-a.user-gold.with-style {
-  color: var(--user-gold-color);
-}
+  a.user-gold {
+    color: var(--user-gold-color);
+  }
 
-a.user-member.with-style {
-  color: var(--user-member-color);
+  a.user-member {
+    color: var(--user-member-color);
+  }
 }