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
670e26d7
Unverified
Commit
670e26d7
authored
Feb 28, 2022
by
Darren Austin
Committed by
GitHub
Feb 28, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated to v0.86 of the Material Design tokens. (#99292)
Added the navigation_rail.json as well.
parent
7959c395
Changes
28
Hide whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
80 additions
and
28 deletions
+80
-28
assist_chip.json
dev/tools/gen_defaults/data/assist_chip.json
+1
-1
banner.json
dev/tools/gen_defaults/data/banner.json
+1
-1
color_dark.json
dev/tools/gen_defaults/data/color_dark.json
+1
-1
color_light.json
dev/tools/gen_defaults/data/color_light.json
+1
-1
dialog.json
dev/tools/gen_defaults/data/dialog.json
+1
-1
elevation.json
dev/tools/gen_defaults/data/elevation.json
+1
-1
fab_extended_primary.json
dev/tools/gen_defaults/data/fab_extended_primary.json
+1
-1
fab_large_primary.json
dev/tools/gen_defaults/data/fab_large_primary.json
+1
-1
fab_primary.json
dev/tools/gen_defaults/data/fab_primary.json
+1
-1
fab_small_primary.json
dev/tools/gen_defaults/data/fab_small_primary.json
+1
-1
filter_chip.json
dev/tools/gen_defaults/data/filter_chip.json
+1
-1
input_chip.json
dev/tools/gen_defaults/data/input_chip.json
+1
-1
motion.json
dev/tools/gen_defaults/data/motion.json
+1
-1
navigation_bar.json
dev/tools/gen_defaults/data/navigation_bar.json
+1
-1
navigation_rail.json
dev/tools/gen_defaults/data/navigation_rail.json
+52
-0
palette.json
dev/tools/gen_defaults/data/palette.json
+1
-1
shape.json
dev/tools/gen_defaults/data/shape.json
+1
-1
slider.json
dev/tools/gen_defaults/data/slider.json
+2
-2
state.json
dev/tools/gen_defaults/data/state.json
+1
-1
suggestion_chip.json
dev/tools/gen_defaults/data/suggestion_chip.json
+1
-1
text_style.json
dev/tools/gen_defaults/data/text_style.json
+1
-1
top_app_bar_large.json
dev/tools/gen_defaults/data/top_app_bar_large.json
+1
-1
top_app_bar_medium.json
dev/tools/gen_defaults/data/top_app_bar_medium.json
+1
-1
top_app_bar_small.json
dev/tools/gen_defaults/data/top_app_bar_small.json
+1
-1
typeface.json
dev/tools/gen_defaults/data/typeface.json
+1
-1
floating_action_button.dart
...ages/flutter/lib/src/material/floating_action_button.dart
+1
-1
navigation_bar.dart
packages/flutter/lib/src/material/navigation_bar.dart
+1
-1
typography.dart
packages/flutter/lib/src/material/typography.dart
+1
-1
No files found.
dev/tools/gen_defaults/data/assist_chip.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.assist-chip.container.height"
:
32.0
,
"md.comp.assist-chip.container.height"
:
32.0
,
"md.comp.assist-chip.container.shape"
:
"md.sys.shape.corner.small"
,
"md.comp.assist-chip.container.shape"
:
"md.sys.shape.corner.small"
,
...
...
dev/tools/gen_defaults/data/banner.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.banner.action.focus.label-text.color"
:
"primary"
,
"md.comp.banner.action.focus.label-text.color"
:
"primary"
,
"md.comp.banner.action.focus.state-layer.color"
:
"primary"
,
"md.comp.banner.action.focus.state-layer.color"
:
"primary"
,
...
...
dev/tools/gen_defaults/data/color_dark.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.sys.color.background"
:
"md.ref.palette.neutral10"
,
"md.sys.color.background"
:
"md.ref.palette.neutral10"
,
"md.sys.color.error"
:
"md.ref.palette.error80"
,
"md.sys.color.error"
:
"md.ref.palette.error80"
,
...
...
dev/tools/gen_defaults/data/color_light.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.sys.color.background"
:
"md.ref.palette.neutral99"
,
"md.sys.color.background"
:
"md.ref.palette.neutral99"
,
"md.sys.color.error"
:
"md.ref.palette.error40"
,
"md.sys.color.error"
:
"md.ref.palette.error40"
,
...
...
dev/tools/gen_defaults/data/dialog.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.dialog.action.focus.label-text.color"
:
"primary"
,
"md.comp.dialog.action.focus.label-text.color"
:
"primary"
,
"md.comp.dialog.action.focus.state-layer.color"
:
"primary"
,
"md.comp.dialog.action.focus.state-layer.color"
:
"primary"
,
...
...
dev/tools/gen_defaults/data/elevation.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.sys.elevation.level0"
:
0.0
,
"md.sys.elevation.level0"
:
0.0
,
"md.sys.elevation.level1"
:
1.0
,
"md.sys.elevation.level1"
:
1.0
,
...
...
dev/tools/gen_defaults/data/fab_extended_primary.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.extended-fab.primary.container.color"
:
"primaryContainer"
,
"md.comp.extended-fab.primary.container.color"
:
"primaryContainer"
,
"md.comp.extended-fab.primary.container.elevation"
:
"md.sys.elevation.level3"
,
"md.comp.extended-fab.primary.container.elevation"
:
"md.sys.elevation.level3"
,
...
...
dev/tools/gen_defaults/data/fab_large_primary.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.fab.primary.large.container.color"
:
"primaryContainer"
,
"md.comp.fab.primary.large.container.color"
:
"primaryContainer"
,
"md.comp.fab.primary.large.container.elevation"
:
"md.sys.elevation.level3"
,
"md.comp.fab.primary.large.container.elevation"
:
"md.sys.elevation.level3"
,
...
...
dev/tools/gen_defaults/data/fab_primary.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.fab.primary.container.color"
:
"primaryContainer"
,
"md.comp.fab.primary.container.color"
:
"primaryContainer"
,
"md.comp.fab.primary.container.elevation"
:
"md.sys.elevation.level3"
,
"md.comp.fab.primary.container.elevation"
:
"md.sys.elevation.level3"
,
...
...
dev/tools/gen_defaults/data/fab_small_primary.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.fab.primary.small.container.color"
:
"primaryContainer"
,
"md.comp.fab.primary.small.container.color"
:
"primaryContainer"
,
"md.comp.fab.primary.small.container.elevation"
:
"md.sys.elevation.level3"
,
"md.comp.fab.primary.small.container.elevation"
:
"md.sys.elevation.level3"
,
...
...
dev/tools/gen_defaults/data/filter_chip.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.filter-chip.container.height"
:
32.0
,
"md.comp.filter-chip.container.height"
:
32.0
,
"md.comp.filter-chip.container.shadow-color"
:
"shadow"
,
"md.comp.filter-chip.container.shadow-color"
:
"shadow"
,
...
...
dev/tools/gen_defaults/data/input_chip.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.input-chip.container.elevation"
:
"md.sys.elevation.level0"
,
"md.comp.input-chip.container.elevation"
:
"md.sys.elevation.level0"
,
"md.comp.input-chip.container.height"
:
32.0
,
"md.comp.input-chip.container.height"
:
32.0
,
...
...
dev/tools/gen_defaults/data/motion.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.sys.motion.duration.100Ms"
:
100.0
,
"md.sys.motion.duration.100Ms"
:
100.0
,
"md.sys.motion.duration.1000Ms"
:
1000.0
,
"md.sys.motion.duration.1000Ms"
:
1000.0
,
...
...
dev/tools/gen_defaults/data/navigation_bar.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.navigation-bar.active.focus.icon.color"
:
"onSecondaryContainer"
,
"md.comp.navigation-bar.active.focus.icon.color"
:
"onSecondaryContainer"
,
"md.comp.navigation-bar.active.focus.label-text.color"
:
"onSurface"
,
"md.comp.navigation-bar.active.focus.label-text.color"
:
"onSurface"
,
...
...
dev/tools/gen_defaults/data/navigation_rail.json
0 → 100644
View file @
670e26d7
{
"version"
:
"v0_86"
,
"md.comp.navigation-rail.active.focus.icon.color"
:
"onSecondaryContainer"
,
"md.comp.navigation-rail.active.focus.label-text.color"
:
"onSurface"
,
"md.comp.navigation-rail.active.focus.state-layer.color"
:
"onSurface"
,
"md.comp.navigation-rail.active.hover.icon.color"
:
"onSecondaryContainer"
,
"md.comp.navigation-rail.active.hover.label-text.color"
:
"onSurface"
,
"md.comp.navigation-rail.active.hover.state-layer.color"
:
"onSurface"
,
"md.comp.navigation-rail.active.icon.color"
:
"onSecondaryContainer"
,
"md.comp.navigation-rail.active-indicator.color"
:
"secondaryContainer"
,
"md.comp.navigation-rail.active-indicator.height"
:
32.0
,
"md.comp.navigation-rail.active-indicator.shape"
:
"md.sys.shape.corner.full"
,
"md.comp.navigation-rail.active-indicator.width"
:
56.0
,
"md.comp.navigation-rail.active.label-text.color"
:
"onSurface"
,
"md.comp.navigation-rail.active.pressed.icon.color"
:
"onSecondaryContainer"
,
"md.comp.navigation-rail.active.pressed.label-text.color"
:
"onSurface"
,
"md.comp.navigation-rail.active.pressed.state-layer.color"
:
"onSurface"
,
"md.comp.navigation-rail.container.color"
:
"surface"
,
"md.comp.navigation-rail.container.elevation"
:
"md.sys.elevation.level0"
,
"md.comp.navigation-rail.container.shape"
:
"md.sys.shape.corner.none"
,
"md.comp.navigation-rail.container.width"
:
80.0
,
"md.comp.navigation-rail.focus.state-layer.opacity"
:
"md.sys.state.focus.state-layer-opacity"
,
"md.comp.navigation-rail.hover.state-layer.opacity"
:
"md.sys.state.hover.state-layer-opacity"
,
"md.comp.navigation-rail.icon.size"
:
24.0
,
"md.comp.navigation-rail.inactive.focus.icon.color"
:
"onSurface"
,
"md.comp.navigation-rail.inactive.focus.label-text.color"
:
"onSurface"
,
"md.comp.navigation-rail.inactive.focus.state-layer.color"
:
"onSurface"
,
"md.comp.navigation-rail.inactive.hover.icon.color"
:
"onSurface"
,
"md.comp.navigation-rail.inactive.hover.label-text.color"
:
"onSurface"
,
"md.comp.navigation-rail.inactive.hover.state-layer.color"
:
"onSurface"
,
"md.comp.navigation-rail.inactive.icon.color"
:
"onSurfaceVariant"
,
"md.comp.navigation-rail.inactive.label-text.color"
:
"onSurfaceVariant"
,
"md.comp.navigation-rail.inactive.pressed.icon.color"
:
"onSurface"
,
"md.comp.navigation-rail.inactive.pressed.label-text.color"
:
"onSurface"
,
"md.comp.navigation-rail.inactive.pressed.state-layer.color"
:
"onSurface"
,
"md.comp.navigation-rail.label-text.text-style"
:
"labelMedium"
,
"md.comp.navigation-rail.menu.focus.icon.color"
:
"onSurface"
,
"md.comp.navigation-rail.menu.focus.state-layer.color"
:
"onSurface"
,
"md.comp.navigation-rail.menu.focus.state-layer.opacity"
:
"md.sys.state.focus.state-layer-opacity"
,
"md.comp.navigation-rail.menu.hover.icon.color"
:
"onSurface"
,
"md.comp.navigation-rail.menu.hover.state-layer.color"
:
"onSurface"
,
"md.comp.navigation-rail.menu.hover.state-layer.opacity"
:
"md.sys.state.hover.state-layer-opacity"
,
"md.comp.navigation-rail.menu.icon.color"
:
"onSurfaceVariant"
,
"md.comp.navigation-rail.menu.icon.size"
:
24.0
,
"md.comp.navigation-rail.menu.pressed.icon.color"
:
"onSurface"
,
"md.comp.navigation-rail.menu.pressed.state-layer.color"
:
"onSurface"
,
"md.comp.navigation-rail.menu.pressed.state-layer.opacity"
:
"md.sys.state.pressed.state-layer-opacity"
,
"md.comp.navigation-rail.no-label.active-indicator.height"
:
56.0
,
"md.comp.navigation-rail.no-label.active-indicator.shape"
:
"md.sys.shape.corner.full"
,
"md.comp.navigation-rail.pressed.state-layer.opacity"
:
"md.sys.state.pressed.state-layer-opacity"
}
dev/tools/gen_defaults/data/palette.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.ref.palette.black"
:
"0xFF000000"
,
"md.ref.palette.black"
:
"0xFF000000"
,
"md.ref.palette.error0"
:
"0xFF000000"
,
"md.ref.palette.error0"
:
"0xFF000000"
,
...
...
dev/tools/gen_defaults/data/shape.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.sys.shape.corner.extra-large"
:
{
"md.sys.shape.corner.extra-large"
:
{
"family"
:
"SHAPE_FAMILY_ROUNDED_CORNERS"
,
"family"
:
"SHAPE_FAMILY_ROUNDED_CORNERS"
,
...
...
dev/tools/gen_defaults/data/slider.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.slider.active.track.color"
:
"primary"
,
"md.comp.slider.active.track.color"
:
"primary"
,
"md.comp.slider.active.track.height"
:
6.0
,
"md.comp.slider.active.track.height"
:
6.0
,
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
"md.comp.slider.pressed.handle.color"
:
"primary"
,
"md.comp.slider.pressed.handle.color"
:
"primary"
,
"md.comp.slider.pressed.state-layer.color"
:
"primary"
,
"md.comp.slider.pressed.state-layer.color"
:
"primary"
,
"md.comp.slider.pressed.state-layer.opacity"
:
"md.sys.state.pressed.state-layer-opacity"
,
"md.comp.slider.pressed.state-layer.opacity"
:
"md.sys.state.pressed.state-layer-opacity"
,
"md.comp.slider.state-layer.size"
:
4
8
.0
,
"md.comp.slider.state-layer.size"
:
4
0
.0
,
"md.comp.slider.track.elevation"
:
"md.sys.elevation.level0"
,
"md.comp.slider.track.elevation"
:
"md.sys.elevation.level0"
,
"md.comp.slider.with-overlap.handle.outline.color"
:
"onPrimary"
,
"md.comp.slider.with-overlap.handle.outline.color"
:
"onPrimary"
,
"md.comp.slider.with-overlap.handle.outline.width"
:
1.0
,
"md.comp.slider.with-overlap.handle.outline.width"
:
1.0
,
...
...
dev/tools/gen_defaults/data/state.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.sys.state.dragged.state-layer-opacity"
:
0.16
,
"md.sys.state.dragged.state-layer-opacity"
:
0.16
,
"md.sys.state.focus.state-layer-opacity"
:
0.12
,
"md.sys.state.focus.state-layer-opacity"
:
0.12
,
...
...
dev/tools/gen_defaults/data/suggestion_chip.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.suggestion-chip.container.height"
:
32.0
,
"md.comp.suggestion-chip.container.height"
:
32.0
,
"md.comp.suggestion-chip.container.shape"
:
"md.sys.shape.corner.small"
,
"md.comp.suggestion-chip.container.shape"
:
"md.sys.shape.corner.small"
,
...
...
dev/tools/gen_defaults/data/text_style.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.sys.typescale.body-large.font"
:
"md.ref.typeface.plain"
,
"md.sys.typescale.body-large.font"
:
"md.ref.typeface.plain"
,
"md.sys.typescale.body-large.line-height"
:
24.0
,
"md.sys.typescale.body-large.line-height"
:
24.0
,
...
...
dev/tools/gen_defaults/data/top_app_bar_large.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.top-app-bar.large.container.color"
:
"surface"
,
"md.comp.top-app-bar.large.container.color"
:
"surface"
,
"md.comp.top-app-bar.large.container.elevation"
:
"md.sys.elevation.level0"
,
"md.comp.top-app-bar.large.container.elevation"
:
"md.sys.elevation.level0"
,
...
...
dev/tools/gen_defaults/data/top_app_bar_medium.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.top-app-bar.medium.container.color"
:
"surface"
,
"md.comp.top-app-bar.medium.container.color"
:
"surface"
,
"md.comp.top-app-bar.medium.container.elevation"
:
"md.sys.elevation.level0"
,
"md.comp.top-app-bar.medium.container.elevation"
:
"md.sys.elevation.level0"
,
...
...
dev/tools/gen_defaults/data/top_app_bar_small.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.comp.top-app-bar.small.container.color"
:
"surface"
,
"md.comp.top-app-bar.small.container.color"
:
"surface"
,
"md.comp.top-app-bar.small.container.elevation"
:
"md.sys.elevation.level0"
,
"md.comp.top-app-bar.small.container.elevation"
:
"md.sys.elevation.level0"
,
...
...
dev/tools/gen_defaults/data/typeface.json
View file @
670e26d7
{
{
"version"
:
"v0_8
1
"
,
"version"
:
"v0_8
6
"
,
"md.ref.typeface.brand"
:
"Roboto"
,
"md.ref.typeface.brand"
:
"Roboto"
,
"md.ref.typeface.plain"
:
"Roboto"
,
"md.ref.typeface.plain"
:
"Roboto"
,
...
...
packages/flutter/lib/src/material/floating_action_button.dart
View file @
670e26d7
...
@@ -773,7 +773,7 @@ class _M2Defaults extends FloatingActionButtonThemeData {
...
@@ -773,7 +773,7 @@ class _M2Defaults extends FloatingActionButtonThemeData {
// These defaults are generated from the Material Design Token
// These defaults are generated from the Material Design Token
// database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
// database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
// Generated version v0_8
1
// Generated version v0_8
6
class
_M3Defaults
extends
FloatingActionButtonThemeData
{
class
_M3Defaults
extends
FloatingActionButtonThemeData
{
_M3Defaults
(
this
.
context
,
this
.
type
,
this
.
hasChild
)
_M3Defaults
(
this
.
context
,
this
.
type
,
this
.
hasChild
)
:
_colors
=
Theme
.
of
(
context
).
colorScheme
,
:
_colors
=
Theme
.
of
(
context
).
colorScheme
,
...
...
packages/flutter/lib/src/material/navigation_bar.dart
View file @
670e26d7
...
@@ -1244,7 +1244,7 @@ class _Defaults extends NavigationBarThemeData {
...
@@ -1244,7 +1244,7 @@ class _Defaults extends NavigationBarThemeData {
// These defaults are generated from the Material Design Token
// These defaults are generated from the Material Design Token
// database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
// database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
// Generated version v0_8
1
// Generated version v0_8
6
class
_TokenDefaultsM3
extends
NavigationBarThemeData
{
class
_TokenDefaultsM3
extends
NavigationBarThemeData
{
_TokenDefaultsM3
(
BuildContext
context
)
_TokenDefaultsM3
(
BuildContext
context
)
:
_theme
=
Theme
.
of
(
context
),
:
_theme
=
Theme
.
of
(
context
),
...
...
packages/flutter/lib/src/material/typography.dart
View file @
670e26d7
...
@@ -731,7 +731,7 @@ class Typography with Diagnosticable {
...
@@ -731,7 +731,7 @@ class Typography with Diagnosticable {
// These defaults are generated from the Material Design Token
// These defaults are generated from the Material Design Token
// database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
// database by the script dev/tools/gen_defaults/bin/gen_defaults.dart.
// Generated version v0_8
1
// Generated version v0_8
6
class
_M3Typography
{
class
_M3Typography
{
_M3Typography
.
_
();
_M3Typography
.
_
();
...
...
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