Skip to content

Commit 2f52971

Browse files
committed
Merge branch 'main' into react-firstapp-content
2 parents 4ff6c31 + 441e8b1 commit 2f52971

File tree

17 files changed

+411
-509
lines changed

17 files changed

+411
-509
lines changed

docs/components.md

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,18 @@ import DocsCards from '@components/global/DocsCards';
1919
`}</style>
2020
</head>
2121

22-
Ionic apps are made of high-level building blocks called Components, which allow you to quickly construct the UI for your app. Ionic comes stock with a number of components, including cards, lists, and tabs. Once youre familiar with the basics, refer to the [API Index](api.md) for a complete list of each component and sub-component.
22+
Ionic apps are made of high-level building blocks called Components, which allow you to quickly construct the UI for your app. Ionic comes stock with a number of components, including cards, lists, and tabs. Once you're familiar with the basics, refer to the [API Index](api.md) for a complete list of each component and sub-component.
2323

2424
<intro-end />
2525

2626
<DocsCards>
27-
<DocsCard header="Accordion" href="api/accordion" img="/icons/feature-component-accordion-icon.png">
28-
<p>Accordions provide collapsible sections in your content.</p>
29-
</DocsCard>
27+
<DocsCard header="Accordion" href="api/accordion" img="/icons/feature-component-accordion-icon.png">
28+
<p>Accordions provide collapsible sections in your content to reduce vertical space while providing a way of organizing and grouping information.</p>
29+
</DocsCard>
30+
31+
<DocsCard header="Action Sheet" href="api/action-sheet" icon="/icons/component-action-sheet-icon.png">
32+
<p>Action Sheets display a set of options with the ability to confirm or cancel an action.</p>
33+
</DocsCard>
3034

3135
<DocsCard header="Action Sheet" href="api/action-sheet" icon="/icons/component-action-sheet-icon.png">
3236
<p>Action Sheets display a set of options with the ability to confirm or cancel an action.</p>
@@ -49,8 +53,9 @@ Ionic apps are made of high-level building blocks called Components, which allow
4953
</DocsCard>
5054

5155
<DocsCard header="Card" href="api/card" icon="/icons/component-card-icon.png">
52-
<!-- prettier-ignore -->
53-
<p>Cards are a great way to display an important piece of content, and can contain images, buttons, text, and more.</p>
56+
<p>
57+
Cards are a great way to display an important piece of content, and can contain images, buttons, text, and more.
58+
</p>
5459
</DocsCard>
5560

5661
<DocsCard header="Checkbox" href="api/checkbox" icon="/icons/component-checkbox-icon.png">
@@ -77,20 +82,23 @@ Ionic apps are made of high-level building blocks called Components, which allow
7782
<p>The grid is a powerful mobile-first system for building custom layouts.</p>
7883
</DocsCard>
7984

80-
<DocsCard header="Icon" href="api/icon" icon="/icons/component-icons-icon.png">
85+
<DocsCard header="Icons" href="api/icon" icon="/icons/component-icons-icon.png">
8186
<p>Beautifully designed icons for use in web, iOS, and Android apps.</p>
8287
</DocsCard>
8388

8489
<DocsCard header="Infinite Scroll" href="api/infinite-scroll" icon="/icons/component-infinitescroll-icon.png">
8590
<p>Infinite scroll allows you to load new data as the user scrolls through your app.</p>
8691
</DocsCard>
8792

88-
<DocsCard header="Input" href="api/input" icon="/icons/component-input-icon.png">
93+
<DocsCard header="Inputs" href="api/input" icon="/icons/component-input-icon.png">
8994
<p>Inputs provides a way for users to enter data in your app.</p>
9095
</DocsCard>
9196

9297
<DocsCard header="Item" href="api/item" img="/icons/feature-component-item-icon.png">
93-
<p>Items are an all-purpose UI container that can be used as part of a list.</p>
98+
<p>
99+
Items are elements that can contain text, icons, avatars, images, inputs, and any other native or custom elements.
100+
Items can be swiped, deleted, reordered, edited, and more.
101+
</p>
94102
</DocsCard>
95103

96104
<DocsCard header="List" href="api/list" icon="/icons/component-lists-icon.png">
@@ -99,8 +107,8 @@ Ionic apps are made of high-level building blocks called Components, which allow
99107

100108
<DocsCard header="Media" href="api/avatar" icon="/icons/component-media-icon.png">
101109
<p>
102-
Media refers to a collection of Ionic's media-related components like ion-avatar, ion-img, ion-icon, and
103-
ion-thumbnail.
110+
A collection of media components, including avatars, icons, images, and thumbnails, designed to enhance visual
111+
content.
104112
</p>
105113
</DocsCard>
106114

@@ -112,14 +120,10 @@ Ionic apps are made of high-level building blocks called Components, which allow
112120
<p>Modals slide in and off screen to display a temporary UI and are often used for login or sign-up pages.</p>
113121
</DocsCard>
114122

115-
<DocsCard header="Navigation" href="api/menu" icon="/icons/component-navigation-icon.png">
123+
<DocsCard header="Navigation" href="api/nav" icon="/icons/component-navigation-icon.png">
116124
<p>Navigation is how users move between different pages in your app.</p>
117125
</DocsCard>
118126

119-
<DocsCard header="OTP Input" href="api/input-otp" icon="/icons/component-input-otp-icon.png">
120-
<p>Input OTP component simplifies entering one-time passwords with a customizable, multi-box interface.</p>
121-
</DocsCard>
122-
123127
<DocsCard header="Popover" href="api/popover" icon="/icons/component-popover-icon.png">
124128
<p>Popover provides an easy way to present information or options without changing contexts.</p>
125129
</DocsCard>
@@ -132,6 +136,10 @@ Ionic apps are made of high-level building blocks called Components, which allow
132136
<p>Radio inputs allow you to present a set of exclusive options.</p>
133137
</DocsCard>
134138

139+
<DocsCard header="Range" href="api/range" icon="/icons/component-range-icon.png">
140+
<p>Range sliders let users select a value by dragging a knob along a track.</p>
141+
</DocsCard>
142+
135143
<DocsCard header="Refresher" href="api/refresher" img="/icons/feature-component-refresher-icon.png">
136144
<p>Refresher provides pull-to-refresh functionality on a content component.</p>
137145
</DocsCard>
@@ -161,7 +169,7 @@ Ionic apps are made of high-level building blocks called Components, which allow
161169
</DocsCard>
162170

163171
<DocsCard header="Toast" href="api/toast" icon="/icons/component-toast-icon.png">
164-
<p>Toast is used to show a notification over the top of an app's content. It can be temporary or dismissible.</p>
172+
<p>Toasts are subtle notifications that appear over your app's content without interrupting user interaction.</p>
165173
</DocsCard>
166174

167175
<DocsCard header="Toggle" href="api/toggle" icon="/icons/component-toggle-icon.png">
@@ -172,7 +180,7 @@ Ionic apps are made of high-level building blocks called Components, which allow
172180
<p>Toolbars are used to house information and actions relating to your app.</p>
173181
</DocsCard>
174182

175-
<DocsCard header="Typography" href="api/text" icon="/icons/component-typography-icon.png">
176-
<p>Text is used to style or change the color of text within an application.</p>
177-
</DocsCard>
183+
<DocsCard header="Typography" href="api/text" icon="/icons/component-typography-icon.png">
184+
<p>Text is used to style or change the color of text within an application.</p>
185+
</DocsCard>
178186
</DocsCards>

sidebars.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -252,15 +252,15 @@ module.exports = {
252252
},
253253
{
254254
type: 'category',
255-
label: 'Action Sheet',
255+
label: 'Accordion',
256256
collapsed: false,
257-
items: ['api/action-sheet'],
257+
items: ['api/accordion', 'api/accordion-group'],
258258
},
259259
{
260260
type: 'category',
261-
label: 'Accordion',
261+
label: 'Action Sheet',
262262
collapsed: false,
263-
items: ['api/accordion', 'api/accordion-group'],
263+
items: ['api/action-sheet'],
264264
},
265265
{
266266
type: 'category',
@@ -276,7 +276,7 @@ module.exports = {
276276
},
277277
{
278278
type: 'category',
279-
label: 'Breadcrumb',
279+
label: 'Breadcrumbs',
280280
collapsed: false,
281281
items: ['api/breadcrumb', 'api/breadcrumbs'],
282282
},
@@ -337,19 +337,19 @@ module.exports = {
337337
},
338338
{
339339
type: 'category',
340-
label: 'Infinite Scroll',
340+
label: 'Icons',
341341
collapsed: false,
342-
items: ['api/infinite-scroll', 'api/infinite-scroll-content'],
342+
items: ['api/icon'],
343343
},
344344
{
345345
type: 'category',
346-
label: 'Icons',
346+
label: 'Infinite Scroll',
347347
collapsed: false,
348-
items: ['api/icon'],
348+
items: ['api/infinite-scroll', 'api/infinite-scroll-content'],
349349
},
350350
{
351351
type: 'category',
352-
label: 'Input',
352+
label: 'Inputs',
353353
collapsed: false,
354354
items: ['api/input', 'api/input-password-toggle', 'api/input-otp', 'api/textarea'],
355355
},

static/code/stackblitz/v7/angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@angular/router": "^20.0.0",
1818
"@ionic/angular": "^7.0.0",
1919
"@ionic/core": "^7.0.0",
20-
"ionicons": "8.0.10",
20+
"ionicons": "8.0.13",
2121
"rxjs": "^7.8.1",
2222
"tslib": "^2.5.0",
2323
"zone.js": "~0.15.0"

static/code/stackblitz/v7/html/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@ionic/core": "^7.0.0",
13-
"ionicons": "8.0.10"
13+
"ionicons": "8.0.13"
1414
},
1515
"devDependencies": {
1616
"typescript": "^5.0.0",

static/code/stackblitz/v7/react/package-lock.json

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

0 commit comments

Comments
 (0)