diff --git a/docs/static/images/usage/reports/mitre-report-0.png b/docs/static/images/usage/reports/mitre-report-0.png index 9835d100b..b8ab707d6 100644 Binary files a/docs/static/images/usage/reports/mitre-report-0.png and b/docs/static/images/usage/reports/mitre-report-0.png differ diff --git a/monkey/monkey_island/cc/ui/package-lock.json b/monkey/monkey_island/cc/ui/package-lock.json index c1ae3ec13..7edb9342a 100644 --- a/monkey/monkey_island/cc/ui/package-lock.json +++ b/monkey/monkey_island/cc/ui/package-lock.json @@ -8701,9 +8701,9 @@ } }, "needle": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.0.tgz", - "integrity": "sha512-o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.2.tgz", + "integrity": "sha512-LbRIwS9BfkPvNwNHlsA41Q29kL2L/6VaOJ0qisM5lLWsTV3nP15abO5ITL6L81zqFhzjRKDAYjpcBcwM0AVvLQ==", "requires": { "debug": "^3.2.6", "iconv-lite": "^0.4.4", @@ -14858,9 +14858,9 @@ } }, "snyk": { - "version": "1.372.0", - "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.372.0.tgz", - "integrity": "sha512-5eX7cEmbPtpZ9w+vQIEIf9tlb3FOEN36cnSFpla4bTim2biGTx50lWPKYAclX3z1tlLt654rdJfpTt5tOqWxUQ==", + "version": "1.373.0", + "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.373.0.tgz", + "integrity": "sha512-P/BF3DnMbP2NFHw4RcQ2w4MwashUH2/lkezNq0bn51OJqktfrn/aebcJxe6RtSKemww5z8DSen8D2REz1Vzc6Q==", "requires": { "@snyk/cli-interface": "2.8.1", "@snyk/dep-graph": "1.18.3", diff --git a/monkey/monkey_island/cc/ui/package.json b/monkey/monkey_island/cc/ui/package.json index d6de01941..abc82758d 100644 --- a/monkey/monkey_island/cc/ui/package.json +++ b/monkey/monkey_island/cc/ui/package.json @@ -105,7 +105,7 @@ "react-tooltip-lite": "^1.12.0", "redux": "^4.0.4", "sha3": "^2.1.3", - "snyk": "^1.372.0" + "snyk": "^1.373.0" }, "snyk": true } diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/attack/SelectedTechnique.js b/monkey/monkey_island/cc/ui/src/components/report-components/attack/SelectedTechnique.js index 8bdcf2960..69ca738f0 100644 --- a/monkey/monkey_island/cc/ui/src/components/report-components/attack/SelectedTechnique.js +++ b/monkey/monkey_island/cc/ui/src/components/report-components/attack/SelectedTechnique.js @@ -38,7 +38,8 @@ class SelectedTechnique extends React.Component { - + diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/attack/TechniqueDropdowns.js b/monkey/monkey_island/cc/ui/src/components/report-components/attack/TechniqueDropdowns.js index 1ba9285e6..13e5e23a3 100644 --- a/monkey/monkey_island/cc/ui/src/components/report-components/attack/TechniqueDropdowns.js +++ b/monkey/monkey_island/cc/ui/src/components/report-components/attack/TechniqueDropdowns.js @@ -43,8 +43,9 @@ class TechniqueDropdowns extends React.Component{ {this.state.techniques[tech_id].title} - - + + diff --git a/monkey/monkey_island/cc/ui/src/styles/components/Collapse.scss b/monkey/monkey_island/cc/ui/src/styles/components/Collapse.scss index b74088a77..3e578d45c 100644 --- a/monkey/monkey_island/cc/ui/src/styles/components/Collapse.scss +++ b/monkey/monkey_island/cc/ui/src/styles/components/Collapse.scss @@ -1,9 +1,9 @@ $transition: 300ms cubic-bezier(0.6, 0.3, 0.3, 0.6); $danger-color: #ebbcba; -$disabled-color: #f4f4f4; +$disabled-color: #f2f2f2; $info-color: #ade3eb; -$default-color: #cbcbcb; +$default-color: #8c8c8c; $warning-color: #ffe28d; .collapse-item button { @@ -53,6 +53,7 @@ $warning-color: #ffe28d; .collapse-default { background-color: $default-color !important; + color: #ffffff; } .collapse-disabled { diff --git a/monkey/monkey_island/cc/ui/src/styles/pages/report/ReportAttackMatrix.scss b/monkey/monkey_island/cc/ui/src/styles/pages/report/ReportAttackMatrix.scss index 7cfa62157..edacf9672 100644 --- a/monkey/monkey_island/cc/ui/src/styles/pages/report/ReportAttackMatrix.scss +++ b/monkey/monkey_island/cc/ui/src/styles/pages/report/ReportAttackMatrix.scss @@ -1,13 +1,13 @@ // colors -$disabled: #f4f4f4; -$not-attempted: #cbcbcb; +$disabled: #f2f2f2; +$not-attempted: #8c8c8c; $attempted: #ffe28d; $used: #ebbcba; $black: #3a3a3a; .attack-matrix .status-0 { background-color: $not-attempted !important; - color: $black; + color: #ffffff; } .attack-matrix .status-1 { @@ -23,6 +23,7 @@ $black: #3a3a3a; .attack-matrix .status-3 { background-color: $disabled !important; color: $black; + text-decoration: line-through; } .attack-matrix div.rt-td:hover {