Skip to content

Commit 8b35d65

Browse files
committed
migrate typography to material-ui v3.2.0
1 parent d7cd2d3 commit 8b35d65

File tree

8 files changed

+46
-151
lines changed

8 files changed

+46
-151
lines changed

lib/package-lock.json

Lines changed: 26 additions & 131 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"@babel/plugin-transform-runtime": "^7.1.0",
8585
"@babel/preset-env": "^7.1.0",
8686
"@babel/preset-react": "^7.0.0",
87-
"@material-ui/core": "^3.1.1",
87+
"@material-ui/core": "^3.2.0",
8888
"@types/classnames": "^2.2.6",
8989
"@types/jest": "^22.2.3",
9090
"@types/jss": "^9.5.6",

lib/src/DatePicker/DatePicker.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@ export class DatePicker extends React.PureComponent<
114114
<>
115115
<PickerToolbar>
116116
<ToolbarButton
117-
variant="subheading"
117+
variant="subtitle1"
118118
onClick={this.openYearSelection}
119119
selected={showYearSelection}
120120
label={utils.getYearText(this.date)}
121121
/>
122122

123123
<ToolbarButton
124-
variant="display1"
124+
variant="h4"
125125
onClick={this.openCalendar}
126126
selected={!showYearSelection}
127127
label={utils.getDatePickerHeaderText(this.date)}

lib/src/DatePicker/components/CalendarHeader.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export const CalendarHeader: React.SFC<CalendarHeaderProps> = ({
6060
transKey={currentMonth.toString()}
6161
className={classes.transitionContainer}
6262
>
63-
<Typography align="center" variant="body1">
63+
<Typography align="center" variant="body2">
6464
{utils.getCalendarHeaderText(currentMonth)}
6565
</Typography>
6666
</SlideTransition>

lib/src/DatePicker/components/Year.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export class Year extends React.PureComponent<YearProps> {
5656
onClick={this.handleClick}
5757
onKeyPress={this.handleClick}
5858
color={selected ? 'primary' : 'default'}
59-
variant={selected ? 'headline' : 'subheading'}
59+
variant={selected ? 'h5' : 'subtitle1'}
6060
{...other}
6161
>
6262
{children}

lib/src/DateTimePicker/components/DateTimePickerHeader.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ export const DateTimePickerHeader: React.SFC<
4747
<PickerToolbar className={classes.toolbar}>
4848
<div className={classes.dateHeader}>
4949
<ToolbarButton
50-
variant="subheading"
50+
variant="subtitle1"
5151
onClick={changeOpenView(DateTimePickerView.YEAR)}
5252
selected={openView === DateTimePickerView.YEAR}
5353
label={utils.getYearText(date)}
5454
/>
5555

5656
<ToolbarButton
57-
variant="display1"
57+
variant="h4"
5858
onClick={changeOpenView(DateTimePickerView.DATE)}
5959
selected={openView === DateTimePickerView.DATE}
6060
label={utils.getDateTimePickerHeaderText(date)}
@@ -64,21 +64,21 @@ export const DateTimePickerHeader: React.SFC<
6464
<div className={classes.timeHeader}>
6565
<div className={hourMinuteClassName}>
6666
<ToolbarButton
67-
variant="display2"
67+
variant="h3"
6868
onClick={changeOpenView(DateTimePickerView.HOUR)}
6969
selected={openView === DateTimePickerView.HOUR}
7070
label={utils.getHourText(date, ampm!)}
7171
/>
7272

7373
<ToolbarButton
74-
variant="display2"
74+
variant="h3"
7575
label=":"
7676
selected={false}
7777
className={classes.separator}
7878
/>
7979

8080
<ToolbarButton
81-
variant="display2"
81+
variant="h3"
8282
onClick={changeOpenView(DateTimePickerView.MINUTES)}
8383
selected={openView === DateTimePickerView.MINUTES}
8484
label={utils.getMinuteText(date)}
@@ -90,15 +90,15 @@ export const DateTimePickerHeader: React.SFC<
9090
<ToolbarButton
9191
className={classes.ampmLabel}
9292
selected={meridiemMode === 'am'}
93-
variant="subheading"
93+
variant="subtitle1"
9494
label={utils.getMeridiemText('am')}
9595
onClick={setMeridiemMode('am')}
9696
/>
9797

9898
<ToolbarButton
9999
className={classes.ampmLabel}
100100
selected={meridiemMode === 'pm'}
101-
variant="subheading"
101+
variant="subtitle1"
102102
label={utils.getMeridiemText('pm')}
103103
onClick={setMeridiemMode('pm')}
104104
/>

0 commit comments

Comments
 (0)