Skip to content

Commit ba8fa3d

Browse files
Merge pull request #34 from ionic-team/FW-5346
feat(): enable dynamic font scaling
2 parents f8125bd + 0f4cfc4 commit ba8fa3d

File tree

15 files changed

+75
-54
lines changed

15 files changed

+75
-54
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"generate": "stencil generate"
1818
},
1919
"dependencies": {
20-
"@ionic/core": "^7.0.0"
20+
"@ionic/core": "^7.5.0"
2121
},
2222
"devDependencies": {
2323
"@stencil/core": "^2.22.2",

src/components/action-sheet/action-sheet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export class ActionSheet {
7272
<component-details description={description} url={url}></component-details>
7373

7474
<div class="ion-padding-start ion-padding-end">
75-
<ion-button expand="block" onClick={this.open}>Open Action Sheet</ion-button>
75+
<ion-button class="ion-text-wrap" expand="block" onClick={this.open}>Open Action Sheet</ion-button>
7676
</div>
7777
</ion-content>
7878
];

src/components/badge/badge.css

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +0,0 @@
1-
ion-tab-bar {
2-
position: fixed;
3-
4-
right: 0;
5-
bottom: 0;
6-
left: 0;
7-
}

src/components/badge/badge.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ export class Badge {
6060
<ion-badge color="dark" slot="end">4</ion-badge>
6161
</ion-item>
6262
</ion-list>
63+
</ion-content>,
6364

65+
<ion-footer>
6466
<ion-tab-bar>
6567
<ion-tab-button selected>
6668
<ion-icon name="globe"></ion-icon>
@@ -75,7 +77,7 @@ export class Badge {
7577
<ion-badge>2.3k</ion-badge>
7678
</ion-tab-button>
7779
</ion-tab-bar>
78-
</ion-content>
80+
</ion-footer>
7981
];
8082
}
8183
}

src/components/button/button.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export class Button {
5656
Block Width
5757
</ion-label>
5858
</ion-list-header>
59-
<ion-button expand="block">A block button</ion-button>
59+
<ion-button class="ion-text-wrap" expand="block">A block button</ion-button>
6060
</section>
6161

6262
<section>
@@ -65,7 +65,7 @@ export class Button {
6565
Full Width
6666
</ion-label>
6767
</ion-list-header>
68-
<ion-button expand="full" color="secondary">A full-width button</ion-button>
68+
<ion-button class="ion-text-wrap" expand="full" color="secondary">A full-width button</ion-button>
6969
</section>
7070
</ion-content>
7171
];

src/components/card/card.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ component-card .coworker-card .header-img {
8282

8383
component-card .coworker-card h1 {
8484
font-weight: 600;
85-
font-size: 18px;
85+
font-size: 1.125rem;
8686
}
8787

8888
component-card .coworker-card p {
@@ -115,7 +115,7 @@ component-card .music-card img {
115115

116116
component-card .music-card h2 {
117117
font-weight: 600;
118-
font-size: 16px;
118+
font-size: 1rem;
119119

120120
color: var(--text-darker);
121121
}
@@ -132,7 +132,7 @@ component-card .music-card ion-button {
132132
}
133133

134134
component-card .music-card .button-largest {
135-
font-size: 28px;
135+
font-size: 1.75rem;
136136
}
137137

138138
component-card .music-card ion-progress-bar {

src/components/component-details/component-details.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ component-details ion-list {
55

66
component-details .item .component-description {
77
color: var(--ion-color-step-800, #3e4a58);
8-
font-size: 18px;
8+
font-size: 1.125rem;
99
line-height: 1.4;
1010
white-space: normal;
1111
padding-bottom: 16px;
@@ -19,5 +19,5 @@ component-details .item .component-description b {
1919
component-details .component-link {
2020
text-transform: capitalize;
2121

22-
font-size: 16px;
22+
font-size: 1rem;
2323
}

src/components/content/content.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class Content {
3232

3333
<ion-content fullscreen={true}>
3434
<p class="ion-padding-start ion-padding-end">
35-
<ion-button onClick={this.scrollToBottom} expand="block" fill="outline">Scroll To Bottom</ion-button>
35+
<ion-button class="ion-text-wrap" onClick={this.scrollToBottom} expand="block" fill="outline">Scroll To Bottom</ion-button>
3636
</p>
3737
{new Array(30).fill(0).map((_, i) => {
3838
return (
@@ -42,7 +42,7 @@ export class Content {
4242
);
4343
})}
4444
<p class="ion-padding-start ion-padding-end">
45-
<ion-button onClick={this.scrollToTop} expand="block" fill="outline">Scroll To Top</ion-button>
45+
<ion-button class="ion-text-wrap" onClick={this.scrollToTop} expand="block" fill="outline">Scroll To Top</ion-button>
4646
</p>
4747
</ion-content>
4848
];

src/components/icons/icons.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
component-icons ion-icon {
2-
font-size: 36px;
2+
font-size: 2.25rem;
33
margin: 3px;
44

55
color: var(--ion-color-step-650, #444);

0 commit comments

Comments
 (0)