Merge branch 'main' into hotfix/#403-ghost-focus

Author: NicolaSaunders

assets-src/styles/advanced.scss

@@ -8,7 +8,6 @@
 @import "sass/00-settings/breakpoints";
 @import "sass/00-settings/colors";
 //@import "sass/00-settings/debug";
-@import "sass/00-settings/paths";
 @import "sass/00-settings/typesetting";
 
 

assets-src/styles/core.scss

@@ -9,7 +9,6 @@
 @import "sass/00-settings/colors";
 //@import "sass/00-settings/debug";
 @import "sass/00-settings/fonts";
-@import "sass/00-settings/paths";
 @import "sass/00-settings/typesetting";
 
 

assets-src/styles/sass/00-settings/_colors.scss

@@ -69,7 +69,7 @@ $link-color--hover:             $deep-blue;
 
 $success-color:                 #046704;
 $info-color:                    $w3c-blue;
-$warning-color:                 #C28605;
+$warning-color:                 #c28605;
 $error-color:                   #a82615;
 
 

assets-src/styles/sass/00-settings/_fonts.scss

@@ -2,45 +2,37 @@
     #Fonts
 \*------------------------------------*/
 @font-face {
-
   font-display: fallback;
   font-family: 'Noto Sans';
   font-style: normal;
   font-weight: 400;
   src: url('../fonts/notosans/notosans-regular.woff2') format('woff2'),
   url('../fonts/notosans/notosans-regular.woff') format('woff');
-
 }
 
 @font-face {
-
   font-display: fallback;
   font-family: 'Noto Sans';
   font-style: italic;
   font-weight: 400;
   src: url('../fonts/notosans/notosans-italic.woff2') format('woff2'),
   url('../fonts/notosans/notosans-italic.woff') format('woff');
-
 }
 
 @font-face {
-
   font-display: fallback;
   font-family: 'Noto Sans';
   font-style: normal;
   font-weight: 600;
   src: url('../fonts/notosans/notosans-bold.woff2') format('woff2'),
   url('../fonts/notosans/notosans-bold.woff') format('woff');
-
 }
 
 @font-face {
-
   font-display: fallback;
   font-family: 'Noto Sans';
   font-style: italic;
   font-weight: 600;
   src: url('../fonts/notosans/notosans-bolditalic.woff2') format('woff2'),
   url('../fonts/notosans/notosans-bolditalic.woff') format('woff');
-
 }

assets-src/styles/sass/00-settings/_paths.scss

@@ -3,70 +3,52 @@
 \*------------------------------------*/
 
 @mixin txt-venus {
-
 	font-size: rem(33);
 	line-height: calc(43 / 33);
 
 	@include mq($bp-tab-small) {
-
 		font-size: rem(42);
 		line-height: calc(58.8 / 42);
-
 	}
-
 }
 
 
 @mixin txt-earth {
-
 	font-size: rem(27);
 	line-height: calc(33.6 / 27);
 
 	@include mq($bp-tab-small) {
-
 		font-size: rem(34);
 		line-height: calc(43 / 34);
-
 	}
-
 }
 
 
 @mixin txt-mars {
-
 	font-size: rem(24);
 	line-height: calc(33.6 / 24);
-
 }
 
 
 @mixin txt-jupiter {
-
 	font-size: rem(20);
 	line-height: calc(32 / 20);
-
 }
 
 
 @mixin txt-saturn {
-
 	font-size: rem(18);
 	line-height: calc(27 / 18);
-
 }
 
 
 @mixin txt-pluto {
-
 	font-size: rem(15);
 	line-height: calc(22.5 / 15);
-
 }
 
 
 @mixin txt-eris {
-
 	font-size: rem(14);
 	line-height: calc(20 / 14);
-
 }

assets-src/styles/sass/20-mixins/_font-sizes.scss

@@ -8,9 +8,7 @@
 	$query2: width,
 	$context: $browser-context
 ) {
-
 	@media screen and (#{$query1}-#{$query2}: calc($point / $context) + "em") {
 		@content;
 	}
-
 }

assets-src/styles/sass/20-mixins/_media-query.scss

@@ -22,15 +22,11 @@ article {
  */
 
 @mixin stack($measure: 1em) {
-
 	display: flex;
 	flex-direction: column;
 	justify-content: flex-start;
 
 	& > * + * {
-
 		margin-top: $measure;
-
 	}
-
 }

assets-src/styles/sass/20-mixins/_stack.scss

@@ -7,19 +7,15 @@
  */
 @media screen and (prefers-reduced-motion: reduce),
 (update: slow) {
-
     *,
     ::before,
     ::after {
-
         animation-delay: -1ms !important;
         animation-duration: 1ms !important;
         animation-iteration-count: 1 !important;
         background-attachment: initial !important;
         scroll-behavior: auto !important;
         transition-duration: 0.001ms !important;
         transition-delay: 0s !important;
-
     }
-
 }

assets-src/styles/sass/30-base/_animation.scss

@@ -2,27 +2,17 @@
     #Background colours
 \*------------------------------------*/
 
-.bg {
-
-	&--alert {
-
-		background-color: $alert-color;
-		color: $black;
-
-	}
-
-	&--success {
-
-		background-color: $success-color;
-		color: $black;
-
-	}
-
-	&--warning {
-
-		background-color: $warning-color;
-		color: $black;
-
-	}
-
+.bg--info {
+	background-color: $info-color;
+	color: $white;
+}
+
+.bg--success {
+	background-color: $success-color;
+	color: $white;
+}
+
+.bg--warning {
+	background-color: #c78a05;
+	color: $black;
 }