javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 03:00:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict solving

Browse Source
This commit is contained in:
rug
2024-09-06 12:42:31 +02:00
parent 0a153ab127
commit 107b61345c
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/components/toggle/toggle.common.scss
View File

@ -131,7 +131,6 @@ input {
// Toggle Align // Toggle Align
// -------------------------------------------------- // --------------------------------------------------
:host(.toggle-alignment-start) .toggle-wrapper { :host(.toggle-alignment-start) .toggle-wrapper {
align-items: start; align-items: start;
} }

7
packages/angular/src/directives/proxies.ts
View File

@ -2155,8 +2155,7 @@ export declare interface IonSplitPane extends Components.IonSplitPane {
@ProxyCmp({ @ProxyCmp({
inputs: ['color', 'mode', 'selectedTab', 'theme', 'translucent'] inputs: ['component', 'mode', 'tab', 'theme'],
inputs: ['component', 'tab'],
methods: ['setActive'] methods: ['setActive']
}) })
@Component({ @Component({
@ -2164,7 +2163,7 @@ export declare interface IonSplitPane extends Components.IonSplitPane {
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
template: '<ng-content></ng-content>', template: '<ng-content></ng-content>',
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property // eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
inputs: ['component', 'tab'], inputs: ['component', 'mode', 'tab', 'theme'],
}) })
export class IonTab { export class IonTab {
protected el: HTMLElement; protected el: HTMLElement;
@ -2179,7 +2178,7 @@ export declare interface IonTab extends Components.IonTab {}
@ProxyCmp({ @ProxyCmp({
inputs: ['color', 'mode', 'selectedTab', 'translucent'] inputs: ['color', 'mode', 'selectedTab', 'theme', 'translucent']
}) })
@Component({ @Component({
selector: 'ion-tab-bar', selector: 'ion-tab-bar',

4
packages/angular/standalone/src/directives/proxies.ts
View File

@ -1947,7 +1947,7 @@ export declare interface IonSplitPane extends Components.IonSplitPane {
@ProxyCmp({ @ProxyCmp({
defineCustomElementFn: defineIonTab, defineCustomElementFn: defineIonTab,
inputs: ['component', 'tab'], inputs: ['component', 'mode', 'tab', 'theme'],
methods: ['setActive'] methods: ['setActive']
}) })
@Component({ @Component({
@ -1955,7 +1955,7 @@ export declare interface IonSplitPane extends Components.IonSplitPane {
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
template: '<ng-content></ng-content>', template: '<ng-content></ng-content>',
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property // eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
inputs: ['component', 'tab'], inputs: ['component', 'mode', 'tab', 'theme'],
standalone: true standalone: true
}) })
export class IonTab { export class IonTab {