Merge pull request #442 from NHSLeadership/develop

Update master with current theme version from develop 2.3.2.2
NHSLeadership · Sep 23, 2021 · 1e5d25a · 1e5d25a
2 parents cbec7e5 + d1887da
commit 1e5d25a
Show file tree

Hide file tree

Showing 69 changed files with 9,025 additions and 32,608 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,3 +47,6 @@ nightingale.zip
 
 # Docker stuff
 ssh-key
+/style.css.map
+/style-gutenburg.css.map
+/page-colours.css.map
diff --git a/assets/likert_empty.svg b/assets/likert_empty.svg
diff --git a/assets/scss/accessibility.scss b/assets/scss/accessibility.scss
@@ -0,0 +1,26 @@
+/* Reusable mixin for a focus element outline */
+@mixin a11y-focus__outline {
+  border: nhsuk-spacing(1) solid $nhsuk-focus-color;
+  box-shadow: inset 0 0 0 nhsuk-spacing(1) $color_nhsuk-black;
+}
+
+/* Add a focus indicator for keyboard nav on clickable cards */
+.nhsuk-card--clickable
+{
+  &.focus-visible {
+	@include a11y-focus__outline;
+  }
+}
+
+/* add more obvious visual representation when dashboard elements are active on keyboard nav */
+.nhsuk-dashboard .nhsuk-panel-group__item .nhsuk-promo__link-wrapper {
+  &.focus-visible {
+	.nhsuk-panel-with-label {
+	  @include a11y-focus__outline;
+	  h3.nhsuk-panel-with-label__label {
+		background-color: $nhsuk-focus-color;
+		color: $color_nhsuk-black;
+	  }
+	}
+  }
+}
diff --git a/assets/scss/comments-and-meta.scss b/assets/scss/comments-and-meta.scss
@@ -1,7 +1,7 @@
 /*
 // variations to styling required for WordPress comments
 // @author Tony Blacker, NHS Leadership Academy
-// @version 1.0 3rd October 2019
+// @version 1.1 5th March 2021
 */
 .nhsuk-list-panel {
   margin-bottom : nhsuk-spacing(3);
@@ -23,11 +23,11 @@
 		#commentform {
 		  display : flow-root;
 		}
-
+		.nhsuk-button.submit {
+		float: right;
+	  }
 		#cancel-comment-reply-link {
-		  @extend .nhsuk-button;
-		  @extend .nhsuk-button--reverse;
-		  float    : right;
+		  float    : left;
 		  position : absolute;
 		  bottom   : 0;
 		  left     : 0;
@@ -83,24 +83,6 @@
 			width : 50%;
 		  }
 
-		  .fn {
-			font-style : normal;
-
-			.comment-author-label {
-			  @extend .nhsuk-tag;
-
-			  &.comment-author-label-administrator {
-				@extend .nhsuk-tag;
-				@extend .nhsuk-tag--aqua-green;
-			  }
-
-			  &.comment-author-label-facilitator {
-				@extend .nhsuk-tag;
-				@extend .nhsuk-tag--blue;
-			  }
-			}
-		  }
-
 		  cite {
 			display         : block;
 			text-decoration : none;
@@ -113,9 +95,8 @@
 
 		  .comment-meta {
 			a {
-			  //text-decoration : none;
 			  color           : $color_nhsuk-black;
-			  @extend .nhsuk-body-s;
+			  font-size: 0.85rem;
 
 			  &:hover {
 				background : none;
@@ -165,35 +146,19 @@
 			width       : 15px;
 			margin-left : nhsuk-spacing(2);
 		  }
-
-		  .comment-reply-link {
-			display : inline-block;
-
-		  }
-
-		  .comment-edit-link {
-			display     : inline-block;
-			position    : relative;
-			left        : 0px;
-			margin-left : nhsuk-spacing(2);
-		  }
 		}
-
-
 	  }
 	}
   }
+  .comment-reply-link {
+	display : inline-block;
 
+  }
+  .comment-edit-link {
+	display     : inline-block;
+	margin-left : nhsuk-spacing(2);
+  }
   .comment-respond {
-	@extend .nhsuk-form-group;
-
-	label {
-	  @extend .nhsuk-label;
-	}
-
-	input[type="text"] {
-	  @extend .nhsuk-input;
-	}
 
 	textarea {
 	  height : 200px;
@@ -203,33 +168,19 @@
 	  margin-bottom : 48px;
 	}
 
-	input[type="submit"] {
-	  @extend .nhsuk-button;
-	  float : right;
-	}
-
-	.comment-form-cookies-consent {
-	  @extend .nhsuk-checkboxes__item;
-
-	  input[type="checkbox"] {
-		@extend .nhsuk-checkboxes__input;
-
-		& ~ label {
-		  @extend .nhsuk-checkboxes__label
-		}
-	  }
-	}
 
 	.logged-in-as {
 	  float : right;
 
 	  a {
 		font-size       : 0.75rem;
-		//text-decoration : none;
 
 		&:nth-of-type(2) {
-		  @extend .nhsuk-tag;
-		  @extend .nhsuk-tag--white;
+		  border: 1px solid $color_nhsuk-black;
+		  font-size: 1rem;
+		  padding: nhsuk-spacing(1);
+		  background: $color_nhsuk-white;
+		  color: $color_nhsuk-blue;
 		}
 	  }
 	}
@@ -239,60 +190,24 @@
 .article-footer {
   .cat-links {
 	float : right;
-	@extend .nhsuk-body-s;
-
   }
 
   .tags-links {
 	float        : left;
 	margin-right : nhsuk-spacing(3);
-	@extend .nhsuk-body-s;
 
   }
 
-  .comments-link {
-	float : left;
-	@extend .nhsuk-body-s;
-	@extend .nhsuk-tag;
-	@extend .nhsuk-tag--green;
-
-	a {
-	  color : $color_nhsuk-green;
-
-	  &:visited {
-		color : $color_nhsuk-green;
-	  }
-	}
-  }
 }
 
-.navigation {
-  .nhsuk-pagination {
-	clear : both;
-	width : 100%;
-
-	ul.nhsuk-pagination__list {
-	  margin-left : 0;
-
-	  li.nhsuk-pagination-item--previous {
-		float : left;
-
-		a {
-		  @extend .nhsuk-pagination__link;
-		}
-	  }
-
-	  li.nhsuk-pagination-item--next {
-		float : right;
 
-		a {
-		  @extend .nhsuk-pagination__link;
-		}
-	  }
-	}
-  }
+li.nhsuk-pagination-item--previous {
+  float : left;
 }
 
+li.nhsuk-pagination-item--next {
+  float : right;
+}
 .pagination_split_post {
   .post-page-numbers {
 

diff --git a/assets/scss/cookie-control.scss b/assets/scss/cookie-control.scss
@@ -0,0 +1,57 @@
+#cookie-notice {
+  position       : fixed;
+  min-width      : 100%;
+  height         : auto;
+  padding        : nhsuk-spacing(3) 0;
+  z-index        : 100000;
+  letter-spacing : 0;
+  left           : 0;
+  text-align     : center;
+  border-top     : nhsuk-spacing(1) solid $color_nhsuk-dark-blue;
+  font-weight    : normal;
+  padding: 0;
+
+  .cookie-notice-container {
+	background-color : $color_nhsuk-white;
+	padding: 0;
+
+	.cn-text-container {
+	  @extend .nhsuk-width-container;
+	  @extend .nhsuk-heading-s;
+	  padding-top: nhsuk-spacing(3);
+	  color: $color_nhsuk-dark-blue;
+	  text-align: left;
+	}
+
+
+	#cn-notice-buttons {
+	  @extend .nhsuk-width-container;
+	  padding-bottom: nhsuk-spacing(3);
+	  display : block;
+	  text-align: right;
+
+	  .cn-button.bootstrap {
+		@extend .nhsuk-button;
+		background    : $nhsuk-button-color;
+		margin-bottom : 0;
+
+		&.cn-more-info {
+		  @extend .nhsuk-button--secondary;
+		}
+	  }
+	}
+	.cn-close-icon {
+	  opacity: 1;
+	  top: nhsuk-spacing(3);
+	  &:after, &:before {
+		background-color: $color_nhsuk-black;
+		height: nhsuk-spacing(6);
+	  }
+	  &.focus-visible {
+		height: nhsuk-spacing(6);
+		width: nhsuk-spacing(6);
+	  }
+	}
+  }
+
+}
diff --git a/assets/scss/default.scss b/assets/scss/default.scss
@@ -25,7 +25,6 @@ html {
 
 body {
   margin: 0;
-  word-break: break-word;
 }
 
 /**
@@ -465,15 +464,10 @@ table {
 /*--------------------------------------------------------------
 # Forms
 --------------------------------------------------------------*/
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  @extend .nhsuk-button;
-}
 
-/* With :not(.autocomplete__input), the search field is not affected */
-input[type="text"]:not(.autocomplete__input),
+
+/* With :not(.nhsuk-search__input), the search field is not affected */
+input[type="text"]:not(.nhsuk-search__input),
 input[type="email"],
 input[type="url"],
 input[type="password"],

diff --git a/assets/scss/download-monitor.scss b/assets/scss/download-monitor.scss
@@ -1,32 +1,7 @@
-.download-button {
-  @extend .nhsuk-button;
-  background-image: none;
-  text-shadow: none;
-  &:hover {
-    background-image: none;
-  }
+.download-count {
+ float: right;
 }
-.download-box {
-  text-align: unset;
-  @extend .nhsuk-panel;
-  img {
-    display: none !important;
-  }
-  .download-count {
-    @extend .nhsuk-tag;
-    position: absolute;
-    right: 0;
-  }
 
-  &:after {
-    clear: both;
-  }
-}
-ul.download-versions {
-  @extend .nhsuk-list;
-  @extend .nhsuk-list--bullet;
-  list-style-type: square;
-}
 .download-link {
   font-size: $nhsuk-base-font-size;
 }