-
+
{{#ifAny metadata.hero_image.value metadata.background_image_sm.value}}
-
{{/ifAny}}
-
+
-
+
{{#ifCond metadata.breadcrumbs_display.value '==' 'yes'}}
-
-{{/with}}
\ No newline at end of file
+{{/with}}
diff --git a/src/components/banner_basic/js/index.js b/src/components/banner_basic/js/index.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/components/banner_basic/js/manifest.json b/src/components/banner_basic/js/manifest.json
index b1294409..84303d5d 100644
--- a/src/components/banner_basic/js/manifest.json
+++ b/src/components/banner_basic/js/manifest.json
@@ -127,9 +127,8 @@
"type": "metadata_field_select",
"description": "",
"friendly_name": "Background Colour",
- "value": "",
+ "value": "dark-alternate",
"options": {
- "": "White",
"light": "Light",
"alternate": "Alternate",
"dark": "Dark",
@@ -165,4 +164,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/components/breadcrumbs/breadcrumbs.stories.js b/src/components/breadcrumbs/breadcrumbs.stories.js
new file mode 100644
index 00000000..1b0d57b6
--- /dev/null
+++ b/src/components/breadcrumbs/breadcrumbs.stories.js
@@ -0,0 +1,15 @@
+
+ // breadcrumbs.stories.js
+ import breadcrumbsTemplate from './html/component.hbs';
+ import site from './data/manifest.json';
+ import './js/index.js';
+
+ export default {
+ title: 'Components/Breadcrumbs',
+ };
+
+ const Template = (args) => breadcrumbsTemplate(args);
+ export const breadcrumbs = Template.bind({});
+ breadcrumbs.args = {
+ current: site
+ };
\ No newline at end of file
diff --git a/src/components/breadcrumbs/css/component.scss b/src/components/breadcrumbs/css/component.scss
index 849aa86a..e2d67b4b 100644
--- a/src/components/breadcrumbs/css/component.scss
+++ b/src/components/breadcrumbs/css/component.scss
@@ -4,24 +4,18 @@
.qld__breadcrumbs {
width: 100%;
-
+
* + & {
@include QLD-space(margin-top, 1unit);
}
-
+
@include QLD-media(sm) {
- display: flex;
- flex-direction: row;
- flex-wrap: wrap;
- align-items: center;
+ display: inline-block;
}
& &__list--desktop{
display: none;
@include QLD-media(md) {
- display: flex;
- flex-direction: row;
- flex-wrap: wrap;
- align-items: center;
+ display: inline-block;
}
}
& &__list--mobile{
@@ -29,16 +23,6 @@
display: none;
}
}
- .qld__link-list.qld__link-list--inline:not(.qld__breadcrumbs .qld__breadcrumbs__list--mobile, .qld__banner__breadcrumbs--mobile ul) {
- display: none;
- @include QLD-media(md) {
- display: flex;
- flex-direction: row;
- flex-wrap: nowrap;
- align-items: center;
- align-content: center;
- }
- }
> .qld__link-list {
margin: 0;
@@ -50,61 +34,42 @@
@include QLD-fontgrid(sm);
}
- .qld__overflow_menu--breadcrumbs {
- display: flex;
- align-items: center;
- padding: none;
- }
- .qld__overflow_menu_wrapper {
- display: inline;
- }
-
> li {
margin: 0; //Intentionally flush with the container, as breadcrumbs are designed to sit on a full viewport width bg.
display: none;
@include QLD-space(padding, 0.25unit 0);
- flex-shrink: 0;
+
a {
@include QLD-underline('light','underline','default','noVisited');
- color: var(--QLD-color-light__link);
+ color: var(--QLD-color-light-link);
}
-
+
+ // .qld__icon{
+ // @include QLD-space(margin, 0 0.5unit);
+ // color: var(--QLD-color-light-alt-button);
+ // @include QLD-space(height, 1unit);
+ // }
+
&:after {
content: " ";
display: inline-block;
@include QLD-space(width, 0.5unit);
@include QLD-space(height, 1unit);
@include QLD-space(margin, 0 0.5unit);
- // background-image: QLD-svg-with-fill($QLD-icon-chevron-right, var(--QLD-color-light__action--secondary));
+ // background-image: QLD-svg-with-fill($QLD-icon-chevron-right, var(--QLD-color-light-alt-button));
// background-size: contain;
// background-repeat: no-repeat;
vertical-align: middle;
mask-image: QLD-svguri($QLD-icon-chevron-right);
mask-repeat: no-repeat;
mask-position: center;
- background-color: var(--QLD-color-light__action--secondary);
+ background-color: var(--QLD-color-light-alt-button);
}
-
- &:last-child {
- display: flex;
- white-space: wrap;
- text-overflow: ellipsis;
- flex: 0 1 auto;
- flex-shrink: 3;
-
- &:after {
- display: none;
- }
-
- @include QLD-media(md) {
-
- white-space: nowrap;
- }
+ &:last-child:after {
+ display: none;
}
-
-
.ie8 &,
.lt-ie8 & {
&:after {
@@ -130,12 +95,12 @@
.qld__body--dark-alt &,
.qld__banner--dark &,
.qld__banner--dark-alt &{
- color: var(--QLD-color-dark__text--lighter);
-
+ color: var(--QLD-color-dark-text__muted);
+
> .qld__link-list {
> li:not(:last-child){
&::after{
- background-color: var(--QLD-color-dark__action--secondary);
+ background-color: var(--QLD-color-dark-alt-button);
}
}
@@ -143,7 +108,7 @@
a {
// @include QLD-underline('dark');
@include QLD-underline('dark','underline','default','noVisited');
- color: var(--QLD-color-dark__text);
+ color: var(--QLD-color-dark-text);
}
}
}
@@ -159,15 +124,15 @@
}
&.qld__breadcrumbs--alt {
- background-color: var(--QLD-color-light__background--alt);
+ background-color: var(--QLD-color-light-alt-background);
}
&.qld__breadcrumbs--dark {
- background-color: var(--QLD-color-dark__background);
+ background-color: var(--QLD-color-dark-background);
}
&.qld__breadcrumbs--alt-dark {
- background-color: var(--QLD-color-dark__background--alt);
+ background-color: var(--QLD-color-dark-alt-background);
}
}
@@ -179,10 +144,9 @@
@include QLD-media(md) {
@include QLD-space(margin, 0 0 1rem);
display: inline-block;
+
> .qld__link-list > li {
- flex: 0 0 auto;
- flex-shrink: 0;
// Hide current page
&:last-child {
display: none;
@@ -191,7 +155,7 @@
&:after {
content: none;
}
- }
+ }
}
@include QLD-media(lg) {
@@ -199,7 +163,7 @@
> .qld__link-list > li {
display: inline-block;
- flex-shrink: 0;
+
&:last-child {
display: inline-block;
}
@@ -225,14 +189,14 @@
.qld__banner__breadcrumbs--desktop,
.qld__breadcrumbs__list--mobile {
li .qld__icon{
- color: var(--QLD-color-light__action--secondary);
+ color: var(--QLD-color-light-alt-button);
}
-
+
li::before {
@include QLD-space(width, 0.5unit);
@include QLD-space(height, 1unit);
@include QLD-space(margin, 0 0.25unit 0 0);
- // background-image: QLD-svg-with-fill($QLD-icon-chevron-left, var(--QLD-color-light__action--secondary));
+ // background-image: QLD-svg-with-fill($QLD-icon-chevron-left, var(--QLD-color-light-alt-button));
// background-size: 100%;
// background-repeat: no-repeat;
// background-size: contain;
@@ -243,7 +207,7 @@
mask-image: QLD-svguri($QLD-icon-chevron-left);
mask-repeat: no-repeat;
mask-position: center;
- background-color: var(--QLD-color-light__action--secondary);
+ background-color: var(--QLD-color-light-alt-button);
}
&.qld__breadcrumbs--dark,
@@ -254,11 +218,11 @@
.qld__body--dark-alt & {
li::before{
- background-color: var(--QLD-color-dark__action--secondary);
+ background-color: var(--QLD-color-dark-alt-button);
}
// li::before {
- // background-image: QLD-svg-with-fill($QLD-icon-chevron-left, var(--QLD-color-dark__action--secondary));
+ // background-image: QLD-svg-with-fill($QLD-icon-chevron-left, var(--QLD-color-dark-alt-button));
// }
}
}
diff --git a/src/components/breadcrumbs/js/index.js b/src/components/breadcrumbs/js/index.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/components/footer/css/component.scss b/src/components/footer/css/component.scss
index b8593681..549e0637 100644
--- a/src/components/footer/css/component.scss
+++ b/src/components/footer/css/component.scss
@@ -5,9 +5,9 @@
.qld__footer {
@include QLD-fontgrid(xs);
@include QLD-space(padding-bottom, 2.5unit);
- border-top: $QLD-border-width-thick solid var(--QLD-color-light__design-accent);
- background-color:$QLD-color-neutral--lightest;
- color: var(--QLD-color-light__text);
+ border-top: $QLD-border-width-thick solid var(--QLD-color-light-designAccent);
+ background-color: var(--QLD-color-light-background__shade);
+ color: var(--QLD-color-light-text);
@include QLD-media(lg) {
@include QLD-space(padding-top, 2unit);
@@ -40,32 +40,17 @@
}
}
- a {
- color: var(--QLD-color-light__link);
- }
- a:hover {
- &:visited {
- text-decoration: none;
- }
- }
- a:visited {
- color: var(--QLD-color-light__link);
- text-decoration: none;
-
- }
-
.qld__btn{
float: right;
- margin-top: 0;
+ @include QLD-space(margin-top, 1.5unit);
@include QLD-media(lg) {
float: none;
- // @include QLD-space(margin-top, 2unit);
}
}
& &__heading { // double & & to increase specificity because of clash
- color: var(--QLD-color-light__heading);
+ color: var(--QLD-color-light-heading);
@include QLD-fontgrid(sm, heading);
font-weight: 700;
@@ -88,7 +73,7 @@
}
& &__row {
- border-bottom: $QLD-border-width-thin solid var(--QLD-color-light__border--alt);
+ border-bottom: $QLD-border-width-thin solid var(--QLD-color-light-alt-border);
.qld__footer__column:last-of-type{
border-top: none;
@include QLD-space(margin-top, 0unit);
@@ -104,7 +89,7 @@
> .qld__footer__column{
@include QLD-space(padding-left, 1unit);
@include QLD-space(padding-right, 1unit);
-
+
&:last-of-type{
@include QLD-media(lg) {
flex: 1;
@@ -130,7 +115,7 @@
@include QLD-space(padding-top, 2unit);
}
&:last-of-type{
- border-top: 1px solid var(--QLD-color-light__border--alt);
+ border-top: 1px solid var(--QLD-color-light-alt-border);
@include QLD-space(margin-top, 1.5unit);
@include QLD-media(lg) {
border-top: none;
@@ -152,7 +137,7 @@
&__cta {
@include QLD-space(padding-top, 1.5unit);
- border-top: $QLD-border-width-thin solid var(--QLD-color-light__border--alt);
+ border-top: $QLD-border-width-thin solid var(--QLD-color-light-alt-border);
@include QLD-media(md) {
@include QLD-space(padding-top, 2unit);
}
@@ -175,7 +160,7 @@
margin-top: -3px;
display: inline-block;
vertical-align: middle;
- color: var(--QLD-color-light__action--secondary);
+ color: var(--QLD-color-light-alt-button);
}
}
@@ -185,10 +170,10 @@
&__social,
&__navigation {
- border-top: $QLD-border-width-thin solid $QLD-color-neutral--lighter;
+ border-top: $QLD-border-width-thin solid var(--QLD-color-light-border);
@include QLD-media(lg) {
border-top: none;
-
+
}
ul.qld__link-list {
padding: 0;
@@ -225,14 +210,14 @@
&:hover{
svg{
- color: var(--QLD-color-light__action--secondary-hover);
+ color: var(--QLD-color-light-alt-button__hover);
}
}
// svg{
- // color: var(--QLD-color-light__action--secondary);
+ // color: var(--QLD-color-light-alt-button);
// }
-
+
&:has(svg) {
text-decoration: none;
span {
@@ -271,12 +256,12 @@
align-items:flex-start;
@include QLD-space(padding-top, 0unit);
height: 100%;
- border-right: $QLD-border-width-default solid $QLD-color-neutral--lighter;
-
-
+ border-right: $QLD-border-width-default solid var(--QLD-color-light-border);
+
+
}
&__label {
- @include QLD-media(lg, 'down') {
+ @include QLD-media(lg, 'down') {
@include QLD-sronly();
}
}
@@ -301,12 +286,12 @@
padding: 0;
}
> li {
-
+
@include QLD-media(xl, 'down') {
padding: 0;
> li {
width: auto;
- flex-basis: auto;
+ flex-basis: auto;
}
}
@include QLD-media(lg) {
@@ -326,7 +311,7 @@
height: 100%;
@include QLD-space(padding-top, 0unit);
@include QLD-space(padding-right, 2unit);
- border-right: $QLD-border-width-default solid $QLD-color-neutral--lighter;
+ border-right: $QLD-border-width-default solid var(--QLD-color-light-border);
}
.qld__footer__heading {
@include QLD-media(xl) {
@@ -337,7 +322,7 @@
&__logo {
&:focus{
- outline: 3px solid var(--QLD-color-light__focus);
+ outline: 3px solid var(--QLD-color-light-focus);
outline-offset: 2px;
}
img.qld__footer__logo-image {
@@ -349,56 +334,34 @@
}
}
- * + .qld__footer__logo {
- img {
- @include QLD-space(margin-top, map-get( $QLD-space-map, $QLD-margin__text-element--mobile ) + px);
- }
- }
-
- @include QLD-media(md) {
- * + .qld__footer__logo {
- img {
- @include QLD-space(margin-top, map-get( $QLD-space-map, $QLD-margin__text-element--desktop ) + px);
- }
- }
- }
-
&.qld__footer--dark,
&.qld__footer--dark-alt{
- border-color: var(--QLD-color-dark__design-accent);
- background-color: var(--QLD-color-dark__background);
- color: var(--QLD-color-dark__text);
+ border-color: var(--QLD-color-dark-designAccent);
+ background-color: var(--QLD-color-dark-background);
+ color: var(--QLD-color-dark-text);
a {
- color: var(--QLD-color-dark__link);
- }
- a:hover {
- &:visited {
- all: unset;
- }
- }
- a:visited {
- all: unset;
+ color: var(--QLD-color-dark-link);
}
.qld__footer__heading{
- color: var(--QLD-color-dark__heading);
+ color: var(--QLD-color-dark-heading);
}
.qld__footer__row{
- border-color: var(--QLD-color-dark__border--alt);
+ border-color: var(--QLD-color-dark-alt-border);
@include QLD-media(lg) {
border-bottom: none;
}
.qld__footer__column:last-of-type{
border-top: none;
-
+
}
}
.qld__footer__column{
&:last-of-type{
- border-color: var(--QLD-color-dark__border--alt);
+ border-color: var(--QLD-color-dark-alt-border);
@include QLD-media(lg) {
border-top: none;
}
@@ -409,18 +372,17 @@
}
}
}
-
+
.qld__footer__cta__icon{
- color: var(--QLD-color-dark__action--secondary);
+ color: var(--QLD-color-dark-alt-button);
text-align: middle;
- line-height: 1;
- height: 0.875rem;
+ line-height: 1.4;
}
a.qld__footer__clickable__link{
- color: var(--QLD-color-dark__link);
+ color: var(--QLD-color-dark-link);
&:focus{
- outline: 3px solid var(--QLD-color-dark__focus);
+ outline: 3px solid var(--QLD-color-dark-focus);
outline-offset: 2px;
}
}
@@ -437,42 +399,42 @@
.qld__footer__logo {
&:focus{
- outline: 3px solid var(--QLD-color-dark__focus);
+ outline: 3px solid var(--QLD-color-dark-focus);
outline-offset: 2px;
}
}
.qld__footer__social,
.qld__footer__navigation{
- border-color: var(--QLD-color-dark__border);
+ border-color: var(--QLD-color-dark-border);
ul.qld__link-list{
> li{
a{
&:hover{
svg{
- color: var(--QLD-color-dark__action--secondary-hover);
+ color: var(--QLD-color-dark-alt-button__hover);
}
}
-
+
// svg{
- // color: var(--QLD-color-dark__action--secondary);
+ // color: var(--QLD-color-dark-alt-button);
// }
-
+
&:has(svg) {
text-decoration: none;
span {
@include QLD-underline('dark');
}
}
- }
- }
- }
- }
+ }
+ }
+ }
+ }
}
-
+
&.qld__footer--dark-alt{
- background-color: var(--QLD-color-dark__background--alt);
+ background-color: var(--QLD-color-dark-alt-background);
}
// Vertical Nav Option
diff --git a/src/components/footer/footer.stories.js b/src/components/footer/footer.stories.js
new file mode 100644
index 00000000..a324a66c
--- /dev/null
+++ b/src/components/footer/footer.stories.js
@@ -0,0 +1,15 @@
+
+ // footer.stories.js
+ import footerTemplate from './html/component.hbs';
+ import site from './data/manifest.json';
+ import './js/index.js';
+
+ export default {
+ title: 'Components/Footer',
+ };
+
+ const Template = (args) => footerTemplate(args);
+ export const footer = Template.bind({});
+ footer.args = {
+ site: site
+ };
\ No newline at end of file
diff --git a/src/components/footer/html/component.hbs b/src/components/footer/html/component.hbs
index 2d6d4932..ba0e8955 100644
--- a/src/components/footer/html/component.hbs
+++ b/src/components/footer/html/component.hbs
@@ -21,7 +21,7 @@
-
+
{{#with (jsonParse footerMetaMetadata.value)}}
{{#if footerOptionalSecondLinksList}}