Remove GOVUK Template files

Includes Sass that targeted GOV.UK Template HTML
and also moves some link styles to `globals.scss`.

Also removes bits of frontend build that copied
over GOVUK Template files.
This commit is contained in:
Tom Byers
2019-10-24 11:33:04 +01:00
parent 73f7292840
commit 278a70ecc7
4 changed files with 10 additions and 99 deletions

View File

@@ -1,62 +1,4 @@
// Extra CSS overlaying elements
#global-header-bar {
background-color: $govuk-blue;
}
#global-header,
#global-header.with-proposition {
#logo {
white-space: nowrap;
#product-name {
font-size: 24px;
font-weight: 400;
padding-left: 5px;
}
}
.header-wrapper {
.header-global {
.header-logo {
@include media(desktop) {
width: auto;
}
&:after {
display: none;
}
}
}
}
.header-proposition {
#proposition-links {
li {
padding: 0 0 0 15px;
}
}
}
}
@include media(desktop) {
#proposition-menu {
float: right;
}
}
a {
&:visited {
color: $link-colour;
}
}
.form-control-1-1 {
width: 100%;
}

View File

@@ -43,6 +43,12 @@ input[type="search"]::-webkit-search-decoration {
// https://design-system.service.gov.uk/styles/typography/#links
a {
@extend %govuk-link;
// Stops visited links looking different, until we can add the `govuk-link--no-visited-state`
// class to all links we want stay the same colour after visiting
&:visited {
color: $govuk-link-colour;
}
}
// Each selector, and then the whole block when only one remains, to be removed when the

View File

@@ -27,7 +27,6 @@ const paths = {
dist: 'app/static/',
templates: 'app/templates/',
npm: 'node_modules/',
template: 'node_modules/govuk_template_jinja/',
toolkit: 'node_modules/govuk_frontend_toolkit/',
govuk_frontend: 'node_modules/govuk-frontend/'
};
@@ -38,39 +37,9 @@ const paths = {
// Move GOV.UK template resources
const copy = {
govuk_template: {
template: () => {
return src(paths.template + 'views/layouts/govuk_template.html')
.pipe(dest(paths.templates));
},
css: () => {
return src(paths.template + 'assets/stylesheets/**/*.css')
.pipe(plugins.sass({
outputStyle: 'compressed'
}))
.on('error', plugins.sass.logError)
.pipe(plugins.cssUrlAdjuster({
prependRelative: process.env.NOTIFY_ENVIRONMENT == 'development' ? '/static/' : '/',
}))
.pipe(dest(paths.dist + 'stylesheets/'));
},
js: () => {
return src(paths.template + 'assets/javascripts/**/*.js')
.pipe(plugins.uglify())
.pipe(dest(paths.dist + 'javascripts/'));
},
images: () => {
return src(paths.template + 'assets/stylesheets/images/**/*')
.pipe(dest(paths.dist + 'images/'));
},
fonts: () => {
return src(paths.template + 'assets/stylesheets/fonts/**/*')
.pipe(dest(paths.dist + 'fonts/'));
},
error_page: () => {
error_pages: () => {
return src(paths.src + 'error_pages/**/*')
.pipe(dest(paths.dist + 'error_pages/'))
}
},
govuk_frontend: {
fonts: () => {
@@ -199,16 +168,11 @@ const lint = {
// Default: compile everything
const defaultTask = parallel(
series(
copy.govuk_template.template,
copy.govuk_template.images,
copy.govuk_template.fonts,
copy.govuk_template.css,
copy.govuk_template.js,
copy.govuk_frontend.fonts,
images
),
series(
copy.govuk_template.error_page,
copy.error_pages,
javascripts,
sass
)

View File

@@ -25,7 +25,6 @@
"govuk-elements-sass": "3.1.2",
"govuk-frontend": "2.13.0",
"govuk_frontend_toolkit": "8.1.0",
"govuk_template_jinja": "0.24.1",
"gulp": "4.0.0",
"gulp-add-src": "1.0.0",
"gulp-babel": "8.0.0",