diff --git a/public/app/themes/clarity/src/globals/images/crown_copyright_logo.png b/public/app/themes/clarity/src/globals/images/crown_copyright_logo.png deleted file mode 100644 index 78e751cc2..000000000 Binary files a/public/app/themes/clarity/src/globals/images/crown_copyright_logo.png and /dev/null differ diff --git a/public/app/themes/clarity/src/globals/images/tudor_crest_black.svg b/public/app/themes/clarity/src/globals/images/tudor_crest_black.svg new file mode 100644 index 000000000..8311f2bd7 --- /dev/null +++ b/public/app/themes/clarity/src/globals/images/tudor_crest_black.svg @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/app/themes/clarity/src/globals/js/auth-heartbeat.js b/public/app/themes/clarity/src/globals/js/auth-heartbeat.js index f89e2b0f5..3bdd7b12f 100644 --- a/public/app/themes/clarity/src/globals/js/auth-heartbeat.js +++ b/public/app/themes/clarity/src/globals/js/auth-heartbeat.js @@ -30,7 +30,8 @@ export default (function ($) { maxWidth: '110px', height: 'auto', float: 'left', - marginRight: '30px' + marginRight: '30px', + paddingBottom: '10px' }, button: { continue: { @@ -115,9 +116,9 @@ export default (function ($) { // This element is on frontend and admin views. The frontend html has `font-size: 62.5%`, so use px values here. const heading = $('').text(title).css({fontWeight:'700', fontSize: '20px', lineHeight: '1.2', margin: 0}) - const content = $('').html(html).css({}) + const content = $('').html(html).css({ clear: 'both' }) const image = $('', { - src: '/app/themes/clarity/dist/images/crown_copyright_logo.png', + src: '/app/themes/clarity/dist/images/tudor_crest.svg', alt: 'Crown copyright logo', }).css(Backdrop.style.img); @@ -131,7 +132,7 @@ export default (function ($) { confirm: () => { if (Backdrop.cookie.get() !== Backdrop.cookie.value) { const title = 'You are about to view a test version of the MoJ Intranet' - const html = '
To participate in user acceptance testing, please continue.

' + + const html = 'To participate in user acceptance testing, please continue.

' + '   or   ' + '  Visit the live Intranet  ' diff --git a/public/app/themes/clarity/src/globals/sass/login.scss b/public/app/themes/clarity/src/globals/sass/login.scss index ad2547c1b..184ced72c 100644 --- a/public/app/themes/clarity/src/globals/sass/login.scss +++ b/public/app/themes/clarity/src/globals/sass/login.scss @@ -6,7 +6,7 @@ body.login { margin-bottom: 15px; a { - background-image: url('../images/moj-logo-crest.svg'); + background-image: url('../images/tudor_crest_black.svg'); background-size: 100px; height: 94px; width: 104px;