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.

Sign up for GitHub

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

Jump to bottom

Add phase banner and get in touch page #117

Merged
merged 2 commits into from
Jan 12, 2018
Merged

Add phase banner and get in touch page #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75ace96
Add phase banner
Jan 9, 2018
92cc4f9
Add get in touch page
Jan 10, 2018
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
293 changes: 146 additions & 147 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"lint": "gulp scss:lint"
},
"dependencies": {
"@govuk-frontend/all": "0.0.19-alpha",
"@govuk-frontend/all": "0.0.21-alpha",
"scss-to-json": "^2.0.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions src/components/checkboxes/default.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
layout: layout-example.njk
---

{% from 'checkbox/macro.njk' import govukCheckbox %}
{% from 'checkboxes/macro.njk' import govukCheckboxes %}

{{ govukCheckbox({
{{ govukCheckboxes({
"idPrefix": "nationality",
"name": "nationality",
"fieldset": {
Expand Down
4 changes: 2 additions & 2 deletions src/components/radios/default.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
layout: layout-example.njk
---

{% from 'radio/macro.njk' import govukRadio %}
{% from 'radios/macro.njk' import govukRadios %}

{{ govukRadio({
{{ govukRadios({
"idPrefix": "changed-name",
"name": "changed-name",
"fieldset": {
Expand Down
16 changes: 16 additions & 0 deletions src/get-in-touch.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<div class="govuk-o-width-container app-c-site-width-container">
<div class="govuk-o-grid govuk-o-main-wrapper">
<div class="govuk-o-grid__item govuk-o-grid__item--two-thirds">
<h1 class="govuk-heading-xl">Get in touch</h1>

<p class="govuk-body-l">If you’ve got a question, idea or suggestion get in touch with the Design System team.</p>

<h2 class="govuk-heading-l">Private beta Slack channel</h2>

<p class="govuk-body">Use <a href="https://ukgovernmentdigital.slack.com/messages/govuk-design-system">#govuk-design-system</a>, on cross-government Slack (<a href="slack://channel?team=T04V6EBTR&id=C6DMEH5R6">open in app</a>)</a></p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the comma here is a bit odd:

Use #govuk-design-system, on cross-government Slack (open in app)

@amyhupe shall we take it out?


<h2 class="govuk-heading-l">Email</h2>
<p class="govuk-body">Email the Design System team on <a href="mailto:[email protected]">[email protected]</a></p>
</div>
</div>
</div>
10 changes: 10 additions & 0 deletions views/partials/_header.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,13 @@
</div>
{# </div> #}
</header>

{% from "phase-banner/macro.njk" import govukPhaseBanner %}

{{ govukPhaseBanner({
"tag": {
"text": "beta"
},
"classes": "govuk-!-pl-r3 govuk-!-pr-r3",
"html": "This is a new service – your <a href=\"/get-in-touch\">feedback</a> will help us to improve it."
}) }}