diff --git a/app/images/about/bg-utilities.jpg b/app/images/about/bg-utilities.jpg new file mode 100644 index 0000000000..31435c79d1 Binary files /dev/null and b/app/images/about/bg-utilities.jpg differ diff --git a/app/images/about/utilities-1.png b/app/images/about/utilities-1.png new file mode 100644 index 0000000000..a52c808396 Binary files /dev/null and b/app/images/about/utilities-1.png differ diff --git a/app/layout/about/utilities/component.tsx b/app/layout/about/utilities/component.tsx index eaa2272a14..f921b83886 100644 --- a/app/layout/about/utilities/component.tsx +++ b/app/layout/about/utilities/component.tsx @@ -3,6 +3,9 @@ import React from 'react'; import Column from 'layout/statics/column'; import Wrapper from 'layout/wrapper'; +import BackgroundImage from 'images/about/bg-utilities.jpg'; +import UtilitiesImage from 'images/about/utilities-1.png'; + import { UTILITIES } from './constants'; export interface AboutUtilitiesProps { @@ -11,25 +14,29 @@ export interface AboutUtilitiesProps { export const AboutUtilities: React.FC = () => { return ( - -
- -
- {UTILITIES.map((u) => ( -
-

{u.order}

-

{u.description}

-
- ))} +
+ +
+ +
+ {UTILITIES.map((u) => ( +
+

{u.order}

+

{u.description}

+
+ ))} +
-
- + +
); }; diff --git a/app/layout/about/values/component.tsx b/app/layout/about/values/component.tsx index 6e25bcb563..9ff2cc1270 100644 --- a/app/layout/about/values/component.tsx +++ b/app/layout/about/values/component.tsx @@ -41,7 +41,7 @@ export const AboutValues: React.FC = () => {

{v.description}

- {v.hypertext} + {v.hypertext}
))} diff --git a/app/layout/statics/column/component.tsx b/app/layout/statics/column/component.tsx index fba4b2b59b..fae7a6bd3d 100644 --- a/app/layout/statics/column/component.tsx +++ b/app/layout/statics/column/component.tsx @@ -6,8 +6,9 @@ export interface StaticColumnProps { title: string; subtitle?: string; description?: string; - caption: string; - href: string, + caption?: string; + image?: string; + href?: string, external?: boolean, } @@ -16,12 +17,13 @@ export const StaticColumn: React.FC = ({ subtitle, description, caption, + image, href, external = false, }: StaticColumnProps) => { return (
-

+

{title}

{subtitle && ( @@ -34,7 +36,22 @@ export const StaticColumn: React.FC = ({ {description}

)} - + {image && ( +
+ +
+ )} + {href && ( + + )}
); }; diff --git a/app/layout/statics/hero/component.tsx b/app/layout/statics/hero/component.tsx index 748b7d7d7d..467a048cc0 100644 --- a/app/layout/statics/hero/component.tsx +++ b/app/layout/statics/hero/component.tsx @@ -1,13 +1,16 @@ import React from 'react'; +import classnames from 'classnames'; + import Backlink from 'layout/statics/backlink'; import Wrapper from 'layout/wrapper'; export interface StaticHeroProps { - section: string; + section?: string; title: string; description: string; - backlink?: string, + backlink?: string; + theme?: 'dark' | 'light'; } export const StaticHero: React.FC = ({ @@ -15,29 +18,31 @@ export const StaticHero: React.FC = ({ title, description, backlink, + theme = 'dark', }: StaticHeroProps) => { return ( - -
- {backlink && ( - {section} - )} - {!backlink && ( -

- {section} -

- )} -

- {title} -

+
+ +
+ {backlink && ( + {section} + )} +

+ {title} +

-

- {description} -

-
-
+

+ {description} +

+
+ +
); }; diff --git a/app/pages/about.tsx b/app/pages/about.tsx index 805d2b772f..a54f02c605 100644 --- a/app/pages/about.tsx +++ b/app/pages/about.tsx @@ -41,9 +41,9 @@ const About: React.FC = () => { />
-
+