diff --git a/src/nationalarchives/components/button/button.scss b/src/nationalarchives/components/button/button.scss index 890350f9..849b7cff 100644 --- a/src/nationalarchives/components/button/button.scss +++ b/src/nationalarchives/components/button/button.scss @@ -94,7 +94,7 @@ } .tna-background--accent &--accent { - @include colour.fixed; + @include colour.plain; @include colour.colour-background("page-background"); diff --git a/src/nationalarchives/components/header/header.scss b/src/nationalarchives/components/header/header.scss index 8450dca6..c41b00df 100644 --- a/src/nationalarchives/components/header/header.scss +++ b/src/nationalarchives/components/header/header.scss @@ -47,10 +47,6 @@ .tna-header { @include colour.invert; - color: colour.brand-colour("white"); - - background-color: colour.brand-colour("black"); - &__exit { padding-top: 0.5rem; padding-bottom: 0.5rem; @@ -148,22 +144,10 @@ &:hover { text-decoration: none; - } - - // &--href { - // &:hover { - // outline: 0.375rem #fff solid; - // outline-offset: 1px; - - // // .tna-logo__background { - // // fill: #fff; - // // } - // // .tna-logo__foreground { - // // fill: #000; - // // } - // } - // } + @include colour.colour-outline("font-dark", 0.375rem, solid); + outline-offset: 1px; + } } .tna-logo { @@ -173,18 +157,8 @@ display: inline-block; } - &__logo-link--href:hover .tna-logo { - outline: 0.375rem #fff solid; - outline-offset: 1px; - } - - &__logo-link--href:active .tna-logo, - &__logo-link--href:focus .tna-logo { - outline: none; - } - .tna-logo__foreground { - fill: #fff; + @include colour.colour-fill("font-dark"); } .tna-logo__background { @@ -210,7 +184,7 @@ display: block; - background-color: #fff; + @include colour.colour-background("font-dark"); transition: height 1ms 200ms; @@ -289,50 +263,6 @@ } } - &--yellow, - &--pink, - &--orange, - &--green, - &--blue { - color: colour.brand-colour("black"); - - .tna-header__logo-link { - &:hover { - .tna-logo { - outline-color: #000; - } - } - } - - .tna-logo__foreground { - fill: #000; - } - - .tna-header__hamburger { - background-color: colour.brand-colour("black"); - } - } - - &--yellow { - background-color: colour.brand-colour("yellow"); - } - - &--pink { - background-color: colour.brand-colour("pink"); - } - - &--orange { - background-color: colour.brand-colour("orange"); - } - - &--green { - background-color: colour.brand-colour("green"); - } - - &--blue { - background-color: colour.brand-colour("blue"); - } - &__navigation { display: flex; flex-direction: column-reverse; @@ -377,6 +307,11 @@ @include typography.interacted-text-decoration; } } + + .fa-solid, + .fa-brands { + margin-right: 0.375rem; + } } &__navigation-items { @@ -520,7 +455,7 @@ &__navigation-item-link { padding-right: gridVars.$gutter-width-tiny; - padding-left: gridVars.$gutter-width-tiny + 1rem; + padding-left: gridVars.$gutter-width-tiny + 0.5rem; display: block; @@ -577,4 +512,8 @@ line-height: 1.25; } } + + &--accent { + @include colour.accent; + } } diff --git a/src/nationalarchives/components/header/header.stories.js b/src/nationalarchives/components/header/header.stories.js index 1d0f0892..2508bacb 100644 --- a/src/nationalarchives/components/header/header.stories.js +++ b/src/nationalarchives/components/header/header.stories.js @@ -66,10 +66,12 @@ Standard.args = { { text: "Top item 2", href: "#/top-2", + icon: "phone", }, { text: "Top item 3", href: "#/top-3", + brandIcon: "github", }, ], navigation: [ diff --git a/src/nationalarchives/components/header/macro-options.json b/src/nationalarchives/components/header/macro-options.json index c9cd5390..abaf537b 100644 --- a/src/nationalarchives/components/header/macro-options.json +++ b/src/nationalarchives/components/header/macro-options.json @@ -80,6 +80,18 @@ "type": "string", "required": false, "description": "" + }, + { + "name": "icon", + "type": "string", + "required": false, + "description": "" + }, + { + "name": "brandIcon", + "type": "string", + "required": false, + "description": "" } ] }, diff --git a/src/nationalarchives/components/header/template.njk b/src/nationalarchives/components/header/template.njk index c980327f..00aa513c 100644 --- a/src/nationalarchives/components/header/template.njk +++ b/src/nationalarchives/components/header/template.njk @@ -51,6 +51,11 @@ {%- for item in params.topNavigation -%}