mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-24 00:07:02 -04:00
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:
@@ -1,62 +1,4 @@
|
|||||||
// Extra CSS overlaying elements
|
// 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 {
|
.form-control-1-1 {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,6 +43,12 @@ input[type="search"]::-webkit-search-decoration {
|
|||||||
// https://design-system.service.gov.uk/styles/typography/#links
|
// https://design-system.service.gov.uk/styles/typography/#links
|
||||||
a {
|
a {
|
||||||
@extend %govuk-link;
|
@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
|
// Each selector, and then the whole block when only one remains, to be removed when the
|
||||||
|
|||||||
44
gulpfile.js
44
gulpfile.js
@@ -27,7 +27,6 @@ const paths = {
|
|||||||
dist: 'app/static/',
|
dist: 'app/static/',
|
||||||
templates: 'app/templates/',
|
templates: 'app/templates/',
|
||||||
npm: 'node_modules/',
|
npm: 'node_modules/',
|
||||||
template: 'node_modules/govuk_template_jinja/',
|
|
||||||
toolkit: 'node_modules/govuk_frontend_toolkit/',
|
toolkit: 'node_modules/govuk_frontend_toolkit/',
|
||||||
govuk_frontend: 'node_modules/govuk-frontend/'
|
govuk_frontend: 'node_modules/govuk-frontend/'
|
||||||
};
|
};
|
||||||
@@ -38,39 +37,9 @@ const paths = {
|
|||||||
// Move GOV.UK template resources
|
// Move GOV.UK template resources
|
||||||
|
|
||||||
const copy = {
|
const copy = {
|
||||||
govuk_template: {
|
error_pages: () => {
|
||||||
template: () => {
|
return src(paths.src + 'error_pages/**/*')
|
||||||
return src(paths.template + 'views/layouts/govuk_template.html')
|
.pipe(dest(paths.dist + 'error_pages/'))
|
||||||
.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: () => {
|
|
||||||
return src(paths.src + 'error_pages/**/*')
|
|
||||||
.pipe(dest(paths.dist + 'error_pages/'))
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
govuk_frontend: {
|
govuk_frontend: {
|
||||||
fonts: () => {
|
fonts: () => {
|
||||||
@@ -199,16 +168,11 @@ const lint = {
|
|||||||
// Default: compile everything
|
// Default: compile everything
|
||||||
const defaultTask = parallel(
|
const defaultTask = parallel(
|
||||||
series(
|
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,
|
copy.govuk_frontend.fonts,
|
||||||
images
|
images
|
||||||
),
|
),
|
||||||
series(
|
series(
|
||||||
copy.govuk_template.error_page,
|
copy.error_pages,
|
||||||
javascripts,
|
javascripts,
|
||||||
sass
|
sass
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -25,7 +25,6 @@
|
|||||||
"govuk-elements-sass": "3.1.2",
|
"govuk-elements-sass": "3.1.2",
|
||||||
"govuk-frontend": "2.13.0",
|
"govuk-frontend": "2.13.0",
|
||||||
"govuk_frontend_toolkit": "8.1.0",
|
"govuk_frontend_toolkit": "8.1.0",
|
||||||
"govuk_template_jinja": "0.24.1",
|
|
||||||
"gulp": "4.0.0",
|
"gulp": "4.0.0",
|
||||||
"gulp-add-src": "1.0.0",
|
"gulp-add-src": "1.0.0",
|
||||||
"gulp-babel": "8.0.0",
|
"gulp-babel": "8.0.0",
|
||||||
|
|||||||
Reference in New Issue
Block a user