Collapse animation fix, on hover attack technique in matrix fix

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'

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';
 

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'
 

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'
 

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'
 

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'
 

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';
 

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'
 

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'
 

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 {

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'
 

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'
 

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'
 

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'
 

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'
 

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'
 

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'
 

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'
 

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';
 

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'
 

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'
 

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'
 

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'
 

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'
 

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 {

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 {

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;
 }