From 5104160f8ed5c118ec78e014c367246c4cd364b5 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Mon, 2 Dec 2019 12:23:54 +0200
Subject: [PATCH] Collapse animation fix, on hover attack technique in matrix
 fix

---
 .../src/components/attack/techniques/T1003.js |  1 -
 .../src/components/attack/techniques/T1005.js |  1 -
 .../src/components/attack/techniques/T1016.js |  1 -
 .../src/components/attack/techniques/T1018.js |  1 -
 .../src/components/attack/techniques/T1021.js |  1 -
 .../src/components/attack/techniques/T1035.js |  1 -
 .../src/components/attack/techniques/T1041.js |  1 -
 .../src/components/attack/techniques/T1059.js |  1 -
 .../src/components/attack/techniques/T1064.js |  1 -
 .../src/components/attack/techniques/T1065.js |  1 -
 .../src/components/attack/techniques/T1075.js |  1 -
 .../src/components/attack/techniques/T1082.js |  1 -
 .../src/components/attack/techniques/T1086.js |  1 -
 .../src/components/attack/techniques/T1090.js |  1 -
 .../src/components/attack/techniques/T1105.js |  1 -
 .../src/components/attack/techniques/T1106.js |  1 -
 .../src/components/attack/techniques/T1107.js |  1 -
 .../src/components/attack/techniques/T1110.js |  1 -
 .../src/components/attack/techniques/T1129.js |  1 -
 .../src/components/attack/techniques/T1145.js |  1 -
 .../src/components/attack/techniques/T1188.js |  1 -
 .../src/components/attack/techniques/T1197.js |  1 -
 .../src/components/attack/techniques/T1210.js |  1 -
 .../src/components/attack/techniques/T1222.js |  1 -
 .../cc/ui/src/styles/Checkbox.scss            |  8 +++++-
 .../cc/ui/src/styles/Collapse.scss            | 25 ++++---------------
 .../src/styles/report/ReportAttackMatrix.scss |  5 ++++
 27 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1003.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1003.js
index 4a7a69b6f..5615c7039 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1003.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1003.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import '../../report-components/security/StolenPasswords'
 import StolenPasswordsComponent from '../../report-components/security/StolenPasswords';
 import {ScanStatus} from './Helpers'
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1005.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1005.js
index 6493a93ae..fa702f2b2 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1005.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1005.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachineFromSystemData, ScanStatus} from './Helpers';
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1016.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1016.js
index fda21f0ee..9c0afa21e 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1016.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1016.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachineFromSystemData, renderUsageFields, ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1018.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1018.js
index 491cd42fd..fbd34616e 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1018.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1018.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachineFromSystemData, renderMachine, ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1021.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1021.js
index 7e057f924..22f9460e4 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1021.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1021.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachine, ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1035.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1035.js
index e063338f4..d624fbfef 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1035.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1035.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {getUsageColumns} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1041.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1041.js
index 5e2509d3b..7e6c03c54 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1041.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1041.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {ScanStatus} from './Helpers';
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1059.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1059.js
index 50c915bc3..b48958daa 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1059.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1059.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachine, ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1064.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1064.js
index af54bf8f9..984e27f10 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1064.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1064.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {getUsageColumns} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1065.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1065.js
index 5d5a8df4c..3587f85e1 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1065.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1065.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 
 
 class T1065 extends React.Component {
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1075.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1075.js
index 05f1cadb8..5e0713cd3 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1075.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1075.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachine, ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1082.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1082.js
index d9a040cb8..308a18c10 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1082.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1082.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachineFromSystemData, renderUsageFields, ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1086.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1086.js
index a0ee61063..3d69d1205 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1086.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1086.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachine, ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1090.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1090.js
index 28cd3f950..82077882e 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1090.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1090.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachineFromSystemData, ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1105.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1105.js
index 6619d38ee..836934300 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1105.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1105.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1106.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1106.js
index a242ce119..b1d9f926c 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1106.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1106.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {getUsageColumns} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1107.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1107.js
index 44994faae..7d416826c 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1107.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1107.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachineFromSystemData, ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1110.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1110.js
index 8cee9f584..8cd5719f3 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1110.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1110.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachine, ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1129.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1129.js
index 8aafc7144..4c9cb3c5d 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1129.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1129.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {getUsageColumns} from './Helpers';
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1145.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1145.js
index c858a0f34..1b14b3415 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1145.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1145.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachineFromSystemData, ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1188.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1188.js
index 7181e3402..5c2e5b41f 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1188.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1188.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachineFromSystemData, ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1197.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1197.js
index e8a998409..c558b733f 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1197.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1197.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachine} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1210.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1210.js
index e5c19cef5..9dcf8f544 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1210.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1210.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachine} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1222.js b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1222.js
index b490b173e..ce73936b3 100644
--- a/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1222.js
+++ b/monkey/monkey_island/cc/ui/src/components/attack/techniques/T1222.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import '../../../styles/Collapse.scss'
 import ReactTable from 'react-table';
 import {renderMachine, ScanStatus} from './Helpers'
 
diff --git a/monkey/monkey_island/cc/ui/src/styles/Checkbox.scss b/monkey/monkey_island/cc/ui/src/styles/Checkbox.scss
index 07490ecfb..6b1f06712 100644
--- a/monkey/monkey_island/cc/ui/src/styles/Checkbox.scss
+++ b/monkey/monkey_island/cc/ui/src/styles/Checkbox.scss
@@ -120,8 +120,14 @@ $black: #000000;
   border-right: 3px solid rgba(0,0,0,0) !important;
 }
 
+.attack-matrix .rt-tr-group div.rt-td:first-child {
+  border-left: 3px solid rgba(0,0,0,0) !important;
+}
+
+
 .rt-tr-group {
-  border-bottom: 3px solid rgba(0,0,0,0) !important;
+  border-top: 3px solid white !important;
+  border-bottom: none !important;
 }
 
 .icon-checked {
diff --git a/monkey/monkey_island/cc/ui/src/styles/Collapse.scss b/monkey/monkey_island/cc/ui/src/styles/Collapse.scss
index 9277400b8..30ebaf789 100644
--- a/monkey/monkey_island/cc/ui/src/styles/Collapse.scss
+++ b/monkey/monkey_island/cc/ui/src/styles/Collapse.scss
@@ -1,4 +1,4 @@
-$transition: 500ms cubic-bezier(0.4, 0.1, 0.1, 0.5);
+$transition: 300ms cubic-bezier(0.6, 0.3, 0.3, 0.6);
 
 $danger-color: #d9acac;
 $info-color: #ade3eb;
@@ -68,27 +68,12 @@ $default-color: #e0ddde;
   overflow: hidden;
 }
 
+.collapsing {
+  height:100% !important;
+}
+
 .collapse-item .content {
   padding: 2rem 0;
-  transition: transform $transition;
-  will-change: transform;
-  $offset: 10px;
-
-  &.collapsing {
-    transform: translateY(-$offset);
-  }
-
-  &.collapse-comp {
-    transform: translateY(-$offset);
-  }
-
-  &.expanding {
-    transform: translateX(0px);
-  }
-
-  &.expanded {
-    transform: translateX(0px);
-  }
 }
 
 .collapse-item .text {
diff --git a/monkey/monkey_island/cc/ui/src/styles/report/ReportAttackMatrix.scss b/monkey/monkey_island/cc/ui/src/styles/report/ReportAttackMatrix.scss
index 6f6bb4f26..779db71dc 100644
--- a/monkey/monkey_island/cc/ui/src/styles/report/ReportAttackMatrix.scss
+++ b/monkey/monkey_island/cc/ui/src/styles/report/ReportAttackMatrix.scss
@@ -22,5 +22,10 @@ $black: #3a3a3a;
 .attack-matrix div.rt-td:hover {
     transform: scale(1.08);
     filter: brightness(110%);
+    z-index: 10000;
+}
+
+.attack-matrix .rt-thead,.-header {
+  border-bottom: 1px solid #0000000f;
 }