diff --git a/README.md b/README.md index 0805a7f5..89c62ea1 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ In your application you will need to do the following: From version 2.9.7 onwards, you can apply the new "ID7.1" styling to the site masthead in your app. To do so: -* Add the `id7-point-1` class to any `id7-utility-masthead` elements in your templates +* Add the `id7-point-1` class to the `` element in your templates * Replace the logo image `logo.png` with `logo.svg` in your templates * Update anything app-specific that needs updating - the whole masthead region should have a white background diff --git a/docs/_includes/templates/base.html b/docs/_includes/templates/base.html index 86c4e258..6e4f4aa3 100644 --- a/docs/_includes/templates/base.html +++ b/docs/_includes/templates/base.html @@ -23,7 +23,7 @@ - +
Skip to main content diff --git a/docs/_includes/utility-masthead.html b/docs/_includes/utility-masthead.html index d51bead4..1e5c916b 100644 --- a/docs/_includes/utility-masthead.html +++ b/docs/_includes/utility-masthead.html @@ -1,4 +1,4 @@ -
+
{% include utility-bar.html %} {% include masthead.html %} -
\ No newline at end of file +
diff --git a/docs/_layouts/borderless.html b/docs/_layouts/borderless.html index 50e6c524..690d1616 100644 --- a/docs/_layouts/borderless.html +++ b/docs/_layouts/borderless.html @@ -3,7 +3,7 @@ {% include header-borderless.html %} - +
Skip to main content diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 17e99137..f23646a6 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -3,7 +3,7 @@ {% include header.html %} - +
Skip to main content @@ -49,4 +49,4 @@

{{ page.title }}

- \ No newline at end of file + diff --git a/docs/_layouts/empty.html b/docs/_layouts/empty.html index 1e00f0fa..567c0b6f 100644 --- a/docs/_layouts/empty.html +++ b/docs/_layouts/empty.html @@ -3,7 +3,7 @@ {% include header.html %} - + {{ content }} diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html index d12b81a3..07ac9ff9 100644 --- a/docs/_layouts/home.html +++ b/docs/_layouts/home.html @@ -3,7 +3,7 @@ {% include header.html %} - +
Skip to main content @@ -39,4 +39,4 @@

{{ page.title }}

- \ No newline at end of file + diff --git a/docs/_layouts/hp-2019.html b/docs/_layouts/hp-2019.html index 69580ba4..fff7238a 100644 --- a/docs/_layouts/hp-2019.html +++ b/docs/_layouts/hp-2019.html @@ -7,7 +7,7 @@ - +
Skip to main content diff --git a/docs/_layouts/many-menus.html b/docs/_layouts/many-menus.html index d7d0d080..be25ade2 100644 --- a/docs/_layouts/many-menus.html +++ b/docs/_layouts/many-menus.html @@ -3,7 +3,7 @@ {% include header.html %} - +
Skip to main content diff --git a/docs/_layouts/wide.html b/docs/_layouts/wide.html index bc1c830c..f7333799 100644 --- a/docs/_layouts/wide.html +++ b/docs/_layouts/wide.html @@ -3,7 +3,7 @@ {% include header-wide.html %} - +
Skip to main content diff --git a/less/footer.less b/less/footer.less index 390e112b..0a541625 100644 --- a/less/footer.less +++ b/less/footer.less @@ -62,6 +62,17 @@ footer { } } +// ID-428 Remove W cutout in ID7.1 +body.id7-point-1 footer { + .id7-site-footer, .id7-app-footer { + @media screen { + .id7-logo-bleed { + display: none; + } + } + } +} + .id7-non-branded { .id7-page-footer { .id7-site-footer, .id7-app-footer { diff --git a/less/header.less b/less/header.less index 26512dbb..2c749eee 100644 --- a/less/header.less +++ b/less/header.less @@ -43,12 +43,12 @@ .position-logo-colour-block(@id7-masthead-logo-height-sm, @id7-masthead-logo-width-sm); } } +} - &.id7-point-1 { - @media (min-width: @grid-float-breakpoint) { - .id7-masthead .id7-logo a { - height: @id7-point-1-masthead-logo-height-sm; - } +body.id7-point-1 .id7-utility-masthead { + @media (min-width: @grid-float-breakpoint) { + .id7-masthead .id7-logo a { + height: @id7-point-1-masthead-logo-height-sm; } } } diff --git a/less/masthead.less b/less/masthead.less index f86fd002..75022cde 100644 --- a/less/masthead.less +++ b/less/masthead.less @@ -224,7 +224,7 @@ } // Overrides for ID7.1, July 2024, ID-416 -.id7-utility-masthead.id7-point-1 .id7-masthead { +body.id7-point-1 .id7-utility-masthead .id7-masthead { background-image: none; .id7-logo-column { diff --git a/less/mixins/branding.less b/less/mixins/branding.less index c91770cd..e808707e 100644 --- a/less/mixins/branding.less +++ b/less/mixins/branding.less @@ -12,11 +12,11 @@ .apply-masthead-image(@url) { .id7-utility-masthead { background-image: url(@url); - } - .id7-utility-masthead.id7-point-1 { - background-image: none; - background-color: white; + body.id7-point-1 & { + background-image: none; + background-color: white; + } } } @@ -308,10 +308,9 @@ // Colour of the "WARWICK" text on the logo .id7-utility-masthead::after { background-color: @colour; - } - - .id7-utility-masthead.id7-point-1::after { - background-color: transparent; + body.id7-point-1 & { + background-color: transparent; + } } .id7-navigation .navbar-primary { diff --git a/less/utility-bar.less b/less/utility-bar.less index 92ab4022..0ac129b6 100644 --- a/less/utility-bar.less +++ b/less/utility-bar.less @@ -157,7 +157,7 @@ } // Overrides for ID7.1, January 2024, ID-416 -.id7-utility-masthead.id7-point-1 .id7-utility-bar { +body.id7-point-1 .id7-utility-masthead .id7-utility-bar { .link-colour(@text-color); > ul { @@ -167,4 +167,4 @@ a > .fa-stack.id7-notifications-badge { > i { color: #dddddd; } } -} \ No newline at end of file +} diff --git a/templates/base.html b/templates/base.html index ad23e8ed..5b948371 100644 --- a/templates/base.html +++ b/templates/base.html @@ -26,7 +26,7 @@ - +
Skip to main content