From 9a3697aadcf8936b915bfdcbda2cbd290533be7f Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Wed, 28 Jul 2021 12:03:47 -0400 Subject: [PATCH 1/4] UI: Add 10px between version an bottom of landing page --- monkey/monkey_island/cc/ui/src/styles/pages/LandingPage.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monkey/monkey_island/cc/ui/src/styles/pages/LandingPage.scss b/monkey/monkey_island/cc/ui/src/styles/pages/LandingPage.scss index 14a77725f..b5b1549d5 100644 --- a/monkey/monkey_island/cc/ui/src/styles/pages/LandingPage.scss +++ b/monkey/monkey_island/cc/ui/src/styles/pages/LandingPage.scss @@ -29,7 +29,7 @@ .landing-page .guardicore-logo { position: absolute; - bottom: 0; + bottom: 10px; left: 0 !important; } From b8b82039d868022fc063eb17c16692b7380bb366 Mon Sep 17 00:00:00 2001 From: Mike Salvatore Date: Wed, 28 Jul 2021 12:04:17 -0400 Subject: [PATCH 2/4] UI: Add banner to the top of the landing page --- .../ui/src/components/pages/LandingPage.tsx | 13 ++++++++++ .../cc/ui/src/styles/pages/LandingPage.scss | 24 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/monkey/monkey_island/cc/ui/src/components/pages/LandingPage.tsx b/monkey/monkey_island/cc/ui/src/components/pages/LandingPage.tsx index 882e838c7..cc53a828d 100644 --- a/monkey/monkey_island/cc/ui/src/components/pages/LandingPage.tsx +++ b/monkey/monkey_island/cc/ui/src/components/pages/LandingPage.tsx @@ -9,6 +9,9 @@ import IslandHttpClient from "../IslandHttpClient"; import ParticleBackground from '../ui-components/ParticleBackground'; import Logo from "../logo/LogoComponent"; +const monkeyIcon = require('../../images/monkey-icon.svg') +const infectionMonkey = require('../../images/infection-monkey.svg') + const LandingPageComponent = (props) => { return ( @@ -17,6 +20,7 @@ const LandingPageComponent = (props) => { +

Breach & Attack Simulation

@@ -101,4 +105,13 @@ function ScenarioInfo() { ); } +function MonkeyBanner(props) { + return ( +
+ + +
+ ); +} + export default LandingPageComponent; diff --git a/monkey/monkey_island/cc/ui/src/styles/pages/LandingPage.scss b/monkey/monkey_island/cc/ui/src/styles/pages/LandingPage.scss index b5b1549d5..f5ec25055 100644 --- a/monkey/monkey_island/cc/ui/src/styles/pages/LandingPage.scss +++ b/monkey/monkey_island/cc/ui/src/styles/pages/LandingPage.scss @@ -40,3 +40,27 @@ .guardicore-logo .version-text { position: relative; } + +.landing-page-banner { + display: block; + background-color: #ffcc00; + height:200px; + margin-right: -15px; + margin-left: -15px; +} + +.landing-banner-component { + display: block; + margin-left: auto; + margin-right: auto; + padding-top: 10px; +} + +.landing-banner-monkey-icon { + max-height: 65%; +} + +.landing-banner-title { + padding-bottom: 10px; + max-height: 35%; +} From 45f05dcddf8aba4396daf1ce7e61078c0d42d703 Mon Sep 17 00:00:00 2001 From: VakarisZ Date: Thu, 29 Jul 2021 10:59:56 +0300 Subject: [PATCH 3/4] Island UI: remove the unnecessary header from landing page --- .../monkey_island/cc/ui/src/components/SideNavComponent.tsx | 1 - .../cc/ui/src/components/pages/LandingPage.tsx | 5 ++--- .../monkey_island/cc/ui/src/styles/pages/LandingPage.scss | 6 ++++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/monkey/monkey_island/cc/ui/src/components/SideNavComponent.tsx b/monkey/monkey_island/cc/ui/src/components/SideNavComponent.tsx index f3c8e3a94..6caa6617b 100644 --- a/monkey/monkey_island/cc/ui/src/components/SideNavComponent.tsx +++ b/monkey/monkey_island/cc/ui/src/components/SideNavComponent.tsx @@ -3,7 +3,6 @@ import {NavLink} from 'react-router-dom'; import {FontAwesomeIcon} from '@fortawesome/react-fontawesome'; import {faCheck} from '@fortawesome/free-solid-svg-icons/faCheck'; import {faUndo} from '@fortawesome/free-solid-svg-icons/faUndo'; -import {faExternalLinkAlt} from '@fortawesome/free-solid-svg-icons'; import '../styles/components/SideNav.scss'; import {CompletedSteps} from "./side-menu/CompletedSteps"; import {isReportRoute, Routes} from "./Main"; diff --git a/monkey/monkey_island/cc/ui/src/components/pages/LandingPage.tsx b/monkey/monkey_island/cc/ui/src/components/pages/LandingPage.tsx index cc53a828d..cd3d73d8c 100644 --- a/monkey/monkey_island/cc/ui/src/components/pages/LandingPage.tsx +++ b/monkey/monkey_island/cc/ui/src/components/pages/LandingPage.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import {Container,Col, Row} from 'react-bootstrap'; +import {Col, Row} from 'react-bootstrap'; import {Link} from 'react-router-dom'; import {FontAwesomeIcon} from '@fortawesome/react-fontawesome'; import {faFileCode, faLightbulb} from '@fortawesome/free-solid-svg-icons'; @@ -21,8 +21,7 @@ const LandingPageComponent = (props) => { lg={{offset: 2, span: 8}} xl={{offset: 3, span: 6}} className={'landing-page'}> -

Breach & Attack Simulation

-
+

diff --git a/monkey/monkey_island/cc/ui/src/styles/pages/LandingPage.scss b/monkey/monkey_island/cc/ui/src/styles/pages/LandingPage.scss index f5ec25055..fe9e3657b 100644 --- a/monkey/monkey_island/cc/ui/src/styles/pages/LandingPage.scss +++ b/monkey/monkey_island/cc/ui/src/styles/pages/LandingPage.scss @@ -64,3 +64,9 @@ padding-bottom: 10px; max-height: 35%; } + +.landing-page .scenario-header { + font-size: 1.2em; + margin-top: 30px; + margin-left: 20px; +} From 333fbfc6de95bb5fd98bb26ccce6ad99dae42bb9 Mon Sep 17 00:00:00 2001 From: VakarisZ Date: Thu, 29 Jul 2021 11:41:29 +0300 Subject: [PATCH 4/4] Island UI: fix guardicore logo on smaller screens --- monkey/monkey_island/cc/ui/src/styles/App.css | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/monkey/monkey_island/cc/ui/src/styles/App.css b/monkey/monkey_island/cc/ui/src/styles/App.css index 9c6e4abba..00c1320b8 100644 --- a/monkey/monkey_island/cc/ui/src/styles/App.css +++ b/monkey/monkey_island/cc/ui/src/styles/App.css @@ -21,7 +21,7 @@ body { * Sidebar */ -@media (min-width: 768px) { +@media (min-width: 575px) { .sidebar { position: fixed !important; top: 0; @@ -126,6 +126,15 @@ body { } } +@media (max-width: 575px) { + .guardicore-link img { + height: 28px; + padding-left: 4px; + padding-right: 4px; + vertical-align: middle; + } +} + /* * Main content */