Skip to content

Commit

Permalink
Merge pull request #127 from hmcts/DIV-3893_use_govuk_frontend
Browse files Browse the repository at this point in the history
move errors above title, correct textbox sizes update confirmation co…
  • Loading branch information
dtaylor7 authored Jun 10, 2019
2 parents 0e7041f + 82f0234 commit 98e21d1
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 9 deletions.
32 changes: 30 additions & 2 deletions assets/scss/look-and-feel/confirmation-statement.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,37 @@
.confirmation-container {
background: #dee0e2;
padding: 25px;
background: govuk-colour("grey-3");
margin-bottom: 30px;

.govuk-form-group {
margin: 0;
padding: 25px 25px 0px 25px;
}

.govuk-checkboxes__label::before {
background: govuk-colour("white");
}

.govuk-list.govuk-list--bullet {
padding-left: 100px;
}

details {
padding-left: 80px;
}

.form-section {
margin-bottom: 25px;
}

.govuk-warning-text {
font-weight: normal;
background: govuk-colour("grey-3");
padding: 4px 25px 25px 25px;

.govuk-warning-text__icon {
left: 26px;
top: 30%;
margin-top: -17px;
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@hmcts/look-and-feel",
"description": "One question per page apps made easy",
"version": "3.0.0",
"version": "3.0.1",
"main": "./src/main.js",
"dependencies": {
"babel-core": "^6.26.0",
Expand Down
6 changes: 2 additions & 4 deletions templates/look-and-feel/components/fields.njk
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
{%- endif %}

{{ errorsFor(field) }}
<input class="govuk-input"
<input class="govuk-input govuk-input--width-20"
id="{{ field.id }}"
name="{{ field.id }}"
type="text"
Expand Down Expand Up @@ -151,9 +151,7 @@

<div class="govuk-form-group {{ errorClass(field) }} {{ groupClass }}">
<fieldset class="govuk-fieldset" id="{{ field.id }}">
<legend class="govuk-fieldset__legend govuk-fieldset__legend--xl {% if hideQuestion %}visually-hidden{% endif %}">
<h2 class="govuk-heading-m">{{ question }}</h2>
</legend>
<legend class="govuk-fieldset__legend govuk-fieldset__legend--m {% if hideQuestion %}visually-hidden{% endif %}">{{ question }}</legend>
{% if hint -%}
<span id="{{ field.id }}-hint" class="govuk-hint">
{{ hint }}
Expand Down
4 changes: 2 additions & 2 deletions templates/look-and-feel/layouts/question.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

{% block two_thirds %}

{{ header(title, size='l', fieldsValidated=fields.validated, fieldsValid=fields.valid) }}

{{ errorSummary(fields) }}

{{ header(title, size='l', fieldsValidated=fields.validated, fieldsValid=fields.valid) }}

<form
enctype="{{ enc_type | default('application/x-www-form-urlencoded') }}"
action="{{ postUrl | default(path if path else url) }}"
Expand Down

0 comments on commit 98e21d1

Please sign in to comment.