Skip to content

Commit 82cfa55

Browse files
fix(title): inherit padding for iOS title in a toolbar (#23343)
resolves #23072
1 parent ae96563 commit 82cfa55

File tree

2 files changed

+38
-21
lines changed

2 files changed

+38
-21
lines changed

core/src/components/modal/test/custom/index.html

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,35 @@
33

44
<head>
55
<meta charset="UTF-8">
6-
<title>Modal - Basic</title>
6+
<title>Modal - Custom</title>
77
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
88
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet">
99
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet">
1010
<script src="../../../../../scripts/testing/scripts.js"></script>
1111
<script nomodule src="../../../../../dist/ionic/ionic.js"></script>
1212
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script>
1313
<style>
14-
.custom-modal {
15-
--height: 70%;
16-
--border-style: solid;
17-
--border-width: 7px 0 0 0;
18-
--border-color: #0d51aa;
19-
--border-radius: 20px 20px 0 0;
14+
.custom-modal {
15+
--height: 70%;
16+
--border-style: solid;
17+
--border-width: 7px 0 0 0;
18+
--border-color: #0d51aa;
19+
--border-radius: 20px 20px 0 0;
2020

21-
align-items: flex-end;
22-
}
21+
align-items: flex-end;
22+
}
2323

24-
@media (max-width: 400px) {
25-
.custom-modal {
26-
--max-width: 98%;
27-
--height: 98%;
24+
.custom-modal ion-toolbar {
25+
--padding-top: 46px;
26+
--padding-bottom: 10px;
27+
}
28+
29+
@media (max-width: 400px) {
30+
.custom-modal {
31+
--max-width: 98%;
32+
--height: 98%;
33+
}
2834
}
29-
}
3035
</style>
3136
</head>
3237

@@ -35,7 +40,7 @@
3540

3641
<ion-header>
3742
<ion-toolbar>
38-
<ion-title>Modal - Basic</ion-title>
43+
<ion-title>Modal - Custom</ion-title>
3944
</ion-toolbar>
4045
</ion-header>
4146

@@ -55,13 +60,23 @@
5560
element.innerHTML = `
5661
<ion-header>
5762
<ion-toolbar>
63+
<ion-buttons slot="start">
64+
<ion-button>
65+
<ion-icon slot="icon-only" name="add-circle-outline"></ion-icon>
66+
</ion-button>
67+
</ion-buttons>
5868
<ion-title>Super Modal</ion-title>
69+
<ion-buttons slot="end">
70+
<ion-button class="dismiss">
71+
Close
72+
</ion-button>
73+
</ion-buttons>
5974
</ion-toolbar>
6075
</ion-header>
6176
<ion-content>
6277
<h1>Content of doom</h1>
6378
<div>Here's some more content</div>
64-
<ion-button class="dismiss">Dismiss Modal</ion-button>
79+
<ion-button class="dismiss" class="dismiss">Dismiss Modal</ion-button>
6580
</ion-content>
6681
`;
6782

@@ -72,10 +87,12 @@ <h1>Content of doom</h1>
7287
});
7388

7489
// listen for close event
75-
const button = element.querySelector('ion-button');
76-
button.addEventListener('click', () => {
77-
modalElement.dismiss();
78-
});
90+
const buttons = element.querySelectorAll('.dismiss');
91+
for (var button of buttons) {
92+
button.addEventListener('click', () => {
93+
modalElement.dismiss();
94+
});
95+
}
7996
document.body.appendChild(modalElement);
8097
return modalElement;
8198
}

core/src/components/title/title.ios.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
:host {
77
@include position(0, null, null, 0);
8-
@include padding(0, 90px, 0);
8+
@include padding(var(--padding-top), 90px, var(--padding-bottom));
99

1010
position: absolute;
1111

0 commit comments

Comments
 (0)