Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
9c660c1b
Unverified
Commit
9c660c1b
authored
Jun 10, 2020
by
Hans Muller
Committed by
GitHub
Jun 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update TextTheme.button.letterSpacing from 0.75 to 1.25 per spec (#59008)
parent
4461cfba
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
typography.dart
packages/flutter/lib/src/material/typography.dart
+1
-1
typography_test.dart
packages/flutter/test/material/typography_test.dart
+1
-2
No files found.
packages/flutter/lib/src/material/typography.dart
View file @
9c660c1b
...
@@ -526,7 +526,7 @@ class Typography with Diagnosticable {
...
@@ -526,7 +526,7 @@ class Typography with Diagnosticable {
bodyText2
:
TextStyle
(
debugLabel:
'englishLike bodyText2 2018'
,
fontSize:
14.0
,
fontWeight:
FontWeight
.
w400
,
textBaseline:
TextBaseline
.
alphabetic
,
letterSpacing:
0.25
),
bodyText2
:
TextStyle
(
debugLabel:
'englishLike bodyText2 2018'
,
fontSize:
14.0
,
fontWeight:
FontWeight
.
w400
,
textBaseline:
TextBaseline
.
alphabetic
,
letterSpacing:
0.25
),
subtitle1
:
TextStyle
(
debugLabel:
'englishLike subtitle1 2018'
,
fontSize:
16.0
,
fontWeight:
FontWeight
.
w400
,
textBaseline:
TextBaseline
.
alphabetic
,
letterSpacing:
0.15
),
subtitle1
:
TextStyle
(
debugLabel:
'englishLike subtitle1 2018'
,
fontSize:
16.0
,
fontWeight:
FontWeight
.
w400
,
textBaseline:
TextBaseline
.
alphabetic
,
letterSpacing:
0.15
),
subtitle2
:
TextStyle
(
debugLabel:
'englishLike subtitle2 2018'
,
fontSize:
14.0
,
fontWeight:
FontWeight
.
w500
,
textBaseline:
TextBaseline
.
alphabetic
,
letterSpacing:
0.1
),
subtitle2
:
TextStyle
(
debugLabel:
'englishLike subtitle2 2018'
,
fontSize:
14.0
,
fontWeight:
FontWeight
.
w500
,
textBaseline:
TextBaseline
.
alphabetic
,
letterSpacing:
0.1
),
button
:
TextStyle
(
debugLabel:
'englishLike button 2018'
,
fontSize:
14.0
,
fontWeight:
FontWeight
.
w500
,
textBaseline:
TextBaseline
.
alphabetic
,
letterSpacing:
0.7
5
),
button
:
TextStyle
(
debugLabel:
'englishLike button 2018'
,
fontSize:
14.0
,
fontWeight:
FontWeight
.
w500
,
textBaseline:
TextBaseline
.
alphabetic
,
letterSpacing:
1.2
5
),
caption
:
TextStyle
(
debugLabel:
'englishLike caption 2018'
,
fontSize:
12.0
,
fontWeight:
FontWeight
.
w400
,
textBaseline:
TextBaseline
.
alphabetic
,
letterSpacing:
0.4
),
caption
:
TextStyle
(
debugLabel:
'englishLike caption 2018'
,
fontSize:
12.0
,
fontWeight:
FontWeight
.
w400
,
textBaseline:
TextBaseline
.
alphabetic
,
letterSpacing:
0.4
),
overline
:
TextStyle
(
debugLabel:
'englishLike overline 2018'
,
fontSize:
10.0
,
fontWeight:
FontWeight
.
w400
,
textBaseline:
TextBaseline
.
alphabetic
,
letterSpacing:
1.5
),
overline
:
TextStyle
(
debugLabel:
'englishLike overline 2018'
,
fontSize:
10.0
,
fontWeight:
FontWeight
.
w400
,
textBaseline:
TextBaseline
.
alphabetic
,
letterSpacing:
1.5
),
);
);
...
...
packages/flutter/test/material/typography_test.dart
View file @
9c660c1b
...
@@ -167,8 +167,7 @@ void main() {
...
@@ -167,8 +167,7 @@ void main() {
expect
(
theme
.
button
.
fontFamily
,
'Roboto'
);
expect
(
theme
.
button
.
fontFamily
,
'Roboto'
);
expect
(
theme
.
button
.
fontWeight
,
medium
);
expect
(
theme
.
button
.
fontWeight
,
medium
);
expect
(
theme
.
button
.
fontSize
,
14
);
expect
(
theme
.
button
.
fontSize
,
14
);
// TODO(hansmuller): restore after englishLike2018 has been updated, per #38904.
expect
(
theme
.
button
.
letterSpacing
,
1.25
);
//expect(theme.button.letterSpacing, 1.25);
// Caption Roboto regular 12 0.4
// Caption Roboto regular 12 0.4
expect
(
theme
.
caption
.
fontFamily
,
'Roboto'
);
expect
(
theme
.
caption
.
fontFamily
,
'Roboto'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment