Skip to content

Commit 06fa79c

Browse files
matt feedback on disabled contrast
1 parent c81c837 commit 06fa79c

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

docs/pages/api/pagination-item.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ Any other props supplied will be provided to the root element (native element).
4949
| <span class="prop-name">page</span> | <span class="prop-name">.MuiPaginationItem-page</span> | Styles applied to the root element if `type="page"`.
5050
| <span class="prop-name">sizeSmall</span> | <span class="prop-name">.MuiPaginationItem-sizeSmall</span> | Styles applied applied to the root element if `size="small"`.
5151
| <span class="prop-name">sizeLarge</span> | <span class="prop-name">.MuiPaginationItem-sizeLarge</span> | Styles applied applied to the root element if `size="large"`.
52-
| <span class="prop-name">outlined</span> | <span class="prop-name">.MuiPaginationItem-outlined</span> | Styles applied to the root element if `outlined="true"`.
5352
| <span class="prop-name">textPrimary</span> | <span class="prop-name">.MuiPaginationItem-textPrimary</span> | Styles applied to the root element if `variant="text"` and `color="primary"`.
5453
| <span class="prop-name">textSecondary</span> | <span class="prop-name">.MuiPaginationItem-textSecondary</span> | Styles applied to the root element if `variant="text"` and `color="secondary"`.
54+
| <span class="prop-name">outlined</span> | <span class="prop-name">.MuiPaginationItem-outlined</span> | Styles applied to the root element if `outlined="true"`.
5555
| <span class="prop-name">outlinedPrimary</span> | <span class="prop-name">.MuiPaginationItem-outlinedPrimary</span> | Styles applied to the root element if `variant="outlined"` and `color="primary"`.
5656
| <span class="prop-name">outlinedSecondary</span> | <span class="prop-name">.MuiPaginationItem-outlinedSecondary</span> | Styles applied to the root element if `variant="outlined"` and `color="secondary"`.
5757
| <span class="prop-name">rounded</span> | <span class="prop-name">.MuiPaginationItem-rounded</span> | Styles applied to the root element if `rounded="true"`.

docs/src/pages/components/pagination/pagination.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ components: Pagination, PaginationItem
77

88
<p class="description">The Pagination component enables the user to select a specific page from a range of pages.</p>
99

10-
## Pagination
10+
## Basic pagination
1111

1212
{{"demo": "pages/components/pagination/BasicPagination.js"}}
1313

packages/material-ui-lab/src/PaginationItem/PaginationItem.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ export const styles = theme => ({
5050
},
5151
},
5252
'&$disabled': {
53+
opacity: 1,
54+
color: theme.palette.action.disabled,
5355
backgroundColor: theme.palette.action.selected,
5456
},
5557
},
@@ -79,19 +81,6 @@ export const styles = theme => ({
7981
fontSize: theme.typography.pxToRem(22),
8082
},
8183
},
82-
/* Styles applied to the root element if `outlined="true"`. */
83-
outlined: {
84-
border: `1px solid ${
85-
theme.palette.type === 'light' ? 'rgba(0, 0, 0, 0.23)' : 'rgba(255, 255, 255, 0.23)'
86-
}`,
87-
'&$selected': {
88-
'&$disabled': {
89-
border: `1px solid ${
90-
theme.palette.type === 'light' ? 'rgba(0, 0, 0, 0.23)' : 'rgba(255, 255, 255, 0.23)'
91-
}`,
92-
},
93-
},
94-
},
9584
/* Styles applied to the root element if `variant="text"` and `color="primary"`. */
9685
textPrimary: {
9786
'&$selected': {
@@ -105,7 +94,7 @@ export const styles = theme => ({
10594
},
10695
},
10796
'&$disabled': {
108-
color: theme.palette.text.primary,
97+
color: theme.palette.action.disabled,
10998
},
11099
},
111100
},
@@ -122,7 +111,18 @@ export const styles = theme => ({
122111
},
123112
},
124113
'&$disabled': {
125-
color: theme.palette.text.primary,
114+
color: theme.palette.action.disabled,
115+
},
116+
},
117+
},
118+
/* Styles applied to the root element if `outlined="true"`. */
119+
outlined: {
120+
border: `1px solid ${
121+
theme.palette.type === 'light' ? 'rgba(0, 0, 0, 0.23)' : 'rgba(255, 255, 255, 0.23)'
122+
}`,
123+
'&$selected': {
124+
'&$disabled': {
125+
border: `1px solid ${theme.palette.action.disabledBackground}`,
126126
},
127127
},
128128
},
@@ -143,7 +143,7 @@ export const styles = theme => ({
143143
},
144144
},
145145
'&$disabled': {
146-
color: theme.palette.text.primary,
146+
color: theme.palette.action.disabled,
147147
},
148148
},
149149
},
@@ -164,7 +164,7 @@ export const styles = theme => ({
164164
},
165165
},
166166
'&$disabled': {
167-
color: theme.palette.text.primary,
167+
color: theme.palette.action.disabled,
168168
},
169169
},
170170
},

0 commit comments

Comments
 (0)