Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
22b5d41
added images and material 3 page
esouthren Apr 11, 2023
54b65f6
Add card and buttons widgets
esouthren Apr 11, 2023
f3e1d6f
add containement widgets
esouthren Apr 11, 2023
5631433
sort file
esouthren Apr 11, 2023
6a8fc19
add navigation widgets
esouthren Apr 11, 2023
acc6d9b
add selection widgets
esouthren Apr 11, 2023
3928ed5
add remaining widgets
esouthren Apr 11, 2023
8f35d3e
update snackbar image
esouthren Apr 11, 2023
a90a624
added material 3 image container
esouthren Apr 12, 2023
6c41f90
added toggle switch
esouthren Apr 13, 2023
f4d4d25
added icon toggle
esouthren Apr 14, 2023
ec5a499
sassy clean
esouthren Apr 14, 2023
69ffd84
added card colors in json
esouthren Apr 14, 2023
a98ec66
update toggle position
esouthren Apr 14, 2023
160533f
update css
esouthren Apr 14, 2023
f21305c
update hover duration and toggle icon boundary
esouthren Apr 14, 2023
e8d001b
update image transparencies
esouthren Apr 18, 2023
3b1ed1d
remove light/dark toggle
esouthren Apr 18, 2023
0deaea6
add other hover images
esouthren Apr 18, 2023
d4b98a8
update formatting
esouthren Apr 18, 2023
13e0075
update copy
esouthren Apr 18, 2023
e2acb2d
code tidy
esouthren Apr 18, 2023
a3fcb39
update listTile link
esouthren Apr 18, 2023
e762d7c
sort json order and whitespace
esouthren Apr 18, 2023
eac578f
comment responses
esouthren Apr 18, 2023
e19107e
Added M2 page notice
esouthren Apr 18, 2023
76eb19f
copy updates
esouthren Apr 19, 2023
897e064
remove m2 card from widgets page
esouthren Apr 19, 2023
66e1757
comment responses
esouthren Apr 20, 2023
644d151
fix other catalog path URLs
esouthren Apr 20, 2023
49f85e6
comment updates
esouthren Apr 20, 2023
2e9d8d9
update buttons Url
esouthren Apr 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove m2 card from widgets page
  • Loading branch information
esouthren committed Apr 19, 2023
commit 897e064e1181b6be02291e39edf2deb9eea36dd0
5 changes: 2 additions & 3 deletions src/_data/catalog/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,9 @@
"id": "material"
},
{
"name": "Material 3 Components",
"name": "Material Components",
"description": "Visual, behavioral, and motion-rich widgets implementing the <a href=\"https://m3.material.io/get-started\">Material 3</a> design specification.<br /><br />Material 3 becomes the default Flutter interface in late 2023. To learn more about this transition, check out <a href=\"https://m3.material.io/develop/flutter\">Flutter support for Material 3</a>.",
"pagecontent": "To opt into Material 3, set the <a href=\"https://api.flutter.dev/flutter/material/ThemeData/useMaterial3.html\"><code>useMaterial3</code></a> flag to <code>true</code> in your theme.<br /><br />To catch these widgets in action, check out our live Material 3 <a href=\"https://flutter.github.io/samples/web/material_3_demo\" target=\"_blank\" rel=\"noopener noreferrer\">demo app</a>.",

"pagecontent": "To opt into Material 3, set the <a href=\"https://api.flutter.dev/flutter/material/ThemeData/useMaterial3.html\"><code>useMaterial3</code></a> flag to <code>true</code> in your theme.<br /><br />To catch these widgets in action, check out our live Material 3 <a href=\"https://flutter.github.io/samples/web/material_3_demo\" target=\"_blank\" rel=\"noopener noreferrer\">demo app</a>.<br /><br />You can still check out our legacy <a href=\"/development/ui/widgets/material\">Material 2 widgets</a> over at their catalog page.",
"subcategories": [
{
"name": "Actions",
Expand Down
4 changes: 2 additions & 2 deletions src/_data/catalog/widgets.json
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@
},
{
"name": "Extended FAB",
"description": "Clickable block that prompts app users to take an action. The abbreviation stands for Extended Floating Action Buttons. These buttons display wider than standard FABs to accommodate a text label and provide a larger target area.",
"description": "Clickable floating action button. These buttons display wider than standard FABs to accommodate a text label and provide a larger target area.",
"categories": [],
"subcategories": [
"Actions"
Expand Down Expand Up @@ -1667,7 +1667,7 @@
},
{
"name": "Segmented button",
"description": "Segmented buttons help people select options, switch views, or sort elements.",
"description": "Single or multiple selected clickable blocks to help people select options, switch views, or sort elements.",
"categories": [],
"subcategories": [
"Actions"
Expand Down
19 changes: 11 additions & 8 deletions src/development/ui/widgets/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,18 @@ you can also see all the widgets in the [widget index][].
<div class="card-deck card-deck--responsive">
{% assign categories = site.data.catalog.index | sort: 'name' -%}
{% for section in categories %}
<div class="card">
<div class="card-body">
<a href="{{page.url}}{{section.id}}"><header class="card-title">{{section.name}}</header></a>
<p class="card-text">{{section.description}}</p>
</div>
<div class="card-footer card-footer--transparent">
<a href="{{page.url}}{{section.id}}">Visit</a>
<!-- Don't display the legacy Material 2 card. It is only accessible via the Material 3 components page. -->
{% if section.name != "Material 2 Components" %}
<div class="card">
<div class="card-body">
<a href="{{page.url}}{{section.id}}"><header class="card-title">{{section.name}}</header></a>
<p class="card-text">{{section.description}}</p>
</div>
<div class="card-footer card-footer--transparent">
<a href="{{page.url}}{{section.id}}">Visit</a>
</div>
</div>
</div>
{% endif -%}
{% endfor %}
</div>

Expand Down
8 changes: 8 additions & 0 deletions src/development/ui/widgets/material.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,11 @@ description: >
---

{% include docs/catalogpage.html category="Material 2 Components" %}
---
title: Material 2 Components widgets
short-title: Material
description: >
A catalog of Flutter's widgets implementing the Material 2 design guidelines.
---

{% include docs/catalogpage.html category="Material 2 Components" %}
2 changes: 1 addition & 1 deletion src/development/ui/widgets/material3.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ description: >
A catalog of Flutter's widgets implementing Material 3 design guidelines.
---

{% include docs/catalogpage-material-3.html category="Material 3 Components" %}
{% include docs/catalogpage-material-3.html category="Material Components" %}