From 107b61345cf65d0a200d6cd30f1aad0206cd2e14 Mon Sep 17 00:00:00 2001
From: rug <rmfgoncalves@gmail.com>
Date: Fri, 6 Sep 2024 12:42:31 +0200
Subject: [PATCH] merge conflict solving

---
 core/src/components/toggle/toggle.common.scss         | 1 -
 packages/angular/src/directives/proxies.ts            | 7 +++----
 packages/angular/standalone/src/directives/proxies.ts | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/src/components/toggle/toggle.common.scss b/core/src/components/toggle/toggle.common.scss
index 4b5141ece1..e37e9bdb90 100644
--- a/core/src/components/toggle/toggle.common.scss
+++ b/core/src/components/toggle/toggle.common.scss
@@ -131,7 +131,6 @@ input {
 // Toggle Align
 // --------------------------------------------------
 
-
 :host(.toggle-alignment-start) .toggle-wrapper {
   align-items: start;
 }
diff --git a/packages/angular/src/directives/proxies.ts b/packages/angular/src/directives/proxies.ts
index ea2469631b..6f366b0487 100644
--- a/packages/angular/src/directives/proxies.ts
+++ b/packages/angular/src/directives/proxies.ts
@@ -2155,8 +2155,7 @@ export declare interface IonSplitPane extends Components.IonSplitPane {
 
 
 @ProxyCmp({
-  inputs: ['color', 'mode', 'selectedTab', 'theme', 'translucent']
-  inputs: ['component', 'tab'],
+  inputs: ['component', 'mode', 'tab', 'theme'],
   methods: ['setActive']
 })
 @Component({
@@ -2164,7 +2163,7 @@ export declare interface IonSplitPane extends Components.IonSplitPane {
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: '<ng-content></ng-content>',
   // eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
-  inputs: ['component', 'tab'],
+  inputs: ['component', 'mode', 'tab', 'theme'],
 })
 export class IonTab {
   protected el: HTMLElement;
@@ -2179,7 +2178,7 @@ export declare interface IonTab extends Components.IonTab {}
 
 
 @ProxyCmp({
-  inputs: ['color', 'mode', 'selectedTab', 'translucent']
+  inputs: ['color', 'mode', 'selectedTab', 'theme', 'translucent']
 })
 @Component({
   selector: 'ion-tab-bar',
diff --git a/packages/angular/standalone/src/directives/proxies.ts b/packages/angular/standalone/src/directives/proxies.ts
index e08bd76715..d536162838 100644
--- a/packages/angular/standalone/src/directives/proxies.ts
+++ b/packages/angular/standalone/src/directives/proxies.ts
@@ -1947,7 +1947,7 @@ export declare interface IonSplitPane extends Components.IonSplitPane {
 
 @ProxyCmp({
   defineCustomElementFn: defineIonTab,
-  inputs: ['component', 'tab'],
+  inputs: ['component', 'mode', 'tab', 'theme'],
   methods: ['setActive']
 })
 @Component({
@@ -1955,7 +1955,7 @@ export declare interface IonSplitPane extends Components.IonSplitPane {
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: '<ng-content></ng-content>',
   // eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
-  inputs: ['component', 'tab'],
+  inputs: ['component', 'mode', 'tab', 'theme'],
   standalone: true
 })
 export class IonTab {