diff --git a/gulp-tasks/paths.js b/gulp-tasks/paths.js index 751e25fa..bcb0b6e2 100755 --- a/gulp-tasks/paths.js +++ b/gulp-tasks/paths.js @@ -7,7 +7,11 @@ module.exports = { }, styles: { src: ['src/**/*.scss'], // src of styles to watch - minifySrc: ['src/wmcads/assets/sass/wmcads.scss', 'src/www/wmcads-website.scss'], // List of scss file(s) which should be processed, linted & minified + minifySrc: [ + 'src/wmcads/assets/sass/wmcads.scss', + 'src/www/wmcads-website.scss', + 'src/www/pages/templates/templates.scss' + ], // List of scss file(s) which should be processed, linted & minified output: 'build/css/', // output location of minified styles reactNativeSrc: 'src/wmcads/assets/sass/wmcads.scss' }, diff --git a/src/wmcads/assets/sass/_typography.scss b/src/wmcads/assets/sass/_typography.scss index 9619df6b..644fe6a4 100755 --- a/src/wmcads/assets/sass/_typography.scss +++ b/src/wmcads/assets/sass/_typography.scss @@ -59,7 +59,8 @@ h2, } h3, -.h3 { +.h3, +h3 a { @include type-setting(3); } diff --git a/src/wmcads/assets/sass/_utilities.scss b/src/wmcads/assets/sass/_utilities.scss index 0e93c37b..d3588258 100755 --- a/src/wmcads/assets/sass/_utilities.scss +++ b/src/wmcads/assets/sass/_utilities.scss @@ -42,7 +42,6 @@ } &--main { - margin-top: $size-md; margin-bottom: $size-lg; flex-grow: 1; } diff --git a/src/wmcads/assets/sass/wmcads-grid/_grid-spacing.scss b/src/wmcads/assets/sass/wmcads-grid/_grid-spacing.scss index 847628d5..1d0e0830 100755 --- a/src/wmcads/assets/sass/wmcads-grid/_grid-spacing.scss +++ b/src/wmcads/assets/sass/wmcads-grid/_grid-spacing.scss @@ -57,7 +57,7 @@ @if $breakpoint-name == "" or $breakpoint-value == "" { &.wmcads-col-1, &.wmcads-col-1-1 { - padding-right: 0; + // padding-right: 0; padding-left: 0; } } @else { diff --git a/src/wmcads/components/_components.scss b/src/wmcads/components/_components.scss index d2db40b3..e6e086f0 100755 --- a/src/wmcads/components/_components.scss +++ b/src/wmcads/components/_components.scss @@ -9,6 +9,7 @@ @import "document/document"; // document @import "file-download/file-download"; // File download @import "form-elements/form-elements"; // Form elements +@import "hub-header/hub-header"; // Hub header @import "inset-text/inset-text"; // Inset text @import "in-text-step/in-text-step"; // In-text step @import "link/link"; // Link elements diff --git a/src/wmcads/components/breadcrumb/_breadcrumb.njk b/src/wmcads/components/breadcrumb/_breadcrumb.njk index 50e1e809..752fb3fe 100755 --- a/src/wmcads/components/breadcrumb/_breadcrumb.njk +++ b/src/wmcads/components/breadcrumb/_breadcrumb.njk @@ -12,6 +12,7 @@ And we show the current page breadcrumb at all times. {% set class = ' ' + params.classModifiers if params.classModifiers %} {% set ariaLabel = params.exampleAria + " example breadcrumbs" if params.exampleAria else "Breadcrumbs" %} +{% if params.pageTitle != "Homepage Template" -%} +{%- endif %} {% endmacro %} \ No newline at end of file diff --git a/src/wmcads/components/content-card/_content-card.njk b/src/wmcads/components/content-card/_content-card.njk index 848bfb33..d2cbe3e5 100755 --- a/src/wmcads/components/content-card/_content-card.njk +++ b/src/wmcads/components/content-card/_content-card.njk @@ -4,19 +4,18 @@ {# Opening & closing tags #} {% set tag = "a" if params.clickable else "div" %} {% set attributes = " href=\"#\" target=\"_self\"" if params.clickable else "" %} -{# HTML content #} -{% set html = params.html if params.html else " -
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-24 January 2021
+
{{eventCopy}}
+24 January 2021
+
{{copy}}
{% else %} {%- if caller -%} {{ caller() }} {%- else -%} - {{ html | safe }} - {%- endif -%} +{{copy}}
+A short sentence explaining what this is, it can be 2 lines.
-Start with user needs to make sure you're building the right thing
", - smallTitle: true, - readMore: true, - link: '/user-research/', - linkText: 'Read more about user research', - linkTitle: 'User research' - }) - }} -Example template layouts
", + smallTitle: true, + readMore: true, + link: '/templates/', + linkText: 'Read more about templates', + linkTitle: 'Templates' + }) + }} +From 2018, we’re responsible for the region's Adult Education Budget (AEB).
+We target priority growth sectors from the Local Industrial Strategy. This improves skills and secure jobs in communities. It also helps to improve productivity in the region.
+The budget helps residents and employers get the skills needed in the region. This helps people to get the jobs they need and increases the skills of current employees. It unlocks specialist training as well.
+It also allows for more flexible and tailored learning programmes in the region. This helps people to take part in learning, build confidence and their wellbeing. It unlocks opportunities for more people.
+We set out the challenges for the labour market in our Regional Skills Plan:
+High levels of unemployment in some parts of the region + Poverty is growing for people who are working because of low wages + Low skill levels with less people qualified to skill level 4, or no qualifications at all + Employers struggle to find people with the skills they need
+We use the budget to help improve confidence and opportunities for residents. It helps business find staff with the skills they need too.
+We will fund adult education through a range of delivery partners. Through commissioning, the budget will focus on:
+Looking at new ways of delivering learning. These will align with our priorities in the construction and digital sectors.
+We'll develop new job schemes, and help build the skills of people in employment.
+Working with our provider partners, we'll create an agile skills system. It will align to the needs of businesses and residents.
+We're developing agreements with providers. These will check delivery against our key priorities. It will also track the impact of this approach.
+Combined Authorites are set up to improve their region’s economies. We invest in the region through collaboration with our partners, but we don’t replace local councils.
+We’re led by the Mayor of the West Midlands. The current mayor is Andy Street, who is in office until May 2021.
+The Mayor chairs the WMCA Board and acts as a voice for the region, nationally and globally.
+Example templates that make up the main West Midlands Combined Authority Website
+{% endblock %} \ No newline at end of file diff --git a/src/www/pages/templates/templates.scss b/src/www/pages/templates/templates.scss new file mode 100644 index 00000000..d5844ff0 --- /dev/null +++ b/src/www/pages/templates/templates.scss @@ -0,0 +1,9 @@ +// Vars +@import "../../../wmcads/assets/sass/vars"; + +// Mixins +@import "../../../wmcads/assets/sass/mixins"; + +// Template specific styles +@import "homepage/homepage"; // Homepage +