diff --git a/src/components/Classification.js b/src/components/Classification.js index 4d1b57c968cc878a0d018d379fe0eea30b3ba27f..ea43ee2ecc7bbdb70ae4d665af9268c0f202dc35 100644 --- a/src/components/Classification.js +++ b/src/components/Classification.js @@ -46,7 +46,7 @@ const Classification = ({ levels, serviceName }) => { { {isOpen && ( - - - + ({ + zIndex: '50', + }), + }, + }} + > + + + + )} ); diff --git a/src/components/app/Footer.js b/src/components/app/Footer.js index cd9375b226eccd8f8c209d28a98cdd74a0aca580..19ef7886ad4e5a2ba87d1c2b793669d1a6a25ca8 100644 --- a/src/components/app/Footer.js +++ b/src/components/app/Footer.js @@ -4,6 +4,7 @@ import { Container, Column } from '../layout'; import { Link } from '../core'; import AFLogo from '../../images/af-logo.svg'; import C3Logo from '../../images/c3.png'; +import AFMCLogo from '../../images/AFMC.png'; const Footer = () => { const size = useContext(ResponsiveContext); @@ -18,29 +19,55 @@ const Footer = () => { justify="between" direction={isMobile ? 'column' : 'row'} gap="large" - aria-hidden="true" > About Us + + Our Other Programs + + + FOIA + - C3I & Networks Directorate logo - + + C3I & Networks Directorate + + + Air Force Material Command + + + + diff --git a/src/components/hero/Hero.js b/src/components/hero/Hero.js index 50ff05bf2b8b725e2c7fd6ecf3effca03bfbee14..ea36a12ba82d8edb26a0882130b18d1e2b2041dd 100644 --- a/src/components/hero/Hero.js +++ b/src/components/hero/Hero.js @@ -84,7 +84,8 @@ const Slide = ({ title, subtitle, core, cta, slug, logo, isMobile, size }) => { {title} )} @@ -253,7 +254,7 @@ const Hero = () => { return ( diff --git a/src/components/hero/ServiceCatHero.js b/src/components/hero/ServiceCatHero.js index e41d412fecfc0eedcf12740f41e5aa2c90b39863..5195da0ad62fe73572e0c5020c1bc21ba3279ac9 100644 --- a/src/components/hero/ServiceCatHero.js +++ b/src/components/hero/ServiceCatHero.js @@ -16,8 +16,8 @@ const ServiceCatHero = ({ title, description, imageFluid, iconName }) => { return ( { {title} - {description && {description}} + {description && ( + + {description} + + )} {!isMobile && ( @@ -67,24 +71,24 @@ const ServiceCatHero = ({ title, description, imageFluid, iconName }) => { gap="medium" flex={{ grow: 1 }} > - + )} - {isMobile && ( - - )} - + {isMobile && ( + + )} ); diff --git a/src/components/hero/ServiceHero.js b/src/components/hero/ServiceHero.js index cb34e021ea8a8372a211b34972443a11276fcc9d..4b9846aff3ce45c9522028ec489e26fed2ed3f27 100644 --- a/src/components/hero/ServiceHero.js +++ b/src/components/hero/ServiceHero.js @@ -16,24 +16,26 @@ const ServiceHero = ({ title, subtitle, pretitle, categories, imageFluid }) => { - {!isMobile && ( - Hero - )} + Hero diff --git a/src/components/layout/Column.js b/src/components/layout/Column.js index 99670ebb5c9400be8b233d8d72081c6665ccf5d1..63b2bf8e7a874fbafa18b911d53271eeedb90a33 100644 --- a/src/components/layout/Column.js +++ b/src/components/layout/Column.js @@ -1,14 +1,16 @@ import React, { useContext } from 'react'; -import { Box } from 'grommet'; +import { Box, ResponsiveContext } from 'grommet'; import DebugContext from '../../DebugContext'; const Column = (props) => { const debug = useContext(DebugContext); + const size = useContext(ResponsiveContext); + const isMobile = ['xsmall'].includes(size); return ( diff --git a/src/components/mega-menu/MegaMenu.js b/src/components/mega-menu/MegaMenu.js index 04ef7337d2efd4c26712a8ed4102b4407acaef65..a385dc4dd9bb91f4b62b2391b301a7d22e736a62 100644 --- a/src/components/mega-menu/MegaMenu.js +++ b/src/components/mega-menu/MegaMenu.js @@ -97,12 +97,13 @@ const MegaMenu = ({ sticky }) => { title="Global Connectivity / WAN" category="Global Connectivity / WAN" /> - - + + + { return ( {isLink ? ( - - + + {name} - - + + ) : (