From 5419129bdb0138676ed95fe5fa8d4654e504c721 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sat, 30 Dec 2023 00:20:35 -0800
Subject: [PATCH] Fix switch component merge conflict

---
 .../admin/config/config.component.html        |  2 +-
 .../common/input/switch/switch.component.html | 34 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src-ui/src/app/components/admin/config/config.component.html b/src-ui/src/app/components/admin/config/config.component.html
index 48cac6bfa..a3eb0b8ab 100644
--- a/src-ui/src/app/components/admin/config/config.component.html
+++ b/src-ui/src/app/components/admin/config/config.component.html
@@ -27,7 +27,7 @@
                                                 @switch (option.type) {
                                                     @case (ConfigOptionType.Select) { <pngx-input-select [formControlName]="option.key" [error]="errors[option.key]" [items]="option.choices" [allowNull]="true"></pngx-input-select> }
                                                     @case (ConfigOptionType.Number) { <pngx-input-number [formControlName]="option.key" [error]="errors[option.key]" [showAdd]="false"></pngx-input-number> }
-                                                    @case (ConfigOptionType.Boolean) { <pngx-input-switch [formControlName]="option.key" [error]="errors[option.key]" title="Enable" i18n-title></pngx-input-switch> }
+                                                    @case (ConfigOptionType.Boolean) { <pngx-input-switch [formControlName]="option.key" [error]="errors[option.key]" [horizontal]="true" title="Enable" i18n-title></pngx-input-switch> }
                                                     @case (ConfigOptionType.String) { <pngx-input-text [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-text> }
                                                     @case (ConfigOptionType.JSON) { <pngx-input-text [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-text> }
                                                 }
diff --git a/src-ui/src/app/components/common/input/switch/switch.component.html b/src-ui/src/app/components/common/input/switch/switch.component.html
index f81548425..189aa937f 100644
--- a/src-ui/src/app/components/common/input/switch/switch.component.html
+++ b/src-ui/src/app/components/common/input/switch/switch.component.html
@@ -1,27 +1,27 @@
 <div class="mb-3">
   <div class="row">
-    <div class="d-flex align-items-center position-relative hidden-button-container col-md-3">
-        @if (!horizontal) {
-          <label class="form-label" [for]="inputId">{{title}}</label>
-        }
+    @if (!horizontal) {
+      <div class="d-flex align-items-center position-relative hidden-button-container col-md-3">
+        <label class="form-label" [for]="inputId">{{title}}</label>
         @if (removable) {
           <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
             <svg class="sidebaricon" fill="currentColor">
               <use xlink:href="assets/bootstrap-icons.svg#x"/>
-              </svg>&nbsp;<ng-container i18n>Remove</ng-container>
-            </button>
-          }
+            </svg>&nbsp;<ng-container i18n>Remove</ng-container>
+          </button>
+        }
       </div>
-      <div [ngClass]="{'col-md-9': horizontal, 'align-items-center': horizontal, 'd-flex': horizontal}">
-        <div class="form-check form-switch">
-          <input #inputField type="checkbox" class="form-check-input" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)" (blur)="onTouched()" [disabled]="disabled">
-          @if (horizontal) {
-            <label class="form-check-label" [for]="inputId">{{title}}</label>
-          }
-          @if (hint) {
-            <div class="form-text text-muted">{{hint}}</div>
-          }
-        </div>
+    }
+    <div [ngClass]="{'col-md-9': horizontal, 'align-items-center': horizontal, 'd-flex': horizontal}">
+      <div class="form-check form-switch">
+        <input #inputField type="checkbox" class="form-check-input" [id]="inputId" [(ngModel)]="value" (change)="onChange(value)" (blur)="onTouched()" [disabled]="disabled">
+        @if (horizontal) {
+          <label class="form-check-label" [for]="inputId">{{title}}</label>
+        }
+        @if (hint) {
+          <div class="form-text text-muted">{{hint}}</div>
+        }
       </div>
     </div>
   </div>
+</div>