Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-instate code syntax highlighting and remove layout-debug view #663

Merged
merged 5 commits into from
Apr 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ Internal:

- Update publishing docs (PR [#651](https://github.com/alphagov/govuk-frontend/pull/651))
- Wrap `app.css` in conditional comments in review app layout (PR [#653](https://github.com/alphagov/govuk-frontend/pull/653))
- Fix missing code highlight and remove duplicate layout
(PR [#663](https://github.com/alphagov/govuk-frontend/pull/663))

## 0.0.28-alpha (Breaking release)

Expand Down
2 changes: 2 additions & 0 deletions app/views/layouts/_generic.njk
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<!--[if IE 8]>
<link rel="stylesheet" href="/public/css/app-old-ie.css">
<![endif]-->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.6.0/themes/prism.min.css">
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.6.0/prism.min.js"></script>
{% block styles %}
{% endblock %}
</head>
Expand Down
4 changes: 3 additions & 1 deletion app/views/layouts/component.njk
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{% set componentName = componentPath %}
{% extends "full-width.njk" %}

{% block bodyClasses %}
language-markup
{% endblock %}
{% block content %}

{% set componentName = componentPath %}
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/index.njk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "layout-debug.njk" %}
{% extends "layout.njk" %}

{% block content %}
<div class="govuk-main-wrapper">
Expand Down
75 changes: 0 additions & 75 deletions app/views/layouts/layout-debug.njk

This file was deleted.