Merge branch 'develop' into website-updates

mitre-attack · Dec 18, 2023 · aa1f92a · aa1f92a
2 parents 0fa1d1d + ba02431
commit aa1f92a
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 333 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/_footer.scss b/attack-theme/static/style/_footer.scss
@@ -56,7 +56,7 @@
 
 .col {
     .col-footer {
-        border-right: solid;
+        border-right: 1px solid;
     }
 }
 

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>
 
@@ -117,10 +116,10 @@
                                     <div class="row row-footer row-footer-icon">
                                         <div class="mb-1">
                                             <a href="https://twitter.com/MITREattack" class="btn btn-footer">
-                                                <i class="fa fa-twitter fa-lg"></i>
+                                                <i class="fa-brands fa-twitter fa-lg"></i>
                                             </a>
                                             <a href="https://github.com/mitre-attack" class="btn btn-footer">
-                                                <i class="fa fa-github fa-lg"></i>
+                                                <i class="fa-brands fa-github fa-lg"></i>
                                             </a>
                                         </div>
                                     </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">
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,7 +56,7 @@ @@
     .col {
         .col-footer {
-            border-right: solid;
+            border-right: 1px solid;
         }
     }
@@ Expand Down @@