Skip to content

Commit

Permalink
Merge pull request #590 from alphagov/release-0.0.26-alpha
Browse files Browse the repository at this point in the history 
Release v0.0.26-alpha
  • Loading branch information
@NickColley
NickColley authored Mar 8, 2018
2 parents aeb1350 + 2002ea1 commit 0fd001d
Show file tree
Hide file tree
Showing 80 changed files with 2,118 additions and 615 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Note: We're not following semantic versioning yet, we are going to talk about this soon.

## Unreleased
## 0.0.26-alpha (Breaking release)

Breaking changes:

Expand Down
2 changes: 1 addition & 1 deletion dist/VERSION.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.25-alpha
0.0.26-alpha
1 change: 1 addition & 0 deletions dist/components/all/_all.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
@import "../error-summary/error-summary";
@import "../fieldset/fieldset";
@import "../file-upload/file-upload";
@import "../footer/footer";
@import "../input/input";
@import "../label/label";
@import "../panel/panel";
Expand Down
2 changes: 1 addition & 1 deletion dist/components/button/template.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ describe('Button', () => {
})

it('renders an input[type=submit] if you don\'t pass anything', () => {
const $ = render('button')
const $ = render('button', {})

const $component = $('.govuk-c-button')
expect($component.get(0).tagName).toEqual('input')
Expand Down
234 changes: 117 additions & 117 deletions dist/components/checkboxes/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,44 +16,44 @@ Find out when to use the Checkboxes component in your service in the [GOV.UK Des

#### Markup

<div class="govuk-c-checkboxes">

<div class="govuk-o-form-group">
<fieldset class="govuk-c-fieldset">
<fieldset class="govuk-c-fieldset">

<legend class="govuk-c-fieldset__legend">
What is your nationality?
<legend class="govuk-c-fieldset__legend">
What is your nationality?

<span class="govuk-c-fieldset__hint">If you have dual nationality, select all options that are relevant to you.</span>
<span class="govuk-c-fieldset__hint">If you have dual nationality, select all options that are relevant to you.</span>

</legend>
</legend>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="nationality-1" name="nationality" type="checkbox" value="british">
<label class="govuk-c-label govuk-c-checkboxes__label" for="nationality-1">
<div class="govuk-c-checkboxes">

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="nationality-1" name="nationality" type="checkbox" value="british">
<label class="govuk-c-label govuk-c-checkboxes__label" for="nationality-1">
British

</label>
</div>
</div>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="irish">
<label class="govuk-c-label govuk-c-checkboxes__label" for="nationality-2">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="nationality-2" name="nationality" type="checkbox" value="irish">
<label class="govuk-c-label govuk-c-checkboxes__label" for="nationality-2">
Irish

</label>
</div>
</div>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="other">
<label class="govuk-c-label govuk-c-checkboxes__label" for="nationality-3">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="nationality-3" name="nationality" type="checkbox" value="other">
<label class="govuk-c-label govuk-c-checkboxes__label" for="nationality-3">
Citizen of another country

</label>
</div>
</fieldset>
</div>
</div>

</div>
</fieldset>
</div>

#### Macro
Expand Down Expand Up @@ -87,33 +87,33 @@ Find out when to use the Checkboxes component in your service in the [GOV.UK Des

#### Markup

<div class="govuk-c-checkboxes">
<div class="govuk-c-checkboxes">

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="colours-1" name="colours" type="checkbox" value="red">
<label class="govuk-c-label govuk-c-checkboxes__label" for="colours-1">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="colours-1" name="colours" type="checkbox" value="red">
<label class="govuk-c-label govuk-c-checkboxes__label" for="colours-1">
Red

</label>
</div>
</div>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="colours-2" name="colours" type="checkbox" value="green">
<label class="govuk-c-label govuk-c-checkboxes__label" for="colours-2">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="colours-2" name="colours" type="checkbox" value="green">
<label class="govuk-c-label govuk-c-checkboxes__label" for="colours-2">
Green

</label>
</div>
</div>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="colours-3" name="colours" type="checkbox" value="blue" disabled>
<label class="govuk-c-label govuk-c-checkboxes__label" for="colours-3">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="colours-3" name="colours" type="checkbox" value="blue" disabled>
<label class="govuk-c-label govuk-c-checkboxes__label" for="colours-3">
Blue

</label>
</div>
</div>

</div>
</div>

#### Macro

Expand Down Expand Up @@ -142,44 +142,44 @@ Find out when to use the Checkboxes component in your service in the [GOV.UK Des

#### Markup

<div class="govuk-c-checkboxes">

<div class="govuk-o-form-group">
<fieldset class="govuk-c-fieldset">
<fieldset class="govuk-c-fieldset">

<legend class="govuk-c-fieldset__legend">
<h3 class="govuk-heading-m">Which types of waste do you transport regularly?</h3>
<legend class="govuk-c-fieldset__legend">
<h3 class="govuk-heading-m">Which types of waste do you transport regularly?</h3>

<span class="govuk-c-fieldset__hint">Select all that apply</span>
<span class="govuk-c-fieldset__hint">Select all that apply</span>

</legend>
</legend>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="undefined-1" name="" type="checkbox" value="animal">
<label class="govuk-c-label govuk-c-checkboxes__label" for="undefined-1">
<div class="govuk-c-checkboxes">

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="undefined-1" name="" type="checkbox" value="animal">
<label class="govuk-c-label govuk-c-checkboxes__label" for="undefined-1">
Waste from animal carcasses

</label>
</div>
</div>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="undefined-2" name="" type="checkbox" value="mines">
<label class="govuk-c-label govuk-c-checkboxes__label" for="undefined-2">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="undefined-2" name="" type="checkbox" value="mines">
<label class="govuk-c-label govuk-c-checkboxes__label" for="undefined-2">
Waste from mines or quarries

</label>
</div>
</div>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="undefined-3" name="" type="checkbox" value="farm">
<label class="govuk-c-label govuk-c-checkboxes__label" for="undefined-3">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="undefined-3" name="" type="checkbox" value="farm">
<label class="govuk-c-label govuk-c-checkboxes__label" for="undefined-3">
Farm or agricultural waste

</label>
</div>
</fieldset>
</div>
</div>

</div>
</fieldset>
</div>

#### Macro
Expand Down Expand Up @@ -211,33 +211,33 @@ Find out when to use the Checkboxes component in your service in the [GOV.UK Des

#### Markup

<div class="govuk-c-checkboxes">
<div class="govuk-c-checkboxes">

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="colours-1" name="colours" type="checkbox" value="red">
<label class="govuk-c-label govuk-c-checkboxes__label" for="colours-1">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="colours-1" name="colours" type="checkbox" value="red">
<label class="govuk-c-label govuk-c-checkboxes__label" for="colours-1">
Red

</label>
</div>
</div>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="colours-2" name="colours" type="checkbox" value="green">
<label class="govuk-c-label govuk-c-checkboxes__label" for="colours-2">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="colours-2" name="colours" type="checkbox" value="green">
<label class="govuk-c-label govuk-c-checkboxes__label" for="colours-2">
Green

</label>
</div>
</div>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="colours-3" name="colours" type="checkbox" value="blue">
<label class="govuk-c-label govuk-c-checkboxes__label" for="colours-3">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="colours-3" name="colours" type="checkbox" value="blue">
<label class="govuk-c-label govuk-c-checkboxes__label" for="colours-3">
Blue

</label>
</div>
</div>

</div>
</div>

#### Macro

Expand Down Expand Up @@ -265,48 +265,48 @@ Find out when to use the Checkboxes component in your service in the [GOV.UK Des

#### Markup

<div class="govuk-c-checkboxes">

<div class="govuk-o-form-group govuk-o-form-group--error">
<fieldset class="govuk-c-fieldset app-c-fieldset--custom-modifier" data-attribute="value" data-second-attribute="second-value">
<fieldset class="govuk-c-fieldset app-c-fieldset--custom-modifier" data-attribute="value" data-second-attribute="second-value">

<legend class="govuk-c-fieldset__legend">
What is your nationality?
<legend class="govuk-c-fieldset__legend">
What is your nationality?

<span class="govuk-c-fieldset__hint">If you have dual nationality, select all options that are relevant to you.</span>
<span class="govuk-c-fieldset__hint">If you have dual nationality, select all options that are relevant to you.</span>

<span class="govuk-c-error-message">
Please select an option
</span>
<span class="govuk-c-error-message">
Please select an option
</span>

</legend>
</legend>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="example-1" name="example" type="checkbox" value="british">
<label class="govuk-c-label govuk-c-checkboxes__label" for="example-1">
<div class="govuk-c-checkboxes">

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="example-1" name="example" type="checkbox" value="british">
<label class="govuk-c-label govuk-c-checkboxes__label" for="example-1">
British

</label>
</div>
</div>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="example-2" name="example" type="checkbox" value="irish">
<label class="govuk-c-label govuk-c-checkboxes__label" for="example-2">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="example-2" name="example" type="checkbox" value="irish">
<label class="govuk-c-label govuk-c-checkboxes__label" for="example-2">
Irish

</label>
</div>
</div>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="example-3" name="example" type="checkbox" value="other">
<label class="govuk-c-label govuk-c-checkboxes__label" for="example-3">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="example-3" name="example" type="checkbox" value="other">
<label class="govuk-c-label govuk-c-checkboxes__label" for="example-3">
Citizen of another country

</label>
</div>
</fieldset>
</div>
</div>

</div>
</fieldset>
</div>

#### Macro
Expand Down Expand Up @@ -348,46 +348,46 @@ Find out when to use the Checkboxes component in your service in the [GOV.UK Des

#### Markup

<div class="govuk-c-checkboxes">

<div class="govuk-o-form-group govuk-o-form-group--error">
<fieldset class="govuk-c-fieldset">
<fieldset class="govuk-c-fieldset">

<legend class="govuk-c-fieldset__legend">
<h3 class="govuk-heading-m">Which types of waste do you transport regularly?</h3>
<legend class="govuk-c-fieldset__legend">
<h3 class="govuk-heading-m">Which types of waste do you transport regularly?</h3>

<span class="govuk-c-error-message">
Please select an option
</span>
<span class="govuk-c-error-message">
Please select an option
</span>

</legend>
</legend>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="undefined-1" name="" type="checkbox" value="animal">
<label class="govuk-c-label govuk-c-checkboxes__label" for="undefined-1">
<div class="govuk-c-checkboxes">

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="undefined-1" name="" type="checkbox" value="animal">
<label class="govuk-c-label govuk-c-checkboxes__label" for="undefined-1">
Waste from animal carcasses

</label>
</div>
</div>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="undefined-2" name="" type="checkbox" value="mines">
<label class="govuk-c-label govuk-c-checkboxes__label" for="undefined-2">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="undefined-2" name="" type="checkbox" value="mines">
<label class="govuk-c-label govuk-c-checkboxes__label" for="undefined-2">
Waste from mines or quarries

</label>
</div>
</div>

<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="undefined-3" name="" type="checkbox" value="farm">
<label class="govuk-c-label govuk-c-checkboxes__label" for="undefined-3">
<div class="govuk-c-checkboxes__item">
<input class="govuk-c-checkboxes__input" id="undefined-3" name="" type="checkbox" value="farm">
<label class="govuk-c-label govuk-c-checkboxes__label" for="undefined-3">
Farm or agricultural waste

</label>
</div>
</fieldset>
</div>
</div>

</div>
</fieldset>
</div>

#### Macro
Expand Down
Loading

0 comments on commit 0fd001d

Please sign in to comment.