Skip to content

Commit

Permalink
Merge pull request #581 from teamsnap/SO-4361-center-pagination
Browse files Browse the repository at this point in the history
center all elements of bottom pagination
  • Loading branch information
bradjteamsnap committed Apr 12, 2021
2 parents abe0d27 + ad46bf6 commit 7cbf68c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- `Fixed` for any bug fixes.
- `Security`

## [3.10.5] - 2021-04-06
- https://github.com/teamsnap/teamsnap-ui/pull/581
- `Updated` Center paginated table elements as a group

## [3.10.5] - 2021-04-06
- https://github.com/teamsnap/teamsnap-ui/pull/564
- `Added` Allow paginated table to export placement options type
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@teamsnap/teamsnap-ui",
"version": "3.10.5",
"version": "3.10.6",
"description": "a CSS component library for TeamSnap",
"main": "dist/js/index.js",
"types": "dist/js/index.d.ts",
Expand Down
5 changes: 2 additions & 3 deletions src/js/components/Table/Paginated/PaginatedTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ const PaginatedTable: React.FunctionComponent<Props> & { PaginationPlacement: ty
}, [customFilter]);

const paginationItems = (
<div className={ `Grid-cell u-spaceTopSm u-flex u-flexJustifyEnd ${paginationPlacement == Placement.Bottom ? "u-sizeFill u-sizeFull" : "u-sizeFit"}` }>
<div className="u-spaceAuto u-spaceRightSm">
<div className={ `Grid-cell u-spaceTopSm u-flex u-flexAlignItemsCenter ${paginationPlacement == Placement.Bottom ? " u-flexJustifyCenter u-sizeFill u-sizeFull" : " u-flexJustifyEnd u-sizeFit"}` }>
<div className="u-spaceRightSm">
<PaginationCurrentSubsetDisplay
itemsPerPage={ itemsPerPage }
currentPage={ currentPage }
Expand All @@ -201,7 +201,6 @@ const PaginatedTable: React.FunctionComponent<Props> & { PaginationPlacement: ty
itemsPerPage={ itemsPerPage }
currentPage={ currentPage }
setCurrentPage={ setCurrentPage }
mods={ paginationPlacement == Placement.Bottom ? "u-flexJustifyCenter u-flexGrow1" : "" }
/>
{ !hideRowsSelect ? (
<div className="u-spaceLeftSm">
Expand Down

0 comments on commit 7cbf68c

Please sign in to comment.