diff --git a/docs/pages/api/pagination-item.md b/docs/pages/api/pagination-item.md index 0f76a6fe296ad4..ebcd09b393f974 100644 --- a/docs/pages/api/pagination-item.md +++ b/docs/pages/api/pagination-item.md @@ -49,9 +49,9 @@ Any other props supplied will be provided to the root element (native element). | page | .MuiPaginationItem-page | Styles applied to the root element if `type="page"`. | sizeSmall | .MuiPaginationItem-sizeSmall | Styles applied applied to the root element if `size="small"`. | sizeLarge | .MuiPaginationItem-sizeLarge | Styles applied applied to the root element if `size="large"`. -| outlined | .MuiPaginationItem-outlined | Styles applied to the root element if `outlined="true"`. | textPrimary | .MuiPaginationItem-textPrimary | Styles applied to the root element if `variant="text"` and `color="primary"`. | textSecondary | .MuiPaginationItem-textSecondary | Styles applied to the root element if `variant="text"` and `color="secondary"`. +| outlined | .MuiPaginationItem-outlined | Styles applied to the root element if `outlined="true"`. | outlinedPrimary | .MuiPaginationItem-outlinedPrimary | Styles applied to the root element if `variant="outlined"` and `color="primary"`. | outlinedSecondary | .MuiPaginationItem-outlinedSecondary | Styles applied to the root element if `variant="outlined"` and `color="secondary"`. | rounded | .MuiPaginationItem-rounded | Styles applied to the root element if `rounded="true"`. diff --git a/docs/src/pages/components/pagination/pagination.md b/docs/src/pages/components/pagination/pagination.md index 6a3375828c1209..ff8a5892a08843 100644 --- a/docs/src/pages/components/pagination/pagination.md +++ b/docs/src/pages/components/pagination/pagination.md @@ -7,7 +7,7 @@ components: Pagination, PaginationItem
The Pagination component enables the user to select a specific page from a range of pages.
-## Pagination +## Basic pagination {{"demo": "pages/components/pagination/BasicPagination.js"}} diff --git a/packages/material-ui-lab/src/PaginationItem/PaginationItem.js b/packages/material-ui-lab/src/PaginationItem/PaginationItem.js index a47e5d712a1c36..312e505cce4929 100644 --- a/packages/material-ui-lab/src/PaginationItem/PaginationItem.js +++ b/packages/material-ui-lab/src/PaginationItem/PaginationItem.js @@ -50,6 +50,8 @@ export const styles = theme => ({ }, }, '&$disabled': { + opacity: 1, + color: theme.palette.action.disabled, backgroundColor: theme.palette.action.selected, }, }, @@ -79,19 +81,6 @@ export const styles = theme => ({ fontSize: theme.typography.pxToRem(22), }, }, - /* Styles applied to the root element if `outlined="true"`. */ - outlined: { - border: `1px solid ${ - theme.palette.type === 'light' ? 'rgba(0, 0, 0, 0.23)' : 'rgba(255, 255, 255, 0.23)' - }`, - '&$selected': { - '&$disabled': { - border: `1px solid ${ - theme.palette.type === 'light' ? 'rgba(0, 0, 0, 0.23)' : 'rgba(255, 255, 255, 0.23)' - }`, - }, - }, - }, /* Styles applied to the root element if `variant="text"` and `color="primary"`. */ textPrimary: { '&$selected': { @@ -105,7 +94,7 @@ export const styles = theme => ({ }, }, '&$disabled': { - color: theme.palette.text.primary, + color: theme.palette.action.disabled, }, }, }, @@ -122,7 +111,18 @@ export const styles = theme => ({ }, }, '&$disabled': { - color: theme.palette.text.primary, + color: theme.palette.action.disabled, + }, + }, + }, + /* Styles applied to the root element if `outlined="true"`. */ + outlined: { + border: `1px solid ${ + theme.palette.type === 'light' ? 'rgba(0, 0, 0, 0.23)' : 'rgba(255, 255, 255, 0.23)' + }`, + '&$selected': { + '&$disabled': { + border: `1px solid ${theme.palette.action.disabledBackground}`, }, }, }, @@ -143,7 +143,7 @@ export const styles = theme => ({ }, }, '&$disabled': { - color: theme.palette.text.primary, + color: theme.palette.action.disabled, }, }, }, @@ -164,7 +164,7 @@ export const styles = theme => ({ }, }, '&$disabled': { - color: theme.palette.text.primary, + color: theme.palette.action.disabled, }, }, },