Skip to content

Commit

Permalink
Merge pull request #575 from alphagov/add-html5-shiw-to-app
Browse files Browse the repository at this point in the history
Add html5 shiv to review app
  • Loading branch information
NickColley authored Mar 5, 2018
2 parents b0ca545 + b872482 commit 4bf957f
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ Internal:
(PR [#552](https://github.com/alphagov/govuk-frontend/pull/552))
- Fixes for the release process
(PR [#567](https://github.com/alphagov/govuk-frontend/pull/567))
- Add HTML5-shiv to review app
(PR [#575](https://github.com/alphagov/govuk-frontend/pull/575))

## 0.0.24-alpha (Breaking release)

Expand Down
3 changes: 3 additions & 0 deletions app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ app.set('view engine', 'njk')

// Set up middleware to serve static assets
app.use('/public', express.static(configPaths.public))

// serve html5-shiv from node modules
app.use('/vendor/html5-shiv/', express.static('node_modules/html5shiv/dist/'))
app.use('/icons', express.static(path.join(configPaths.src, 'icons')))

const server = app.listen(port, () => {
Expand Down
3 changes: 3 additions & 0 deletions app/views/layouts/layout.njk
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
<title>GOV.UK Frontend</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="/public/css/app.css">
<!--[if lt IE 9]>
<script src="/vendor/html5-shiv/html5shiv.js"></script>
<![endif]-->
<!--[if IE 8]>
<link rel="stylesheet" href="/public/css/app-old-ie.css">
<![endif]-->
Expand Down
6 changes: 6 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"gulp-task-listing": "^1.0.1",
"gulp-to-markdown": "^1.0.0",
"gulp-uglify": "^3.0.0",
"html5shiv": "^3.7.3",
"jest": "^22.1.4",
"jest-axe": "^2.1.1",
"jest-serializer-html": "^5.0.0",
Expand Down

0 comments on commit 4bf957f

Please sign in to comment.