Skip to content

USWDS - Pagination: Update pagination on develop. #4175

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

Merged
thisisdano merged 120 commits into from
Jun 16, 2021
Merged

USWDS - Pagination: Update pagination on develop. #4175

Changes from 1 commit
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
99a88aa
Start prototyping Pagination. 🔽
mejiaj Dec 7, 2020
29a93d8
Update pagination nav classes, add label and view all.
Dec 8, 2020
028c1ee
Theme pagination.
Dec 8, 2020
79f32cd
Show 2 pages before and after.
Dec 8, 2020
6d1263b
Fix label amount.
Dec 8, 2020
40b35b1
Add previous and next labels on mobile.
Dec 8, 2020
8df1200
Add config to easily generate pager items 🔽.
Dec 8, 2020
56edc16
More items, disable arrows on 1st and last groups.
Dec 9, 2020
4a2f569
Add Centered variant.
Dec 9, 2020
f9e255c
Update breakpoint.
Dec 9, 2020
157d521
Set current page in label.
Dec 9, 2020
15ec8f0
Create test page for Pagination.
Dec 9, 2020
c42427e
Simplify logic.
Dec 9, 2020
907f84f
Add pagination link color settings and update based on test page.
Dec 9, 2020
b78774f
Set override for disabled link color.
Dec 9, 2020
a403d85
Add option for custom aria label.
Dec 9, 2020
d37d0c7
Update aria labels on pagination tests.
Dec 9, 2020
deadbf8
Run prettier on pagination.scss
Dec 9, 2020
a1d035b
Create test page for pagination.
Dec 16, 2020
b4ec8c0
Use real links in pagination test.
Dec 16, 2020
bf5bf36
Move view all next to centered pager.
Dec 17, 2020
e9684e4
Merge branch 'develop' of github.com:uswds/uswds into jm-add-pagination
Jan 6, 2021
0844ba3
Update pagination template.
Jan 6, 2021
ec335fc
Pagination theming updates based on feedback.
Jan 6, 2021
88a1a0c
Update pagination centered.
Jan 6, 2021
cbf02db
Update button padding and remove commented code.
Jan 7, 2021
89325e3
Update material icon navigate before/next thickness.
Jan 7, 2021
2369731
Use framed preview
thisisdano Jan 12, 2021
bbb4057
Simplify pagination item selector since next/prev have moved.
Jan 26, 2021
065f803
Move Pagination settings.
Jan 26, 2021
868114b
Add spacing to view all link for IE11.
Jan 26, 2021
bccded3
Update centered variation for IE11.
Jan 26, 2021
7537f6a
Merge branch 'develop' of github.com:uswds/uswds into jm-add-pagination
Mar 10, 2021
ff63b11
Add important to mixin set-text-from-bg.
Mar 10, 2021
f9505b1
Add $pagination-context.
Mar 10, 2021
4c3464f
Add pagination package and sort.
Mar 10, 2021
93b5753
Use transparent token for border color.
Mar 16, 2021
a620c5f
Update important setting on set-text-from-bg.
Mar 16, 2021
91ab0b5
Condense page button styles & use color setting functions.
Mar 16, 2021
5926bda
Use set-text-from-bg on default hover pager state.
Mar 16, 2021
3da9b49
Merge branch 'develop' of github.com:uswds/uswds into jm-add-pagination
Apr 27, 2021
fc1cd34
Sync latest changes from pagination.
Apr 28, 2021
0cc200b
Add correct translation to default Spanish variant.
Apr 28, 2021
d908b6f
Use standard name for Spanish variant.
Apr 28, 2021
1ab1d78
Add prettier task for rendered templates.
Apr 29, 2021
df39d46
Fix markup errors so prettier runs properly.
Apr 29, 2021
0ceb799
Add font family setting to get proper display on Site.
Apr 29, 2021
77329e6
Alignment fixes.
Apr 29, 2021
f70c345
Fix chromium whitespace bug on Previous link.
Apr 29, 2021
84795f6
Add class to separate infinite variant.
Apr 29, 2021
651e179
Remove unused color variable.
Apr 29, 2021
a0592b6
Move first and last logic to a variable; add aria-disabled to arrow.
Apr 29, 2021
e6479a2
Create axe exclude class; add to pagination section dark.
Apr 30, 2021
d105b99
Move axe exclude class to rules.
Apr 30, 2021
4d5d87b
Simplify exclude selector.
Apr 30, 2021
55dcce8
Remove pagination on dark section.
Apr 30, 2021
8585a83
Disallow setting background for page buttons
thisisdano May 5, 2021
74ef552
Underline on hover to be more clear
thisisdano May 5, 2021
63ec265
Hide redundant functionality on mobile view
thisisdano May 5, 2021
3b1c5d4
Current page should not be a link
thisisdano May 5, 2021
2330dc2
Reduce visual weight of ellipsis
thisisdano May 5, 2021
abfd4d2
Use background color for current-page text
thisisdano May 5, 2021
909844c
Reduce number of settings
thisisdano May 5, 2021
c942cf0
Use a less obtrusive button border and simplify hover
thisisdano May 6, 2021
2e70e7d
npm audit fix
thisisdano Jun 2, 2021
5bf9088
Merge branch 'develop' into jm-add-pagination
thisisdano Jun 2, 2021
9c0cad7
Update package-lock.json
thisisdano Jun 2, 2021
f273747
Use proper include path to base template
thisisdano Jun 2, 2021
d40d337
Remove misplaced var in config.
Jun 4, 2021
c2d9608
Hide previous and next if first and last items are selected.
Jun 4, 2021
c9eb3f5
Update logic for bounded sets of data.
Jun 4, 2021
7662692
Remove disabled state since we're now hiding prev/next if they don't …
Jun 4, 2021
4246000
Use list items instead of divs.
Jun 4, 2021
01c9a60
Add tests for unbounded sets.
Jun 4, 2021
7d210cc
Move ellipsis to parent template so it can be used in variants.
Jun 4, 2021
447438e
Update infinite variant logic.
Jun 4, 2021
63fc6db
Merge branch 'develop' of github.com:uswds/uswds into jm-add-pagination
Jun 4, 2021
2d77538
Don't use tabular numerals
thisisdano Jun 7, 2021
19a4ae2
Use a more reliable fixed square size for the targets
thisisdano Jun 7, 2021
eb81aa6
Center all pagination target content on the cross axis
thisisdano Jun 7, 2021
0336d92
Use `overflow` not `ellipsis` for abstraction
thisisdano Jun 7, 2021
0d07f2e
Increase target padding
thisisdano Jun 7, 2021
c191f26
Merge branch 'develop' of github.com:uswds/uswds into jm-add-pagination
Jun 8, 2021
2ace49a
Use empty header on Pagination page example.
Jun 8, 2021
2bee14b
Add missing div on multiple sign in.
Jun 8, 2021
b726bc9
Templatize demo results page for pagination.
Jun 8, 2021
bc397e7
Use comma's to ensure landmarks are unique.
Jun 8, 2021
59b8d94
Add default case to unbounded pagination.
Jun 8, 2021
86a0e84
Add class for infinite variant.
Jun 9, 2021
013afd1
Modify logic for infinite pagination so it shows 2 items before and a…
Jun 9, 2021
a067e02
Update demo pagination config.
Jun 9, 2021
d5e1ee0
Set aria current on list items; move list markup to pagination items.
Jun 9, 2021
bd18e1c
Reorganize config so labels are named consistently.
Jun 9, 2021
cd2b561
Create an object for pager items.
Jun 9, 2021
afa7308
Fix current status.
Jun 10, 2021
81b8c83
Move aria label setting to it's own variable; update language.
Jun 10, 2021
54ec341
Create page to demo pagination states.
Jun 10, 2021
8a59b2f
Use scroll-snap on demo.
Jun 10, 2021
3f4bc83
Add descriptions to different states.
Jun 10, 2021
c91a0b4
Simplify infinite variant logic.
Jun 11, 2021
d9006d9
Remove unused ranges on infinite.
Jun 11, 2021
ab72b3c
Add unbounded tests.
Jun 11, 2021
cedc8e4
Tweak default logic to accurately follow guidelines.
Jun 11, 2021
ae91eb0
Remove 'of' label on unbounded sets.
Jun 11, 2021
c5da301
Always show overflow element in infinite variant.
Jun 11, 2021
7e8cfd6
Add more states to demo with descriptions.
Jun 11, 2021
e6c544e
Pass background color to $pagination-current-color for more accurate …
Jun 11, 2021
0309488
Add test classes for a11y color setting demo.
Jun 11, 2021
daf55c7
Update descriptions to demo.
Jun 11, 2021
6232d2f
Remove extra slot on infinite variant.
Jun 15, 2021
8b7d8b0
Update unbounded description.
Jun 15, 2021
54448ae
Update demo descriptions.
Jun 15, 2021
264c328
Use final names for unbounded variant
thisisdano Jun 16, 2021
af48955
Use unbounded not infinite
thisisdano Jun 16, 2021
0966cb7
Reduce space around prev/next link text
thisisdano Jun 16, 2021
1c82b62
Don't use --unbounded as a modifier
thisisdano Jun 16, 2021
0538cae
Remove demo pages.
Jun 16, 2021
5d4251b
Cleanup pagination all tests.
Jun 16, 2021
e710b26
Update pagination status.
Jun 16, 2021
da4b2eb
Merge branch 'jm-add-pagination' of https://github.com/uswds/uswds in…
thisisdano Jun 16, 2021
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
Prev Previous commit
Next Next commit
Show 2 pages before and after.
  • Loading branch information
James Mejia committed Dec 8, 2020
commit 79f32cd2a95ce6acc18934b8ad7825219168428c
16 changes: 8 additions & 8 deletions src/components/pagination/pagination.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,25 @@
</a>
</li>
<li class="usa-pagination__item usa-pagination__page-no">
<a href="{{ placeholder_link }}" class="usa-pagination__link" aria-label="Page 2">
<span class="usa-pagination__current" aria-label="Current page, page 2" aria-current="page">
2
</a>
</li>
<li class="usa-pagination__item usa-pagination__page-no">
<span class="usa-pagination__current" aria-label="Current page, page 3" aria-current="page">
3
</span>
</li>
<li class="usa-pagination__item">
<span class="usa-pagination__ellipsis">
<span class="usa-pagination__ellipsis" aria-label="X pages in between">
…
</span>
</li>
<li class="usa-pagination__item usa-pagination__page-no">
<a href="{{ placeholder_link }}" class="usa-pagination__link" aria-label="Page 4">
<a href="{{ placeholder_link }}" class="usa-pagination__link" aria-label="Page 11">
11
</a>
</li>
<li class="usa-pagination__item usa-pagination__page-no">
<a href="{{ placeholder_link }}" class="usa-pagination__link" aria-label="Page 12">
12
</a>
</li>

{# Next buttons #}
<li class="usa-pagination__item usa-pagination__next-page">
Expand Down