diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico index e7a965a5..fa66a7ef 100755 Binary files a/app/assets/images/favicon.ico and b/app/assets/images/favicon.ico differ diff --git a/app/assets/images/homepage-illustration.svg b/app/assets/images/homepage-illustration.svg new file mode 100644 index 00000000..b7988958 --- /dev/null +++ b/app/assets/images/homepage-illustration.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + Services List + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/images/opengraph-image.png b/app/assets/images/opengraph-image.png new file mode 100644 index 00000000..f010dc87 Binary files /dev/null and b/app/assets/images/opengraph-image.png differ diff --git a/app/assets/images/separator-2x.png b/app/assets/images/separator-2x.png deleted file mode 100755 index 9d5fd7c0..00000000 Binary files a/app/assets/images/separator-2x.png and /dev/null differ diff --git a/app/assets/images/separator.png b/app/assets/images/separator.png deleted file mode 100755 index b9767add..00000000 Binary files a/app/assets/images/separator.png and /dev/null differ diff --git a/app/assets/sass/_timeline.scss b/app/assets/sass/_timeline.scss index c55b367e..a8c244ea 100644 --- a/app/assets/sass/_timeline.scss +++ b/app/assets/sass/_timeline.scss @@ -10,7 +10,7 @@ height: 100%; top: 10px; left: 0; - background-color: govuk-colour("blue"); + background-color: $govuk-brand-colour; } .app-timeline__item { @@ -24,7 +24,7 @@ height: 5px; top: 10px; left: -20px; - background-color: govuk-colour("blue"); + background-color: $govuk-brand-colour; } .app-timeline__heading { diff --git a/app/assets/sass/application.scss b/app/assets/sass/application.scss index d6b802a4..4563dfda 100755 --- a/app/assets/sass/application.scss +++ b/app/assets/sass/application.scss @@ -3,6 +3,8 @@ $govuk-brand-colour: #28a; $govuk-link-colour: #006688; $govuk-link-hover-colour: #004466; $govuk-link-visited-colour: #333366; +$govuk-page-width: 1100px; +$govuk-new-typography-scale: true; @import "govuk-frontend/dist/govuk/all"; @import "@x-govuk/govuk-prototype-components/x-govuk/components/masthead/masthead"; diff --git a/app/views/index.html b/app/views/index.html index 8068a5ab..b72502aa 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -1,29 +1,28 @@ {% extends "layout.html" %} {%- from "govuk/components/tag/macro.njk" import govukTag -%} +{%- from "x-govuk/components/masthead/macro.njk" import xGovukMasthead -%} {% set section = "home" %} {% block pageTitle %}Government digital services{% endblock %} {% block main %} -
-
-
-
-

- A community-maintained list of digital services from the UK government -

-

- This list aims to help designers and developers discover and learn from other digital services.

- - Explore the list - - -
-
-
-
+{{ xGovukMasthead({ + classes: "x-govuk-masthead–large", + title: { + html: "A community-maintained list of digital services from the UK government" + }, + description: { + text: "This list aims to help designers and developers discover and learn from other digital services." + }, + startButton: { + href: "/topic", + text: "Explore the list" + }, + image: { + src: "/images/homepage-illustration.svg" + } +}) }} +
diff --git a/app/views/layout.html b/app/views/layout.html index e87d1801..519b407b 100755 --- a/app/views/layout.html +++ b/app/views/layout.html @@ -1,8 +1,6 @@ {% extends "govuk/template.njk" %} -{% block headIcons %} - -{% endblock %} +{% set opengraphImageUrl = "https://govuk-digital-services.herokuapp.com/images/opengraph-image.png" %} {% block head %} diff --git a/start.js b/start.js index a8087000..369579ad 100755 --- a/start.js +++ b/start.js @@ -198,8 +198,11 @@ app.use('/images', express.static(path.join(__dirname, 'app/assets/images'))) app.use('/', express.static(path.join(__dirname, 'static'))) -var env = nunjucks.configure(['app/views/', - 'node_modules/govuk-frontend/dist'], { +var env = nunjucks.configure([ + 'app/views/', + 'node_modules/govuk-frontend/dist', + 'node_modules/@x-govuk/govuk-prototype-components' +], { autoescape: true, express: app, watch: (process.env.ENV === 'development')