Merge pull request #345 from NHSLeadership/develop

v2.3 release

404.php

@@ -22,8 +22,8 @@
 					<h1 class="entry-title">404 - Page not found</h1>
 				</header>
 				<div class="page-content">
-					<div class="wp-block-nhsblocks-panel1 nhsuk-panel is-style-panel-with-label">
-						<h3 class="nhsuk-panel-with-label__label"><?php echo esc_html__( 'Oops', 'nightingale' ); ?></h3>
+					<div class="wp-block-nhsblocks-panel1 nhsuk-do-dont-list is-style-panel-with-label">
+						<h3 class="nhsuk-do-dont-list__label"><?php echo esc_html__( 'Oops', 'nightingale' ); ?></h3>
 						<div class="paneltext">
 							<p><?php echo esc_html__( 'Sorry, this page can\'t be found at the moment, please use the search facility below, select an item from the contents or alternatively return to the home page', 'nightingale' ); ?></p>
 							<a class="wp-block-nhsblocks-nhsbutton alignright nhsuk-button" href="<?php echo esc_attr( get_home_url() ); ?>"><?php echo esc_html__( 'Home Page', 'nightingale' ); ?></a>

archive.php

@@ -35,7 +35,7 @@
 			if ( have_posts() ) :
 				?>
 
-				<div class="nhsuk-grid-row nhsuk-promo-group">
+				<div class="nhsuk-grid-row nhsuk-card-group">
 
 					<?php
 					/* Start the Loop */

assets/scss/comments-and-meta.scss

@@ -14,6 +14,7 @@
 	  padding          : nhsuk-spacing(3) 0;
 	  display          : block;
 	  background-color : $color-nhsuk-grey-5;
+	  clear: both;
 
 	  #respond {
 		margin-top : nhsuk-spacing(3);
@@ -37,6 +38,8 @@
 		margin-left  : 0;
 		margin-right : 0;
 		padding-left : nhsuk-spacing(3);
+		border-left: 1px solid $color-nhsuk-grey-3;
+		position: relative;
 
 		.comment {
 		  padding-right : 0;
@@ -84,14 +87,16 @@
 			font-style : normal;
 
 			.comment-author-label {
-			  @extend .nhsuk-pill-standard;
+			  @extend .nhsuk-tag;
 
 			  &.comment-author-label-administrator {
-				@extend .nhsuk-pill-notice;
+				@extend .nhsuk-tag;
+				@extend .nhsuk-tag--aqua-green;
 			  }
 
 			  &.comment-author-label-facilitator {
-				@extend .nhsuk-pill-success;
+				@extend .nhsuk-tag;
+				@extend .nhsuk-tag--blue;
 			  }
 			}
 		  }
@@ -223,14 +228,8 @@
 		//text-decoration : none;
 
 		&:nth-of-type(2) {
-		  margin-left    : nhsuk-spacing(2);
-		  border-radius  : $nhsuk-border-radius;
-		  border         : $nhsuk-border-width-form-element solid;
-		  background     : $color_nhsuk-white;
-		  color          : $color_nhsuk-blue;
-		  border-color   : $color_nhsuk-blue;
-		  padding        : nhsuk-spacing(1);
-		  text-transform : uppercase;
+		  @extend .nhsuk-tag;
+		  @extend .nhsuk-tag--white;
 		}
 	  }
 	}
@@ -254,7 +253,8 @@
   .comments-link {
 	float : left;
 	@extend .nhsuk-body-s;
-	@extend .nhsuk-pill-success;
+	@extend .nhsuk-tag;
+	@extend .nhsuk-tag--green;
 
 	a {
 	  color : $color_nhsuk-green;
@@ -295,7 +295,7 @@
 
 .pagination_split_post {
   .post-page-numbers {
-	@extend .nhsuk-pill-notice;
+
 
 	&:first-of-type {
 	  margin-right : nhsuk-spacing(1);

assets/scss/default.scss

@@ -472,8 +472,8 @@ input[type="submit"] {
   @extend .nhsuk-button;
 }
 
-
-input[type="text"],
+/* With :not(.autocomplete__input), the search field is not affected */
+input[type="text"]:not(.autocomplete__input),
 input[type="email"],
 input[type="url"],
 input[type="password"],

assets/scss/download-monitor.scss

@@ -13,7 +13,7 @@
     display: none !important;
   }
   .download-count {
-    @extend .nhsuk-pill-standard;
+    @extend .nhsuk-tag;
     position: absolute;
     right: 0;
   }

assets/scss/emergency_alert.scss

@@ -47,3 +47,15 @@
   position : relative;
   margin   : 0 nhsuk-spacing(3);
 }
+
+/* Heading: smaller font size on desktop */
+.nhsuk-global-alert__heading {
+  @include nhsuk-typography-responsive(24);
+  margin      : 0;
+}
+
+/* Margin fix */
+.nhsuk-global-alert__message {
+  margin-top  : nhsuk-spacing(2);
+  line-height : 1.5;
+}

assets/scss/events-calendar-styling.scss

@@ -31,7 +31,7 @@
 }
 
 
-.tribe-common .nhsuk-promo-group {
+.tribe-common .nhsuk-card-group {
 
   &.nhsuk-grid-row {
 
@@ -43,8 +43,8 @@
 
 	@extend .nhsuk-grid-column-one-third;
 
-	&.nhsuk-promo-group__item {
-	  @extend .nhsuk-promo-group__item;
+	&.nhsuk-card-group__item {
+	  @extend .nhsuk-card-group__item;
 	}
 
 	margin-bottom : nhsuk-spacing(4);
@@ -57,19 +57,19 @@
 	margin-bottom : nhsuk-spacing(4);
   }
 
-  div.nhsuk-promo__content {
+  div.nhsuk-card__content {
 
-	@extend .nhsuk-promo__content;
+	@extend .nhsuk-card__content;
 	color : $color_nhsuk-dark-grey;
 
   }
 
-  p.nhsuk-promo__description {
+  p.nhsuk-card__description {
 	@extend p;
   }
 
-  h2.nhsuk-promo__heading {
-	@extend .nhsuk-promo__heading;
+  h2.nhsuk-card__heading {
+	@extend .nhsuk-card__heading;
   }
 
 }
@@ -114,7 +114,7 @@ button.tribe-events-c-top-bar__datepicker-button {
   margin-right : nhsuk-spacing(2);
 }
 
-.nhsuk-promo__content .tribe-events-calendar-list__event-datetime {
+.nhsuk-card__content .tribe-events-calendar-list__event-datetime {
   float   : left;
   display : block;
 
@@ -123,7 +123,7 @@ button.tribe-events-c-top-bar__datepicker-button {
   }
 }
 
-.tribe-common .nhsuk-promo-group .event-meta,
+.tribe-common .nhsuk-card-group .event-meta,
 .event-meta {
   margin-bottom : nhsuk-spacing(3);
 
@@ -258,7 +258,7 @@ button.tribe-events-c-top-bar__datepicker-button {
 	margin-bottom : nhsuk-spacing(5);
   }
 
-  .nhsuk-promo__img {
+  .nhsuk-card__img {
 	margin-bottom : nhsuk-spacing(3);
   }