diff --git a/app/assets/sass/product-page.scss b/app/assets/sass/product-page.scss
index e4e3044b..04d7bd6b 100644
--- a/app/assets/sass/product-page.scss
+++ b/app/assets/sass/product-page.scss
@@ -17,6 +17,7 @@ $govuk-global-styles: true;
@import "./product/navigation";
@import "./product/related-items";
@import "./product/responsive-embed";
+@import "./product/service-navigation";
@import "./product/sub-navigation";
@import "./product/tasklist";
@@ -38,7 +39,7 @@ $govuk-global-styles: true;
div.feature-panel {
text-align: left;
- border: 3px solid #f3f2f1;
+ border: 3px solid govuk-colour("light-grey");
box-sizing: border-box;
}
diff --git a/app/assets/sass/product/_hero.scss b/app/assets/sass/product/_hero.scss
index ba9a68f1..27351a13 100644
--- a/app/assets/sass/product/_hero.scss
+++ b/app/assets/sass/product/_hero.scss
@@ -36,7 +36,6 @@
.hero {
@extend .govuk-width-container;
- margin-top: -10px;
margin-bottom: 0;
color: govuk-colour("white");
padding: 0 0 govuk-spacing(2) 0;
diff --git a/app/assets/sass/product/_inverted-button.scss b/app/assets/sass/product/_inverted-button.scss
index 145d0eac..f33a79a5 100644
--- a/app/assets/sass/product/_inverted-button.scss
+++ b/app/assets/sass/product/_inverted-button.scss
@@ -28,6 +28,6 @@ $app-button-inverted-hover-background-colour: govuk-tint($app-button-inverted-fo
color: $app-button-inverted-foreground-colour;
background-color: $app-button-inverted-hover-background-colour;
box-shadow: inset 0 0 0 2px $govuk-focus-colour;
- text-underline: #0b0c0c;
+ text-underline: $govuk-focus-text-colour;
text-decoration-line: underline;
}
diff --git a/app/assets/sass/product/_masthead.scss b/app/assets/sass/product/_masthead.scss
index 3ef760eb..b9596192 100644
--- a/app/assets/sass/product/_masthead.scss
+++ b/app/assets/sass/product/_masthead.scss
@@ -13,5 +13,8 @@
.masthead {
background-color: $govuk-brand-colour;
- margin-bottom: govuk-spacing(8);
+ border-bottom: 1px solid $govuk-brand-colour;
+ @include govuk-responsive-margin(8, "bottom");
+ @include govuk-responsive-padding(6, "bottom");
+ @include govuk-responsive-padding(6, "top");
}
diff --git a/app/views/product-pages/basic/features.html b/app/views/product-pages/basic/features.html
index f7c615d7..e4b028b6 100644
--- a/app/views/product-pages/basic/features.html
+++ b/app/views/product-pages/basic/features.html
@@ -6,62 +6,17 @@
{% endblock %}
{% block header %}
-
+{{ govukHeader({
+ homepageUrl: "/product-pages/basic/",
+ productName: "Forms"
+}) }}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Features", href: "features", active: true },
+ { text: "Support", href: "support" }
+ ]
+}) }}
{% endblock header %}
{% block content %}
diff --git a/app/views/product-pages/basic/index.html b/app/views/product-pages/basic/index.html
index 036cfabd..01c7a283 100644
--- a/app/views/product-pages/basic/index.html
+++ b/app/views/product-pages/basic/index.html
@@ -12,88 +12,18 @@
{% endblock %}
{% block header %}
-Skip to main content
-
-
-
+{{ govukHeader({
+ homepageUrl: "/product-pages/basic/",
+ productName: "Forms"
+}) }}
+
+{{ govukServiceNavigation({
+ classes: "govuk-service-navigation--inverse",
+ navigation: [
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ]
+}) }}
{% endblock header %}
{% block main %}
diff --git a/app/views/product-pages/basic/support.html b/app/views/product-pages/basic/support.html
index 05409f53..a5f5e011 100644
--- a/app/views/product-pages/basic/support.html
+++ b/app/views/product-pages/basic/support.html
@@ -6,62 +6,17 @@
{% endblock %}
{% block header %}
-
+{{ govukHeader({
+ homepageUrl: "/product-pages/basic/",
+ productName: "Forms"
+}) }}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support", active: true }
+ ]
+}) }}
{% endblock header %}
{% block content %}
diff --git a/app/views/product-pages/earlyaccess/features.html b/app/views/product-pages/earlyaccess/features.html
index 2f567ddb..49ea5b10 100644
--- a/app/views/product-pages/earlyaccess/features.html
+++ b/app/views/product-pages/earlyaccess/features.html
@@ -6,66 +6,29 @@
{% endblock %}
{% block header %}
-
+{{ govukHeader({
+ homepageUrl: "/product-pages/earlyaccess",
+ productName: "Forms"
+}) }}
+
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features", active: true },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block content %}
diff --git a/app/views/product-pages/earlyaccess/get-started.html b/app/views/product-pages/earlyaccess/get-started.html
index 0325dd3e..37fb5a1e 100644
--- a/app/views/product-pages/earlyaccess/get-started.html
+++ b/app/views/product-pages/earlyaccess/get-started.html
@@ -6,65 +6,29 @@
{% endblock %}
{% block header %}
-
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Get started", href: "get-started", active: true },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block content %}
diff --git a/app/views/product-pages/earlyaccess/index.html b/app/views/product-pages/earlyaccess/index.html
index f8881c98..9c35b337 100644
--- a/app/views/product-pages/earlyaccess/index.html
+++ b/app/views/product-pages/earlyaccess/index.html
@@ -12,75 +12,31 @@
{% endblock %}
{% block header %}
- Skip to main content
-
-
-
+{{ govukHeader({
+ homepageUrl: "/product-pages/earlyaccess",
+ productName: "Forms"
+}) }}
+
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ classes: "govuk-service-navigation--inverse",
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
+
{% endblock header %}
{% block main %}
@@ -232,4 +188,4 @@
-{% endblock main %}
\ No newline at end of file
+{% endblock main %}
diff --git a/app/views/product-pages/earlyaccess/next.html b/app/views/product-pages/earlyaccess/next.html
index 09f443a6..074b66b4 100644
--- a/app/views/product-pages/earlyaccess/next.html
+++ b/app/views/product-pages/earlyaccess/next.html
@@ -6,66 +6,29 @@
{% endblock %}
{% block header %}
-
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
diff --git a/app/views/product-pages/earlyaccess/requirements.html b/app/views/product-pages/earlyaccess/requirements.html
index 49e618b9..e7f30947 100644
--- a/app/views/product-pages/earlyaccess/requirements.html
+++ b/app/views/product-pages/earlyaccess/requirements.html
@@ -6,66 +6,29 @@
{% endblock %}
{% block header %}
-
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block content %}
diff --git a/app/views/product-pages/earlyaccess/support.html b/app/views/product-pages/earlyaccess/support.html
index 0f9d70a5..625e807b 100644
--- a/app/views/product-pages/earlyaccess/support.html
+++ b/app/views/product-pages/earlyaccess/support.html
@@ -6,66 +6,29 @@
{% endblock %}
{% block header %}
-
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support", active: true }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block content %}
diff --git a/app/views/product-pages/earlyaccess/trial.html b/app/views/product-pages/earlyaccess/trial.html
index c390b984..4af547b9 100644
--- a/app/views/product-pages/earlyaccess/trial.html
+++ b/app/views/product-pages/earlyaccess/trial.html
@@ -6,66 +6,29 @@
{% endblock %}
{% block header %}
-
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block content %}
diff --git a/app/views/product-pages/group-admin/get-started.html b/app/views/product-pages/group-admin/get-started.html
index 6f09144a..b530863d 100644
--- a/app/views/product-pages/group-admin/get-started.html
+++ b/app/views/product-pages/group-admin/get-started.html
@@ -6,65 +6,29 @@
{% endblock %}
{% block header %}
-
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Get started", href: "get-started", active: true },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block content %}
diff --git a/app/views/product-pages/group-admin/index.html b/app/views/product-pages/group-admin/index.html
index d7e04e49..70f6b91d 100644
--- a/app/views/product-pages/group-admin/index.html
+++ b/app/views/product-pages/group-admin/index.html
@@ -12,70 +12,30 @@
{% endblock %}
{% block header %}
-Skip to main content
-
-
-
+{{ govukHeader({
+ homepageUrl: "/product-pages/group-admin/",
+ productName: "Forms"
+}) }}
+
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ classes: "govuk-service-navigation--inverse",
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block main %}
@@ -242,4 +202,4 @@
-{% endblock main %}
\ No newline at end of file
+{% endblock main %}
diff --git a/app/views/product-pages/group-admin/next.html b/app/views/product-pages/group-admin/next.html
index 09f443a6..e737406e 100644
--- a/app/views/product-pages/group-admin/next.html
+++ b/app/views/product-pages/group-admin/next.html
@@ -6,66 +6,29 @@
{% endblock %}
{% block header %}
-
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
diff --git a/app/views/product-pages/mou/index.html b/app/views/product-pages/mou/index.html
index d177bfd6..030103ae 100644
--- a/app/views/product-pages/mou/index.html
+++ b/app/views/product-pages/mou/index.html
@@ -6,66 +6,30 @@
{% endblock %}
{% block header %}
-
+{{ govukHeader({
+ homepageUrl: "/product-pages/mou",
+ productName: "Forms"
+}) }}
+
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ classes: "govuk-service-navigation--inverse",
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block content %}
diff --git a/app/views/product-pages/mou/mounext.html b/app/views/product-pages/mou/mounext.html
index 2be9bf32..8fb9f67d 100644
--- a/app/views/product-pages/mou/mounext.html
+++ b/app/views/product-pages/mou/mounext.html
@@ -6,66 +6,29 @@
{% endblock %}
{% block header %}
-
+{{ govukHeader({
+ homepageUrl: "/product-pages/mou",
+ productName: "Forms"
+}) }}
+
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
diff --git a/app/views/product-pages/org-admin/get-started.html b/app/views/product-pages/org-admin/get-started.html
index 6f09144a..4dd056ec 100644
--- a/app/views/product-pages/org-admin/get-started.html
+++ b/app/views/product-pages/org-admin/get-started.html
@@ -6,65 +6,29 @@
{% endblock %}
{% block header %}
-
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Get started", href: "get-started", active: true },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block content %}
diff --git a/app/views/product-pages/org-admin/index.html b/app/views/product-pages/org-admin/index.html
index 745f59f6..975623dd 100644
--- a/app/views/product-pages/org-admin/index.html
+++ b/app/views/product-pages/org-admin/index.html
@@ -12,95 +12,30 @@
{% endblock %}
{% block header %}
-Skip to main content
-
-
-
+{{ govukHeader({
+ homepageUrl: "/product-pages/org-admin",
+ productName: "Forms"
+}) }}
+
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ classes: "govuk-service-navigation--inverse",
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block main %}
diff --git a/app/views/product-pages/signup/features.html b/app/views/product-pages/signup/features.html
index 2f567ddb..9ec15782 100644
--- a/app/views/product-pages/signup/features.html
+++ b/app/views/product-pages/signup/features.html
@@ -6,66 +6,29 @@
{% endblock %}
{% block header %}
-
+{{ govukHeader({
+ homepageUrl: "/product-pages/signup/",
+ productName: "Forms"
+}) }}
+
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features", active: true },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block content %}
diff --git a/app/views/product-pages/signup/get-started.html b/app/views/product-pages/signup/get-started.html
index 6bbf5c18..69b2acd1 100644
--- a/app/views/product-pages/signup/get-started.html
+++ b/app/views/product-pages/signup/get-started.html
@@ -6,65 +6,29 @@
{% endblock %}
{% block header %}
-
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Get started", href: "get-started", active: true },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block content %}
diff --git a/app/views/product-pages/signup/index.html b/app/views/product-pages/signup/index.html
index 53ff2037..b303969e 100644
--- a/app/views/product-pages/signup/index.html
+++ b/app/views/product-pages/signup/index.html
@@ -12,95 +12,30 @@
{% endblock %}
{% block header %}
-Skip to main content
-
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
-
+{{ govukServiceNavigation({
+ classes: "govuk-service-navigation--inverse",
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support" }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block main %}
diff --git a/app/views/product-pages/signup/support.html b/app/views/product-pages/signup/support.html
index 0f9d70a5..53a230ee 100644
--- a/app/views/product-pages/signup/support.html
+++ b/app/views/product-pages/signup/support.html
@@ -6,66 +6,29 @@
{% endblock %}
{% block header %}
-
+{% set signInNavigationItemHtml %}
+
+
+ Sign in
+
+
+{% endset %}
+
+{{ govukServiceNavigation({
+ navigation: [
+ { text: "Get started", href: "get-started" },
+ { text: "Features", href: "features" },
+ { text: "Support", href: "support", active: true }
+ ],
+ slots: {
+ navigationEnd: signInNavigationItemHtml
+ }
+}) }}
{% endblock header %}
{% block content %}