From ef90d8a788d470eadb3f531c473cb771dee6448a Mon Sep 17 00:00:00 2001 From: VakarisZ Date: Wed, 17 Apr 2019 13:52:04 +0300 Subject: [PATCH] Added legend and improved matrix UI --- .../cc/ui/src/components/pages/AttackPage.js | 21 ++++++++++++++++++- .../cc/ui/src/styles/Checkbox.scss | 21 ++++++++++++++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/monkey/monkey_island/cc/ui/src/components/pages/AttackPage.js b/monkey/monkey_island/cc/ui/src/components/pages/AttackPage.js index 397f558e9..d0db2d1c4 100644 --- a/monkey/monkey_island/cc/ui/src/components/pages/AttackPage.js +++ b/monkey/monkey_island/cc/ui/src/components/pages/AttackPage.js @@ -2,6 +2,8 @@ import React from 'react'; import AuthComponent from '../AuthComponent'; import 'filepond/dist/filepond.min.css'; import MatrixComponent from '../attack/MatrixComponent' +import {Col} from "react-bootstrap"; +import '../../styles/Checkbox.scss' class AttackComponent extends AuthComponent { constructor(props) { @@ -38,7 +40,24 @@ class AttackComponent extends AuthComponent { if (Object.keys(this.state.configuration).length === 0) { content = (

Fetching configuration...

); } else { - content = (); + content = ( +
+ + +
); } return
{content}
; } diff --git a/monkey/monkey_island/cc/ui/src/styles/Checkbox.scss b/monkey/monkey_island/cc/ui/src/styles/Checkbox.scss index b590b2a08..03cd38370 100644 --- a/monkey/monkey_island/cc/ui/src/styles/Checkbox.scss +++ b/monkey/monkey_island/cc/ui/src/styles/Checkbox.scss @@ -1,7 +1,7 @@ // colors $light-grey: #EAF4F4; $medium-grey: #7B9EA8; -$dark-grey: #7a7d7b; +$dark-green: #007d02; $green: #44CF6C; $black: #000000; @@ -34,13 +34,12 @@ $black: #000000; } &.blocked { - background-color: $dark-grey; - color: $black; - fill: $black; + background-color: $dark-green; + color: $light-grey; + fill: $light-grey; } &.is-checked { - border: 1px solid $green; background-color: $green; color: white; fill: white; @@ -92,3 +91,15 @@ $black: #000000; background-color: rgba(white, .08); } } + +.icon-checked{ + color:$green +} + +.icon-mandatory{ + color:$dark-green +} + +.icon-unchecked{ + color:$black; +}