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

fix(pagination): correct labelling discrepancies between versions #1417

Merged
merged 4 commits into from Nov 15, 2018
Merged

fix(pagination): correct labelling discrepancies between versions #1417

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52809f7
fix(pagination): correct labelling discrepancies between versions
dakahn Nov 9, 2018
8b3cf99
Merge branch 'master' into 1362-pagination-avt1-fix
alisonjoseph Nov 13, 2018
4bbab63
Merge branch 'master' into 1362-pagination-avt1-fix
alisonjoseph Nov 13, 2018
ae7b923
fix(pagination): address merge conflict
dakahn Nov 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/pagination/pagination.hbs
View file
Open in desktop
Expand Up @@ -2,9 +2,9 @@
<div class="{{@root.prefix}}--pagination__left">
<div class="{{@root.prefix}}--select{{#is version "v2"}} {{@root.prefix}}--select--inline{{/is}}">
{{#is version "v2"}}
<label for="select-id-pagination" class="{{@root.prefix}}--pagination__text">Items per page: </label>
<label for="select-id-pagination" id="select-id-pagination-label" class="{{@root.prefix}}--pagination__text">Items per page: </label>
{{/is}}
<select id="select-id-pagination" class="{{@root.prefix}}--select-input" data-items-per-page>
<select id="select-id-pagination" aria-label="select number of items per page" class="{{@root.prefix}}--select-input" data-items-per-page>
{{#each itemsPerPageChoices}}
<option class="{{@root.prefix}}--select-option" value="{{value}}"{{#if selected}} selected{{/if}}>{{label}}</option>
{{/each}}
Expand Down