Skip to content

fix(title): inherit padding for iOS title in a toolbar #23343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 3, 2021
Merged

fix(title): inherit padding for iOS title in a toolbar #23343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a37ac4
fix(title): inherit padding for iOS title in a toolbar
brandyscarney May 21, 2021
2c61755
test(modal): custom not basic
brandyscarney May 21, 2021
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
57 changes: 37 additions & 20 deletions core/src/components/modal/test/custom/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,35 @@

<head>
<meta charset="UTF-8">
<title>Modal - Basic</title>
<title>Modal - Custom</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet">
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet">
<script src="../../../../../scripts/testing/scripts.js"></script>
<script nomodule src="../../../../../dist/ionic/ionic.js"></script>
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script>
<style>
.custom-modal {
--height: 70%;
--border-style: solid;
--border-width: 7px 0 0 0;
--border-color: #0d51aa;
--border-radius: 20px 20px 0 0;
.custom-modal {
--height: 70%;
--border-style: solid;
--border-width: 7px 0 0 0;
--border-color: #0d51aa;
--border-radius: 20px 20px 0 0;

align-items: flex-end;
}
align-items: flex-end;
}

@media (max-width: 400px) {
.custom-modal {
--max-width: 98%;
--height: 98%;
.custom-modal ion-toolbar {
--padding-top: 46px;
--padding-bottom: 10px;
}

@media (max-width: 400px) {
.custom-modal {
--max-width: 98%;
--height: 98%;
}
}
}
</style>
</head>

Expand All @@ -35,7 +40,7 @@

<ion-header>
<ion-toolbar>
<ion-title>Modal - Basic</ion-title>
<ion-title>Modal - Custom</ion-title>
</ion-toolbar>
</ion-header>

Expand All @@ -55,13 +60,23 @@
element.innerHTML = `
<ion-header>
<ion-toolbar>
<ion-buttons slot="start">
<ion-button>
<ion-icon slot="icon-only" name="add-circle-outline"></ion-icon>
</ion-button>
</ion-buttons>
<ion-title>Super Modal</ion-title>
<ion-buttons slot="end">
<ion-button class="dismiss">
Close
</ion-button>
</ion-buttons>
</ion-toolbar>
</ion-header>
<ion-content>
<h1>Content of doom</h1>
<div>Here's some more content</div>
<ion-button class="dismiss">Dismiss Modal</ion-button>
<ion-button class="dismiss" class="dismiss">Dismiss Modal</ion-button>
</ion-content>
`;

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

// listen for close event
const button = element.querySelector('ion-button');
button.addEventListener('click', () => {
modalElement.dismiss();
});
const buttons = element.querySelectorAll('.dismiss');
for (var button of buttons) {
button.addEventListener('click', () => {
modalElement.dismiss();
});
}
document.body.appendChild(modalElement);
return modalElement;
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/title/title.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

:host {
@include position(0, null, null, 0);
@include padding(0, 90px, 0);
@include padding(var(--padding-top), 90px, var(--padding-bottom));

position: absolute;

Expand Down