mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-21 04:53:58 +08:00
@ -35,8 +35,6 @@
|
||||
contain: layout size style;
|
||||
}
|
||||
|
||||
|
||||
|
||||
:host(.scroll-disabled),
|
||||
ion-scroll {
|
||||
@include padding(
|
||||
@ -51,3 +49,9 @@ ion-scroll {
|
||||
:host(.outer-content) {
|
||||
--ion-color-base: #{$background-color-step-50};
|
||||
}
|
||||
|
||||
:host(.content-size) ion-scroll {
|
||||
position: relative;
|
||||
|
||||
contain: none;
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { Component, Element, Listen, Method, Prop, QueueApi } from '@stencil/core';
|
||||
|
||||
import { Color, Config, Mode } from '../../interface';
|
||||
import { createColorClasses } from '../../utils/theme';
|
||||
import { createColorClasses, hostContext } from '../../utils/theme';
|
||||
|
||||
@Component({
|
||||
tag: 'ion-content',
|
||||
@ -93,6 +93,7 @@ export class Content {
|
||||
return {
|
||||
class: {
|
||||
...createColorClasses(this.color),
|
||||
'content-size': hostContext('ion-popover', this.el),
|
||||
'scroll-disabled': !this.scrollEnabled,
|
||||
}
|
||||
};
|
||||
|
@ -12,6 +12,8 @@
|
||||
overflow-y: auto;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
will-change: scroll-position;
|
||||
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
:host(.overscroll)::before,
|
||||
|
@ -47,7 +47,7 @@ export function iosTransitionAnimation(AnimationC: Animation, navEl: HTMLElement
|
||||
const enteringContent = new AnimationC();
|
||||
|
||||
if (!contentEl && !enteringToolBarEle && headerEls.length === 0) {
|
||||
enteringContent.addElement(enteringEl.querySelector(':scope > ion-page, :scope > ion-nav, :scope > ion-tabs'));
|
||||
enteringContent.addElement(enteringEl.querySelector(':scope > .ion-page, :scope > ion-nav, :scope > ion-tabs'));
|
||||
} else {
|
||||
enteringContent.addElement(contentEl);
|
||||
enteringContent.addElement(headerEls);
|
||||
|
Reference in New Issue
Block a user