From 13fc65953b5b93891f08ba447939d23a444f59c3 Mon Sep 17 00:00:00 2001
From: Nick Taylor <nick@forem.com>
Date: Fri, 21 Jan 2022 08:56:22 -0500
Subject: [PATCH] Removed font-awesome from the admin section (#16239)

---
 app/views/admin/comments/index.html.erb | 8 ++++----
 app/views/layouts/admin.html.erb        | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb
index 0fccede1f..e28506c44 100644
--- a/app/views/admin/comments/index.html.erb
+++ b/app/views/admin/comments/index.html.erb
@@ -16,7 +16,7 @@
                          attributes: %w[href strong em ref rel src title alt class] %>
 
           </p>
-          <h5 class="card-title text-center">
+          <div class="mb-2 mt-2 flex justify-center">
             <% if comment.user %>
               <a href="<%= comment.user.path %>" target="_blank" rel="noopener">
                 <img class="rounded" height="30" src="<%= comment.user.profile_image_url_for(length: 50) %>" alt="<%= comment.user.username %> profile" loading="lazy" /> <%= comment.user.username %>
@@ -24,11 +24,11 @@
             <% end %>
             <% if comment.user && comment.user.twitter_username.present? %>
               |
-              <a href="https://twitter.com/<%= comment.user.twitter_username %>">
-                <i class="fa fa-twitter" aria-hidden="true"></i> @<%= comment.user.twitter_username %>
+              <a href="https://twitter.com/<%= comment.user.twitter_username %>" class="inline-flex items-center">
+                <%= crayons_icon_tag(:twitter, aria_hidden: true) %> @<%= comment.user.twitter_username %>
               </a>
             <% end %>
-          </h5>
+          </div>
           <div class="mt-3 d-flex justify-content-end">
             <a class="btn btn-primary" href="<%= comment.path %>" target="_blank" rel="noopener">View</a>
             <% if comment.reactions.where(user_id: current_user.id).empty? %>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index f7421fd52..ff318b33d 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -16,8 +16,7 @@
 
   <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
 
-  <!-- Bootstrap and FontAwesome -->
-  <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
+  <!-- Bootstrap -->
   <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.16/css/bootstrap-select.min.css" integrity="sha256-g19F2KOr/H58l6XdI/rhCdEK3NmB8OILHwP/QYBQ8M4=" crossorigin="anonymous" />
 
@@ -80,7 +79,7 @@
       <% flash.each do |type, message| %>
         <div class="alert alert-<%= type == "notice" || type == "success" ? "success" : "danger" %>">
           <button class="close" data-dismiss="alert" aria-label="Close">
-            <i class="fa fa-times" aria-hidden="true"></i>
+            <%= crayons_icon_tag(:x, aria_hidden: true) %>
           </button>
           <%= message %>
         </div>