From 068530a374e943f69cded3bac3a611093a656daf Mon Sep 17 00:00:00 2001 From: adpare Date: Mon, 12 Feb 2024 10:12:06 -0500 Subject: [PATCH 1/8] added video link to contribute page --- attack-theme/templates/macros/contact_card.html | 7 ++++--- modules/resources/templates/contribute.html | 16 +++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/attack-theme/templates/macros/contact_card.html b/attack-theme/templates/macros/contact_card.html index d6d00fb00b6..fae0e272269 100644 --- a/attack-theme/templates/macros/contact_card.html +++ b/attack-theme/templates/macros/contact_card.html @@ -1,4 +1,4 @@ -{% macro render(title, link, description, fa_icon=None, invert_icon=None, buttons=None, header_background=None, footer_description=None, header_subtitle=None, card_modal=None) %} +{% macro render(title, link, description, fa_icon=None, invert_icon=None, buttons=None, header_background=None, footer_description=None, header_subtitle=None) %}
{% if header_background %}
@@ -42,8 +42,9 @@
{{title}}
{% if buttons %}
{% for button in buttons %} - -
From 675e721a0ce16c6cb37d5a1d9e7f753a11094648 Mon Sep 17 00:00:00 2001 From: adpare Date: Mon, 26 Feb 2024 16:45:27 -0500 Subject: [PATCH 2/8] added table of contents to attack data and tools page --- attack-theme/static/style/_layouts.scss | 5 ++++ .../templates/attack-data-and-tools.html | 25 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/attack-theme/static/style/_layouts.scss b/attack-theme/static/style/_layouts.scss index 2bd146a2b53..ad67648c30d 100644 --- a/attack-theme/static/style/_layouts.scss +++ b/attack-theme/static/style/_layouts.scss @@ -1418,6 +1418,11 @@ div#sidebars { } } } + .table-of-contents { + position: static; + float: none; + width: 25%; + } } .tip-box { diff --git a/modules/resources/templates/attack-data-and-tools.html b/modules/resources/templates/attack-data-and-tools.html index 34be897b017..dbeb56a591c 100644 --- a/modules/resources/templates/attack-data-and-tools.html +++ b/modules/resources/templates/attack-data-and-tools.html @@ -20,9 +20,28 @@

ATT&CK Data & Tools

+
+
+ Jump to Section + +
+
+
+

+

Tools to Use with ATT&CK

The following tools allow users to explore, access, visualize, and query ATT&CK in different ways. @@ -111,6 +130,9 @@

Python Utilities

+
+

+

Accessing ATT&CK Data

@@ -225,6 +247,9 @@

TAXII

+
+

+

ATT&CK in Excel

From 9d06a18cd9b9dec71411ff4d4bbb7f5b32a80d28 Mon Sep 17 00:00:00 2001 From: adpare Date: Wed, 28 Feb 2024 13:40:49 -0500 Subject: [PATCH 3/8] datasources filter table bug fix --- attack-theme/static/style/_layouts.scss | 18 +++++++++ .../templates/datasources-index.html | 37 +++++++++++-------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/attack-theme/static/style/_layouts.scss b/attack-theme/static/style/_layouts.scss index ad67648c30d..69f7c97db1d 100644 --- a/attack-theme/static/style/_layouts.scss +++ b/attack-theme/static/style/_layouts.scss @@ -204,6 +204,24 @@ a { color: color(secondary); } +// used for data sources filter dropdown +.dropdown { + position: relative; + display: inline-block; +} + +.dropdown-content { + display: none; + position: absolute; + background-color: on-color(secondary); + min-width: 160px; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); +} + +.dropdown:hover .dropdown-content { + display: block; +} + // placeholder for base style of all navy colored buttons %button-style { color: on-color(secondary); diff --git a/modules/datasources/templates/datasources-index.html b/modules/datasources/templates/datasources-index.html index cd9fcec5bcf..8738067673e 100644 --- a/modules/datasources/templates/datasources-index.html +++ b/modules/datasources/templates/datasources-index.html @@ -39,22 +39,27 @@
- Domain - - + +
+ Domain + +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
Description From 8fc7d09b2634d3c64fe7f79c8c7754185c268203 Mon Sep 17 00:00:00 2001 From: Charissa Miller <48832936+clemiller@users.noreply.github.com> Date: Thu, 21 Mar 2024 10:49:07 -0400 Subject: [PATCH 4/8] bug fix - updating a header that was removed in a previous release --- modules/benefactors/templates/benefactors.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/benefactors/templates/benefactors.html b/modules/benefactors/templates/benefactors.html index b1bee0a096c..c3ffdeab088 100644 --- a/modules/benefactors/templates/benefactors.html +++ b/modules/benefactors/templates/benefactors.html @@ -125,8 +125,6 @@

ATT&CK Benefactors

]; let numRows = sponsorSupport.length; - - let supportLevel = document.getElementById("support-level-header"); let rowCounter = 0; let buttonLeft = document.getElementById("button-left"); @@ -151,8 +149,6 @@

ATT&CK Benefactors

items[colCounter].parentElement.parentElement.style.display = 'none'; } } - // bold support level - supportLevel.innerHTML = sponsorSupport[rowCounter].support; } function incrementCounter() { From ac03fd0d60abaaf2dde5e173a59d88b5ca2fb6a9 Mon Sep 17 00:00:00 2001 From: Jared Ondricek Date: Wed, 27 Mar 2024 14:05:45 -0500 Subject: [PATCH 5/8] Fix whitespace issues --- attack-theme/templates/macros/matrix.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/attack-theme/templates/macros/matrix.html b/attack-theme/templates/macros/matrix.html index 885fa589176..f63d9385d91 100644 --- a/attack-theme/templates/macros/matrix.html +++ b/attack-theme/templates/macros/matrix.html @@ -1,6 +1,6 @@