diff --git a/docker-compose.yml b/docker-compose.yml index 666cc517a..b0a5bd37a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -86,6 +86,8 @@ services: MYSQL_USER: ${DB_USER} MYSQL_PASSWORD: ${DB_PASSWORD} MYSQL_DATABASE: ${DB_NAME} + depends_on: + - redis phpmyadmin: container_name: intranet-phpmyadmin @@ -205,6 +207,7 @@ services: - nginx redis: + container_name: intranet-redis image: 'bitnami/redis:latest' environment: - ALLOW_EMPTY_PASSWORD=yes diff --git a/public/app/themes/clarity/src/components/c-copyright-notice/style.styl b/public/app/themes/clarity/src/components/c-copyright-notice/style.styl index 32a000970..db5836c23 100644 --- a/public/app/themes/clarity/src/components/c-copyright-notice/style.styl +++ b/public/app/themes/clarity/src/components/c-copyright-notice/style.styl @@ -7,7 +7,7 @@ img { width: 30%; +above(m) { - width: 60%; + width: 65%; } } } diff --git a/public/app/themes/clarity/src/components/c-copyright-notice/view.php b/public/app/themes/clarity/src/components/c-copyright-notice/view.php index a17db6ad7..d3388fa32 100644 --- a/public/app/themes/clarity/src/components/c-copyright-notice/view.php +++ b/public/app/themes/clarity/src/components/c-copyright-notice/view.php @@ -1,5 +1,5 @@
- crown copyright logo + crown copyright logo
© Crown copyright
diff --git a/public/app/themes/clarity/src/components/c-global-header/base-header.php b/public/app/themes/clarity/src/components/c-global-header/base-header.php index 34536189f..2cd3028aa 100644 --- a/public/app/themes/clarity/src/components/c-global-header/base-header.php +++ b/public/app/themes/clarity/src/components/c-global-header/base-header.php @@ -4,7 +4,7 @@ /** * The header for our theme * - * This is the template that displays all of the section + * This is the template that displays all the section * * @link https://developer.wordpress.org/themes/basics/template-files/#template-partials * @@ -14,48 +14,43 @@ $oAgency = new Agency(); $activeAgency = $oAgency->getCurrentAgency() ? $oAgency->getCurrentAgency() : 'hq'; -// define the title -$header_title = get_the_title(); - -// Search page? -if (is_search()) { - $header_title = 'Search: ' . get_search_query(); - - $query_post_type = sanitize_text_field($_GET['post_types'] ?? null); - if ($query_post_type) { - $header_title .= ' (' . $query_post_type . ')'; - } -} - ?> - - - - + + + + - <?= $header_title ?><?= ' - ' . $activeAgency['label'] . ' Intranet'; ?> + <?php echo single_post_title(); ?><?php echo ' - ' . $activeAgency['label'] . ' Intranet'; ?> - - - - - - - - - - - + + + + + + - - @@ -65,22 +60,25 @@ } ?> - - + + + > Skip to main content diff --git a/public/app/themes/clarity/src/components/c-logo-bar/style.styl b/public/app/themes/clarity/src/components/c-logo-bar/style.styl index 521e53398..4c1085ba0 100644 --- a/public/app/themes/clarity/src/components/c-logo-bar/style.styl +++ b/public/app/themes/clarity/src/components/c-logo-bar/style.styl @@ -15,16 +15,17 @@ text-decoration: none; } - .image { - background-size: inherit; - background-repeat: no-repeat; - background-position: 1px 12px; - width: 38px; - height: 49px; + &__logo { display: block; float: left; - margin-right: 2px; + height: 50px; + margin: -1px 2px 0 0; + -o-object-fit: contain; + object-fit: contain; + padding-left: 1px; + width: 38px; } + .agency-title { color: white; font-size: 26px; @@ -48,7 +49,6 @@ } .u-wrapper { - &__stack--right { padding: $spacing 0 $spacing; } diff --git a/public/app/themes/clarity/src/components/c-logo-bar/view.php b/public/app/themes/clarity/src/components/c-logo-bar/view.php index 214056d62..fe393805d 100644 --- a/public/app/themes/clarity/src/components/c-logo-bar/view.php +++ b/public/app/themes/clarity/src/components/c-logo-bar/view.php @@ -6,14 +6,13 @@ $activeAgency = $oAgency->getCurrentAgency(); $header_logo = get_field(get_intranet_code() .'_header_logo', 'option'); $logo = get_stylesheet_directory_uri() . '/dist/images/moj_logo_header.png'; -$size = "94%"; +# If the agency is the law commission, use the new logo if ($activeAgency['shortcode'] === 'law-commission') { - $logo = get_stylesheet_directory_uri() . '/dist/images/lawcomms_logo_new.jpg'; - $size = "100%"; + $logo = get_stylesheet_directory_uri() . '/dist/images/lawcomms_logo_new.png'; } -# If header logo is set, use that instead +# If a header logo is set, use that instead if (!empty($header_logo)) { $logo = $header_logo; } @@ -23,9 +22,9 @@
- -   - + + +
diff --git a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-114x114.png b/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-114x114.png deleted file mode 100644 index 4b091711d..000000000 Binary files a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-114x114.png and /dev/null differ diff --git a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-120x120.png b/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-120x120.png deleted file mode 100644 index 80c0a297b..000000000 Binary files a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-120x120.png and /dev/null differ diff --git a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-144x144.png b/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-144x144.png deleted file mode 100644 index f7a88e7ad..000000000 Binary files a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-144x144.png and /dev/null differ diff --git a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-152x152.png b/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-152x152.png deleted file mode 100644 index a60e47ac5..000000000 Binary files a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-152x152.png and /dev/null differ diff --git a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-180x180.png b/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-180x180.png deleted file mode 100644 index 475318097..000000000 Binary files a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-180x180.png and /dev/null differ diff --git a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-57x57.png b/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-57x57.png deleted file mode 100644 index 5a947b75c..000000000 Binary files a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-57x57.png and /dev/null differ diff --git a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-72x72.png b/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-72x72.png deleted file mode 100644 index 6880c1ca3..000000000 Binary files a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-72x72.png and /dev/null differ diff --git a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-76x76.png b/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-76x76.png deleted file mode 100644 index 6bda50b2e..000000000 Binary files a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon-76x76.png and /dev/null differ diff --git a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon.png b/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon.png index 5a947b75c..52c1a7c48 100644 Binary files a/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon.png and b/public/app/themes/clarity/src/globals/images/icons/apple-touch-icon.png differ diff --git a/public/app/themes/clarity/src/globals/images/icons/favicon-48x48.png b/public/app/themes/clarity/src/globals/images/icons/favicon-48x48.png new file mode 100644 index 000000000..8c3242228 Binary files /dev/null and b/public/app/themes/clarity/src/globals/images/icons/favicon-48x48.png differ diff --git a/public/app/themes/clarity/src/globals/images/icons/favicon.ico b/public/app/themes/clarity/src/globals/images/icons/favicon.ico index 0fd4e0da6..7fab0769f 100644 Binary files a/public/app/themes/clarity/src/globals/images/icons/favicon.ico and b/public/app/themes/clarity/src/globals/images/icons/favicon.ico differ diff --git a/public/app/themes/clarity/src/globals/images/icons/favicon.svg b/public/app/themes/clarity/src/globals/images/icons/favicon.svg new file mode 100644 index 000000000..4b2725069 --- /dev/null +++ b/public/app/themes/clarity/src/globals/images/icons/favicon.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/app/themes/clarity/src/globals/images/icons/site.webmanifest b/public/app/themes/clarity/src/globals/images/icons/site.webmanifest new file mode 100644 index 000000000..25aa8d55c --- /dev/null +++ b/public/app/themes/clarity/src/globals/images/icons/site.webmanifest @@ -0,0 +1,21 @@ +{ + "name": "MoJ Intranet", + "short_name": "Intranet", + "icons": [ + { + "src": "/app/themes/clarity/dist/images/icons/web-app-manifest-192x192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "/app/themes/clarity/dist/images/icons/web-app-manifest-512x512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} \ No newline at end of file diff --git a/public/app/themes/clarity/src/globals/images/icons/web-app-manifest-192x192.png b/public/app/themes/clarity/src/globals/images/icons/web-app-manifest-192x192.png new file mode 100644 index 000000000..1bad71d62 Binary files /dev/null and b/public/app/themes/clarity/src/globals/images/icons/web-app-manifest-192x192.png differ diff --git a/public/app/themes/clarity/src/globals/images/icons/web-app-manifest-512x512.png b/public/app/themes/clarity/src/globals/images/icons/web-app-manifest-512x512.png new file mode 100644 index 000000000..ba14f119c Binary files /dev/null and b/public/app/themes/clarity/src/globals/images/icons/web-app-manifest-512x512.png differ diff --git a/public/app/themes/clarity/src/globals/images/lawcomms_logo_new.jpg b/public/app/themes/clarity/src/globals/images/lawcomms_logo_new.jpg index 0c412a4da..69dac74b3 100644 Binary files a/public/app/themes/clarity/src/globals/images/lawcomms_logo_new.jpg and b/public/app/themes/clarity/src/globals/images/lawcomms_logo_new.jpg differ diff --git a/public/app/themes/clarity/src/globals/images/moj_logo_header.png b/public/app/themes/clarity/src/globals/images/moj_logo_header.png index c01905884..96fe145f3 100644 Binary files a/public/app/themes/clarity/src/globals/images/moj_logo_header.png and b/public/app/themes/clarity/src/globals/images/moj_logo_header.png differ diff --git a/public/app/themes/clarity/src/globals/images/tudor_crest.svg b/public/app/themes/clarity/src/globals/images/tudor_crest.svg new file mode 100644 index 000000000..5e66404f1 --- /dev/null +++ b/public/app/themes/clarity/src/globals/images/tudor_crest.svg @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +