Merge pull request #52 in USAFHNI/digital-trinity from feature/various-04-13 to develop

* commit '79bbd3bf':
  Subtitle for about page
  Adding new link in footer plus icons
  Updating contact form classified warning message Fixing our programs link in footer Updating text in 404 Global heading size adjustments

src/components/ContactForm.js

@@ -91,15 +91,11 @@ const ContactForm = ({ onClose, defaultService, ...rest }) => {
               in, and someone from our team will reach out soon.
             </Text>
             <Text size="small" color="accent-1">
-              Do not submit{' '}
+              Do{' '}
               <Text weight="bold" size="small" color="accent-1">
-                classified
+                not
               </Text>{' '}
-              or{' '}
-              <Text weight="bold" size="small" color="accent-1">
-                CUI
-              </Text>{' '}
-              data.
+              submit classified or CUI data.
             </Text>
             <Form onSubmit={handleSubmit} aria-live="assertive">
               <FormField
@@ -168,7 +164,7 @@ const ContactForm = ({ onClose, defaultService, ...rest }) => {
                   <Text weight="bold" size="small">
                     Comments or details{' '}
                     <Text weight="normal" size="small">
-                      (optional)
+                      (optional, no classified or CUI data)
                     </Text>
                   </Text>
                 }

src/components/app/Footer.js

 import React, { useContext } from 'react';
 import { Box, ResponsiveContext } from 'grommet';
+import { Share } from 'grommet-icons';
 import { Container, Column } from '../layout';
 import { Link } from '../core';
 import AFLogo from '../../images/af-logo.svg';
@@ -29,19 +30,29 @@ const Footer = () => {
               About Us
             </Link>
             <Link
-              to="/our-other-programs/"
+              to="/other-programs/"
               color="light-1"
               size="small"
               weight="bold"
             >
               Our Other Programs
             </Link>
+
+            <Link
+              to="https://usaf.dps.mil/teams/EntInt/FrontDoor/SitePages/Home.aspx"
+              color="light-1"
+              size="small"
+              justify="center"
+            >
+              CCC IT/Cyber Services <Share size="small" />
+            </Link>
             <Link
               to="https://www.wpafb.af.mil/Welcome/Fact-Sheets/Display/Article/835716/88-abw-freedom-of-information-act-foia-88-abw-installation-privacy-office/"
               color="light-1"
               size="small"
+              justify="center"
             >
-              FOIA
+              FOIA <Share size="small" />
             </Link>
           </Box>
           <Box

src/components/pages/service-category/ServiceList.js

@@ -29,7 +29,7 @@ const listQuery = graphql`
 `;
 
 const ServiceItem = ({ node, isMobile }) => (
-  <Box basis="1/2" pad={isMobile ? '0' : 'medium'}>
+  <Box basis="1/2" pad={{ horizontal: isMobile ? '0' : 'medium' }}>
     <Heading level={4}>{node.frontmatter.title}</Heading>
     <Classification
       levels={node.frontmatter.levels}
@@ -63,7 +63,7 @@ const ServiceList = ({ categories }) => {
   const isMobile = ['xsmall', 'small'].includes(size);
 
   return (
-    <Box pad={{ vertical: 'large' }} id="main-content">
+    <Box pad={{ vertical: 'large' }} id="main-content" gap="large">
       {catGroup.map((group, i) => (
         <Box key={categories[i]} gap="small">
           {categories.length > 1 && (
@@ -71,7 +71,12 @@ const ServiceList = ({ categories }) => {
               <Column>
                 <Box direction="row" align="center" gap="small">
                   {!isMobile && <DtSquare color="black" size="small" />}
-                  <Heading level={2}>{categories[i]}</Heading>
+                  <Heading
+                    level={2}
+                    margin={{ vertical: isMobile ? 'medium' : '0' }}
+                  >
+                    {categories[i]}
+                  </Heading>
                 </Box>
               </Column>
             </Container>

src/content/generic/about-us.md

 ---
 slug: '/about-us/'
 title: About Us
-subtitle: AFLCMC / C3I&N
+subtitle: AFLCMC / HN C3I&N
 description: Learn more about C3I&N's mission and our digital storefront.
 image: '../../images/detail-header.png'
 ---

src/pages/404.js

@@ -9,9 +9,7 @@ const NotFoundPage = () => (
     <Container>
       <Column>
         <Heading>404: Not Found</Heading>
-        <Paragraph>
-          You just hit a route that doesn&#39;t exist... the sadness.
-        </Paragraph>
+        <Paragraph>You just hit a route that doesn&#39;t exist.</Paragraph>
       </Column>
     </Container>
   </AppLayout>

src/styles/theme.js

@@ -119,7 +119,19 @@ export const themeOverrides = {
         textTransform: 'uppercase',
       },
     level: {
-      3: { font: { family: helveticaFont } },
+      2: {
+        medium: {
+          size: '30px',
+          height: '32px',
+        },
+      },
+      3: {
+        font: { family: helveticaFont },
+        medium: {
+          size: '22px',
+          height: '26px',
+        },
+      },
       4: { font: { family: helveticaFont } },
       5: { font: { family: helveticaFont } },
       6: { font: { family: helveticaFont } },