Merge pull request #446 from NHSLeadership/develop

v2.3.3 release

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 99

404.php

@@ -32,7 +32,12 @@
 							?>
 						</div>
 					</div>
-					<?php get_template_part( 'template-parts/sitemap' ); ?>
+					<?php
+						$blog_404sitemap_display = get_theme_mod( 'blog_404sitemap_display', 'true' );
+						if ( 'true' === $blog_404sitemap_display ) {
+							get_template_part( 'template-parts/sitemap' );
+						}
+					?>
 				</div>
 				<div class="nhsuk-content__clearfix"></div>
 			</section>

README.md

@@ -1,4 +1,4 @@
-# Nightingale 2.2.4
+# Nightingale 2.3.3
 <img src="https://img.shields.io/badge/nightingale-v2.2.4-blue"> <a href="https://github.com/nhsuk/nhsuk-frontend
 "><img src="https://img.shields.io/badge/nhsuk--frontend-v3.1.0-blue"></a> <a href="https://www.gnu.org/licenses/gpl-3.0.en.html"><img src="https://img.shields.io/badge/license-GPL%20(%3E%3D3)-green"></a> <a href="https://wordpress.org"><img src="https://img.shields.io/badge/WordPress-v5.5%20%2B-lightgrey"></a> <img src="https://img.shields.io/badge/php-5.6%2B-red"> <img src="https://img.shields.io/badge/pull%20requests-welcome-blueviolet"> <a href="https://wordpress.org/themes/nightingale"><img src="https://img.shields.io/badge/theme%20install-WP%20repo-lightgrey"></a>
 

assets/scss/default.scss

@@ -471,7 +471,7 @@ input[type="text"]:not(.nhsuk-search__input),
 input[type="email"],
 input[type="url"],
 input[type="password"],
-input[type="search"],
+input[type="search"]:not(.nhsuk-search__input),
 input[type="number"],
 input[type="tel"],
 input[type="range"],

assets/scss/generic-overrides.scss

@@ -72,14 +72,10 @@
 }
 
 
-#login #loginform .user-login:focus, #login #loginform .user_pass:focus, .learndash-wrapper .wpProQuiz_content input:focus[type=text], .nhsuk-input:focus, .nhsuk-list-panel .comment-respond input:focus[type=text], input:focus[type=color], input:focus[type=date], input:focus[type=datetime-local], input:focus[type=datetime], input:focus[type=email], input:focus[type=month], input:focus[type=number], input:focus[type=password], input:focus[type=range], input:focus[type=search], input:focus[type=tel], input:focus[type=text]:not(.nhsuk-search__input), input:focus[type=time], input:focus[type=url], input:focus[type=week], textarea:focus {
+#login #loginform .user-login:focus, #login #loginform .user_pass:focus, .learndash-wrapper .wpProQuiz_content input:focus[type=text], .nhsuk-input:focus, .nhsuk-list-panel .comment-respond input:focus[type=text], input:focus[type=color], input:focus[type=date], input:focus[type=datetime-local], input:focus[type=datetime], input:focus[type=email], input:focus[type=month], input:focus[type=number], input:focus[type=password], input:focus[type=range], input:focus[type=search]:not(.nhsuk-search__input), input:focus[type=tel], input:focus[type=text]:not(.nhsuk-search__input), input:focus[type=time], input:focus[type=url], input:focus[type=week], textarea:focus {
   box-shadow : 0 0 0 nhsuk-spacing(1) $color_nhsuk-yellow;
 }
 
-.nhsuk-search__input#search-field {
-  width : 15rem;
-}
-
 #cookie-notice {
   position : fixed;
   left     : 0;

assets/scss/header.scss

@@ -18,20 +18,6 @@
 	float: left;
   }
 
-  .nhsuk-search__input {
-	border-radius : $nhsuk-border-radius 0 0 $nhsuk-border-radius;
-	border        : none;
-	border-right  : none;
-  }
-
-  @media (max-width : 40.0525em) {
-	.nhsuk-search__input {
-	  border : $nhsuk-border-width-form-element solid $nhsuk-border-color;
-	  height : 52px;
-	}
-  }
-
-
   // Below here is all the white header variation.
   &.nhsuk-header--white {
 	.nhsuk-header__search-wrap input[type="search"] {

assets/scss/nhsblocks/stripe-blocks.scss

@@ -8,7 +8,7 @@ section.nhsuk-section:nth-of-type(even),
 
 .page-template-full-width-page section.nhsuk-section{
 
-  width: calc(100vw -20px);
+  width: calc(100vw - 20px);
   margin: 0 calc(-50vw + 50% + 12px);
 }
 

assets/scss/nhsblocks/style_variations.scss

@@ -102,7 +102,7 @@
 
 
 .wp-block-nhsblocks-heroblock {
-      width: calc(100vw -20px);
+      width: calc(100vw - 20px);
       margin: 0 calc(-50vw + 50% + 12px);
 }
 

functions.php

@@ -5,7 +5,7 @@
  * @link      https://developer.wordpress.org/themes/basics/theme-functions/
  * @package   Nightingale
  * @copyright NHS Leadership Academy, Tony Blacker
- * @version   2.3.2.2 22nd July 2021
+ * @version   2.3.3 23nd September 2021
  */
 
 /**

inc/customizer.php

@@ -312,6 +312,35 @@ function nightingale_customize_register( $wp_customize ) {
 			),
 		)
 	);
+
+	/*
+	 * Display sitemap on 404 page?
+	 */
+	$wp_customize->add_setting(
+		'blog_404sitemap_display',
+		array(
+			'default'           => 'true',
+			'sanitize_callback' => 'nightingale_sanitize_select',
+		)
+	);
+
+	$wp_customize->add_control(
+		// $id
+		'blog_404sitemap_display',
+		// $args
+		array(
+			'settings'    => 'blog_404sitemap_display',
+			'section'     => 'section_layout',
+			'priority'    => '120',
+			'type'        => 'radio',
+			'label'       => esc_html__( 'Show sitemap on 404 page?', 'nightingale' ),
+			'description' => esc_html__( 'Choose whether or not to show the WordPress sitemap on 404 pages.', 'nightingale' ),
+			'choices'     => array(
+				'true'  => esc_html__( 'Yes', 'nightingale' ),
+				'false' => esc_html__( 'No', 'nightingale' ),
+			),
+		)
+	);
 }
 
 add_action( 'customize_register', 'nightingale_customize_register' );