mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
chore(): sync with master branch
This commit is contained in:
@@ -63,7 +63,7 @@
|
||||
--ion-color-light-tint: #383a3e;
|
||||
}
|
||||
|
||||
.ios {
|
||||
.ios body {
|
||||
--ion-background-color: #000000;
|
||||
--ion-background-color-rgb: 0,0,0;
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
--ion-toolbar-color: #fff;
|
||||
}
|
||||
|
||||
.md {
|
||||
.md body {
|
||||
--ion-background-color: #121212;
|
||||
--ion-background-color-rgb: 18,18,18;
|
||||
|
||||
@@ -126,4 +126,10 @@
|
||||
--ion-color-step-950: #f3f3f3;
|
||||
|
||||
--ion-item-background: #1a1b1e;
|
||||
}
|
||||
}
|
||||
|
||||
ion-modal.ios {
|
||||
--ion-background-color: var(--ion-color-step-100);
|
||||
--ion-toolbar-background: var(--ion-color-step-150);
|
||||
--ion-toolbar-border-color: var(--ion-color-step-250);
|
||||
}
|
||||
|
||||
@@ -16,11 +16,11 @@
|
||||
--ion-toolbar-color: var(--ion-color-light);
|
||||
}
|
||||
|
||||
.md {
|
||||
.md body {
|
||||
--ion-toolbar-segment-color: rgba(var(--ion-color-light-rgb), .7);
|
||||
--ion-toolbar-segment-color-checked: var(--ion-color-light);
|
||||
}
|
||||
|
||||
.ios {
|
||||
.ios body {
|
||||
--ion-toolbar-segment-color-checked: var(--ion-color-primary);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -921,22 +921,31 @@
|
||||
// create component to open
|
||||
const element = document.createElement('div');
|
||||
element.innerHTML = `
|
||||
<ion-header>
|
||||
<ion-header translucent="true">
|
||||
<ion-toolbar>
|
||||
<ion-title>Super Modal</ion-title>
|
||||
</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-content fullscreen="true">
|
||||
<ion-header collapse="condense">
|
||||
<ion-toolbar>
|
||||
<ion-title size="large">Super Modal</ion-title>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
<div class="ion-padding">
|
||||
<h1>Content of doom</h1>
|
||||
<div>Here's some more content</div>
|
||||
<ion-button class="dismiss">Dismiss Modal</ion-button>
|
||||
</div>
|
||||
</ion-content>
|
||||
`;
|
||||
|
||||
|
||||
// present the modal
|
||||
const modalElement = Object.assign(document.createElement('ion-modal'), {
|
||||
component: element
|
||||
component: element,
|
||||
swipeToClose: true,
|
||||
presentingElement: document.querySelector('ion-tabs')
|
||||
});
|
||||
|
||||
// listen for close event
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { addEventListener, removeEventListener } from '../../helpers';
|
||||
|
||||
const SKIP_SELECTOR = 'input, textarea, [no-blur]';
|
||||
const SKIP_SELECTOR = 'input, textarea, [no-blur], [contenteditable]';
|
||||
|
||||
export const enableInputBlurring = () => {
|
||||
let focused = true;
|
||||
|
||||
Reference in New Issue
Block a user