diff --git a/ds_judgements_public_ui/sass/includes/_header.scss b/ds_judgements_public_ui/sass/includes/_header.scss index 8ad9e914d..9b7a69bdd 100644 --- a/ds_judgements_public_ui/sass/includes/_header.scss +++ b/ds_judgements_public_ui/sass/includes/_header.scss @@ -1,12 +1,22 @@ .page-header { - &__flex-container-beta { + &__container { display: flex; - gap: $space-18; align-items: flex-end; justify-content: space-between; - padding: $space-6 0; + @media only screen and (min-width: $grid-breakpoint-medium) { + gap: $space-8; + } + + @media only screen and (min-width: $grid-breakpoint-large) { + gap: $space-10; + } + + @media only screen and (min-width: $grid-breakpoint-extra-large) { + gap: $space-18; + } + @media only screen and (max-width: $grid-breakpoint-medium) { flex-direction: column; gap: 0; @@ -19,19 +29,19 @@ } &__tna-logo { - width: 100px; - height: 100px; + width: 70px; + height: 70px; - @media only screen and (max-width: $grid-breakpoint-medium) { - width: 70px; - height: 70px; + @media only screen and (min-width: $grid-breakpoint-large) { + width: 100px; + height: 100px; } } &__tna-logo-link { display: inline-block; - width: 100px; - height: 100px; + width: 70px; + height: 70px; &:focus { @include focus-default; @@ -39,9 +49,9 @@ outline-color: colour-var("contrast-link"); } - @media only screen and (max-width: $grid-breakpoint-medium) { - width: 70px; - height: 70px; + @media only screen and (min-width: $grid-breakpoint-large) { + width: 100px; + height: 100px; } } } diff --git a/ds_judgements_public_ui/sass/includes/_service_introduction.scss b/ds_judgements_public_ui/sass/includes/_service_introduction.scss index 2b83accd5..459219be3 100644 --- a/ds_judgements_public_ui/sass/includes/_service_introduction.scss +++ b/ds_judgements_public_ui/sass/includes/_service_introduction.scss @@ -2,7 +2,10 @@ display: flex; flex-direction: column; flex-grow: 1; + width: 100%; + margin-top: $space-4; + margin-bottom: $space-2; &__header { display: flex; @@ -10,41 +13,41 @@ align-items: center; width: 100%; - margin: 0 $space-1; + margin: 0; font-family: $font-roboto; - font-size: $typography-2xl-text-size; + font-size: $typography-xl-text-size; font-weight: normal; line-height: $typography-md-line-height; color: colour-var("contrast-font-base"); text-wrap: nowrap; - @media only screen and (max-width: $grid-breakpoint-small) { - margin: 0; - font-size: $typography-xl-text-size; + @media only screen and (min-width: $grid-breakpoint-large) { + margin: 0 $space-1; + font-size: $typography-2xl-text-size; } } &__helper-text { display: inline-block; - margin: 0 $space-1; + margin: 0; font-family: $font-roboto; - font-size: $typography-lg-text-size; + font-size: $typography-sm-text-size; + font-weight: bold; line-height: 1.6rem; color: $color-yellow; text-wrap: balance; - @media only screen and (max-width: $grid-breakpoint-medium) { - margin: 0; - font-size: $typography-sm-text-size; - font-weight: bold; + @media only screen and (min-width: $grid-breakpoint-large) { + margin: 0 $space-1; + font-size: $typography-lg-text-size; + font-weight: normal; } } - @media only screen and (max-width: $grid-breakpoint-medium) { - margin-top: $space-4; - margin-bottom: $space-2; + @media only screen and (min-width: $grid-breakpoint-medium) { + margin: 0; } } diff --git a/ds_judgements_public_ui/templates/includes/header.html b/ds_judgements_public_ui/templates/includes/header.html new file mode 100644 index 000000000..696a086ab --- /dev/null +++ b/ds_judgements_public_ui/templates/includes/header.html @@ -0,0 +1,34 @@ +{% load navigation_tags %} +
+ {% include "includes/logo.html" %} + +
+ +

Find Case LawBeta

+

Judgments and decisions from 2001 onwards

+
+
+ +
+
diff --git a/ds_judgements_public_ui/templates/layouts/base.html b/ds_judgements_public_ui/templates/layouts/base.html index 1eeb16f3b..ed411d12f 100644 --- a/ds_judgements_public_ui/templates/layouts/base.html +++ b/ds_judgements_public_ui/templates/layouts/base.html @@ -45,39 +45,7 @@
Skip to Main Content
-
- {% include "includes/logo.html" %} - -
- -

Find Case LawBeta

-

Judgments and decisions from 2001 onwards

-
-
- -
-
+ {% include "includes/header.html" %} {% block breadcrumbs %} {% include "includes/breadcrumbs.html" %} {% endblock breadcrumbs %}