Merge pull request #476 from mitre-attack/upgrade-fontawesome

Upgrade Font Awesome
mitre-attack · Dec 18, 2023 · ba02431 · ba02431
2 parents 45e8f19 + 269350f
commit ba02431
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 321 deletions.
diff --git a/attack-theme/static/fonts/glyphicons-halflings-regular.eot b/attack-theme/static/fonts/glyphicons-halflings-regular.eot
diff --git a/attack-theme/static/fonts/glyphicons-halflings-regular.svg b/attack-theme/static/fonts/glyphicons-halflings-regular.svg
diff --git a/attack-theme/static/fonts/glyphicons-halflings-regular.ttf b/attack-theme/static/fonts/glyphicons-halflings-regular.ttf
diff --git a/attack-theme/static/fonts/glyphicons-halflings-regular.woff b/attack-theme/static/fonts/glyphicons-halflings-regular.woff
diff --git a/attack-theme/static/fonts/glyphicons-halflings-regular.woff2 b/attack-theme/static/fonts/glyphicons-halflings-regular.woff2
diff --git a/attack-theme/static/images/twitter.png b/attack-theme/static/images/twitter.png
diff --git a/attack-theme/static/style/_layouts.scss b/attack-theme/static/style/_layouts.scss
@@ -102,12 +102,6 @@ a {
     max-width: to-rem(1000);
 }
 
-.twitter-icon {
-    vertical-align: top;
-    width: to-rem(20);
-    height: to-rem(20);
-}
-
 .mitre-logo-wtrans {
     width: to-rem(144);
     height: to-rem(66);

diff --git a/attack-theme/static/style/_nav.scss b/attack-theme/static/style/_nav.scss
@@ -135,7 +135,7 @@
         display: inline-block;
     }
 
-    i.fa {
+    i.fa-solid {
         visibility: hidden;
         display: none;
         @media screen and (max-width: 47.9875rem) {

diff --git a/attack-theme/static/style/bootstrap-glyphicon.min.css b/attack-theme/static/style/bootstrap-glyphicon.min.css
diff --git a/attack-theme/templates/general/base-template.html b/attack-theme/templates/general/base-template.html
@@ -33,13 +33,12 @@
         <title>{{ title }}</title>
         <!-- Bootstrap CSS -->
         <link rel='stylesheet' href='/theme/style/bootstrap.min.css' />
-        <link rel='stylesheet' href='/theme/style/bootstrap-glyphicon.min.css' />
         <link rel='stylesheet' href='/theme/style/bootstrap-tourist.css' />
         <link rel='stylesheet' href='/theme/style/bootstrap-select.min.css' />
         {% assets "style/style.scss", filters="pyscss", output="style.min.css" %}
         <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ ASSET_URL }}">
         {% endassets %}
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
     {% endblock %}
 </head>
 
@@ -118,8 +117,7 @@
                                 <div class="footer-float-right-responsive-brand">
                                     <div class="mb-1">
                                         <a href="https://twitter.com/MITREattack" class="btn btn-primary w-100">
-                                            <!-- <i class="fa fa-twitter"></i> -->
-                                            <img src="/theme/images/twitter.png" class="mr-1 twitter-icon">
+                                            <i class="fa-brands fa-twitter fa-lg"></i>
                                             <b>@MITREattack</b>
                                         </a>
                                     </div>

diff --git a/attack-theme/templates/macros/navigation.html b/attack-theme/templates/macros/navigation.html
@@ -21,8 +21,8 @@
 {% macro sidenav(root, output_file, filter=False) %}
 <div class="sidenav-wrapper">
   <div class="heading" data-toggle="collapse" data-target="#sidebar-collapse" id="v-home-tab" aria-expanded="true" aria-controls="#sidebar-collapse" aria-selected="false">{{root.name | upper}}
-    <i class="fa fa-fw fa-chevron-down"></i>
-    <i class="fa fa-fw fa-chevron-up"></i>
+    <i class="fa-solid fa-fw fa-chevron-down"></i>
+    <i class="fa-solid fa-fw fa-chevron-up"></i>
   </div>
   {% if filter %}
   <div class="checkbox-div" id="v-home-tab" aria-selected="false">

diff --git a/modules/datasources/templates/datasources-index.html b/modules/datasources/templates/datasources-index.html
@@ -32,15 +32,15 @@ <h6 class="table-object-count"></h6>
                             <thead>
                                 <tr>
                                     <th scope="col" onclick="sortTable(0)">ID
-                                        <i id="arrow-down-0" class="fa fa-fw fa-chevron-down arrow-down-0"></i>
-                                        <i id="arrow-up-0" class="fa fa-fw fa-chevron-up arrow-up-0"></i>
+                                        <i id="arrow-down-0" class="fa-solid fa-fw fa-chevron-down"></i>
+                                        <i id="arrow-up-0" class="fa-solid fa-fw fa-chevron-up"></i>
                                     </th>
                                     <th scope="col" onclick="sortTable(1)">Name
-                                        <i id="arrow-down-1" class="fa fa-fw fa-chevron-down arrow-down-1"></i>
-                                        <i id="arrow-up-1" class="fa fa-fw fa-chevron-up arrow-up-1"></i>
+                                        <i id="arrow-down-1" class="fa-solid fa-fw fa-chevron-down"></i>
+                                        <i id="arrow-up-1" class="fa-solid fa-fw fa-chevron-up"></i>
                                     </th>
                                     <th scope="col">Domain
-                                        <i class="fa fa-filter" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></i>
+                                        <i class="fa-solid fa-sm fa-filter" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></i>
                                         <div id="filterMenu" class="dropdown-menu data-sources-menu" aria-labelledby="domain-options">
                                             <div class="custom-control custom-switch dropdown-item">
                                                 <input type="checkbox" checked="checked" id="Enterprise" onchange="showDomain()">

diff --git a/modules/resources/templates/brand.html b/modules/resources/templates/brand.html
@@ -27,7 +27,7 @@ <h2>Brand Guide</h2>
                 <p>Download the full <a href="/docs/ATTACK_Brand_Guide.pdf">
                     <button type="button" class="brand-button">
                       <span class="brand-button-icon">
-                        <i class="fa fa-download"></i>
+                        <i class="fa-solid fa-download"></i>
                       </span>
                       <span class="brand-button-text">
                         <span>ATT&CK Brand Guide</span>