diff --git a/source/assets/images/gov.uk_logotype_crown_invert_trans.png b/source/assets/images/gov.uk_logotype_crown_invert_trans.png index 152b83ea..82600e65 100644 Binary files a/source/assets/images/gov.uk_logotype_crown_invert_trans.png and b/source/assets/images/gov.uk_logotype_crown_invert_trans.png differ diff --git a/source/assets/stylesheets/_core-print.scss b/source/assets/stylesheets/_core-print.scss index 35e1d1c1..d68a39db 100644 --- a/source/assets/stylesheets/_core-print.scss +++ b/source/assets/stylesheets/_core-print.scss @@ -37,23 +37,21 @@ img { max-width: 100% !important; } select { background: white; } #global-header { - color: #000; - font-weight: bold; - font-size: 24px; - margin-bottom: 1em; + margin: 3px 0 1em; // 3px additional space at top for countering -3px re-positioning of #logo img #logo { - @include core-48; + @include bold-48; font-size: 28pt; - font-weight: bold; + /* `bold-80` can be used instead when govuk_frontend_toolkit gem is >= 4.18.2, + see https://github.com/alphagov/govuk_frontend_toolkit/pull/328 */ text-rendering: optimizeLegibility; img { - width: 46px; + width: 45px; height: 40px; - padding-right: 6px; - display: block; - float: left; + position: relative; + top: -3px; // aligns bottom of img with bottom of "G" + vertical-align: bottom; } } diff --git a/source/assets/stylesheets/_header.scss b/source/assets/stylesheets/_header.scss index 5c49dff7..0acd2886 100644 --- a/source/assets/stylesheets/_header.scss +++ b/source/assets/stylesheets/_header.scss @@ -40,7 +40,7 @@ } } .header-logo { - margin: 5px 0 2px; + margin-top: 2px; } } } @@ -71,44 +71,26 @@ #logo { float: left; - position: relative; - top: -1px; - - height: 30px; overflow: visible; - vertical-align: baseline; color: $white; font-weight: bold; font-size: 30px; - line-height: 1em; + line-height: 1; text-decoration: none; text-rendering: optimizeLegibility; - margin-bottom: -3px; - padding-top: 2px; border-bottom: 1px solid transparent; background: image-url('images/gov.uk_logotype_crown.png') no-repeat; - background-size: 35px 31px; + background-size: 36px 32px; background-position: 0 0; @include ie-lte(8) { background-image: image-url('images/gov.uk_logotype_crown-1x.png'); } img { - position: relative; - top: -2px; - - width: 35px; - height: 31px; - - padding-right: 6px; - - float: left; - display: inline; - line-height: inherit; - border: none; - + margin: 2px 1px 0 0; // top margin aligns bottom of img with bottom of "G" + vertical-align: bottom; visibility: hidden; } diff --git a/source/assets/stylesheets/images/gov.uk_logotype_crown-1x.png b/source/assets/stylesheets/images/gov.uk_logotype_crown-1x.png index 87922bc9..a6cdbfd4 100644 Binary files a/source/assets/stylesheets/images/gov.uk_logotype_crown-1x.png and b/source/assets/stylesheets/images/gov.uk_logotype_crown-1x.png differ diff --git a/source/assets/stylesheets/images/gov.uk_logotype_crown.png b/source/assets/stylesheets/images/gov.uk_logotype_crown.png index 1393390f..77e50de1 100644 Binary files a/source/assets/stylesheets/images/gov.uk_logotype_crown.png and b/source/assets/stylesheets/images/gov.uk_logotype_crown.png differ diff --git a/source/views/layouts/govuk_template.html.erb b/source/views/layouts/govuk_template.html.erb index 6c5b9158..d27c4e42 100644 --- a/source/views/layouts/govuk_template.html.erb +++ b/source/views/layouts/govuk_template.html.erb @@ -54,7 +54,7 @@