Merge branch 'iprsv2_brian' into 'master'

Coat of arms on Advanced form moved to left side and sidebar logo altered

See merge request !5

config/adminlte.php

@@ -73,12 +73,12 @@ return [
 
     'logo' => '<b>IPRS</b>',
     'logo_img' => 'images/coat-of-arms.png',
-    'logo_img_class' => 'brand-image img-circle elevation-3',
+    'logo_img_class' => 'brand-image',
     'logo_img_xl' => null,
     'logo_img_xl_class' => 'brand-image-xs',
     'logo_img_alt' => 'IPRS Logo',
-    'logo-img-width' => 20,
-    'logo-img-height' => 20,
+    'logo-img-width' => 35,
+    'logo-img-height' => 35,
 
     /*
     |--------------------------------------------------------------------------

resources/views/livewire/search/advance/birth.blade.php

 <div>
+    <div style="display: flex; justify-content: start; align-items: center; gap: 40px;">
 
-    <div style="display: flex; justify-content: center; align-items: center; flex-direction: column; margin-bottom: 20px;">
-        <img src="{{ asset('images/coat-of-arms.webp') }}"
+        <div style="display: flex; flex: 0 0 auto; align-items: center; flex-direction: column;">
+            <img src="{{ asset('images/coat-of-arms.png') }}"
                 alt="IPRS Logo" class="brand-image" style=" width: 8em;">
             <h3 style="margin-top: 20px;">IPRS</h3>
         </div>
 
+        <div style="flex: 1;">
             <form class="form-inline" wire:submit="search" method="POST">
                 @csrf
                 @method('POST')
@@ -38,4 +40,6 @@
 
                 </div>
             </form>
+        </div>
+    </div>
 </div>
\ No newline at end of file

resources/views/livewire/search/advance/death.blade.php

 <div>
     
-    <div style="display: flex; justify-content: center; align-items: center; flex-direction: column; margin-bottom: 20px;">
-        <img src="{{ asset('images/coat-of-arms.webp') }}"
+    <div style="display: flex; justify-content: start; align-items: center; gap: 40px;">
+
+        <div style="display: flex; flex: 0 0 auto; align-items: center; flex-direction: column;">
+            <img src="{{ asset('images/coat-of-arms.png') }}"
                 alt="IPRS Logo" class="brand-image" style=" width: 8em;">
             <h3 style="margin-top: 20px;">IPRS</h3>
         </div>
 
+        <div style="flex: 1;">
             <form class="form-inline" wire:submit="search" method="POST">
                 @csrf
                 @method('POST')
@@ -38,4 +41,6 @@
 
                 </div>
             </form>
+        </div>
+    </div>      
 </div>
\ No newline at end of file

resources/views/livewire/search/advance/idsearch.blade.php

 <div>
+    <div style="display: flex; justify-content: start; align-items: center; gap: 40px;">
 
-    <div style="display: flex; justify-content: center; align-items: center; flex-direction: column; margin-bottom: 20px;">
-        <img src="{{ asset('images/coat-of-arms.webp') }}"
+        <div style="display: flex; flex: 0 0 auto; align-items: center; flex-direction: column;">
+            <img src="{{ asset('images/coat-of-arms.png') }}"
                 alt="IPRS Logo" class="brand-image" style=" width: 8em;">
             <h3 style="margin-top: 20px;">IPRS</h3>
         </div>
 
+        <div style="flex: 1;">
             <form class="form-inline" wire:submit="search" method="POST">
                 @csrf
                 @method('POST')
@@ -88,4 +90,6 @@
                 </div>
 
             </form>
+        </div>
+    </div>
 </div>

resources/views/livewire/search/advance/passport.blade.php

 <div>
     
-    <div style="display: flex; justify-content: center; align-items: center; flex-direction: column; margin-bottom: 20px;">
-        <img src="{{ asset('images/coat-of-arms.webp') }}"
+    <div style="display: flex; justify-content: start; align-items: center; gap: 40px;">
+
+        <div style="display: flex; flex: 0 0 auto; align-items: center; flex-direction: column;">
+            <img src="{{ asset('images/coat-of-arms.png') }}"
                 alt="IPRS Logo" class="brand-image" style=" width: 8em;">
             <h3 style="margin-top: 20px;">IPRS</h3>
         </div>
 
+        <div style="flex: 1;">
+
             <form class="form-inline" wire:submit="search" method="POST">
                 @csrf
                 @method('POST')
@@ -46,4 +50,6 @@
 
                 </div>
             </form>
+        </div>
+    </div>
 </div>
\ No newline at end of file

resources/views/livewire/search/advance/refugee.blade.php

 <div>
     
-    <div style="display: flex; justify-content: center; align-items: center; flex-direction: column; margin-bottom: 20px;">
-        <img src="{{ asset('images/coat-of-arms.webp') }}"
+    <div style="display: flex; justify-content: start; align-items: center; gap: 40px;">
+
+        <div style="display: flex; flex: 0 0 auto; align-items: center; flex-direction: column;">
+            <img src="{{ asset('images/coat-of-arms.png') }}"
                 alt="IPRS Logo" class="brand-image" style=" width: 8em;">
             <h3 style="margin-top: 20px;">IPRS</h3>
         </div>
 
+        <div style="flex: 1;">
+
             <form class="form-inline" wire:submit="search" method="POST">
                 @csrf
                 @method('POST')
@@ -46,4 +50,6 @@
 
                 </div>
             </form>
+        </div>
+    </div>
 </div>
\ No newline at end of file

resources/views/vendor/adminlte/partials/common/brand-logo-xs.blade.php

@@ -8,7 +8,7 @@
     @php( $dashboard_url = $dashboard_url ? url($dashboard_url) : '' )
 @endif
 
-<a href="{{ $dashboard_url }}" style="margin-left: 10px;"
+<a href="{{ $dashboard_url }}"
     @if($layoutHelper->isLayoutTopnavEnabled())
         class="navbar-brand {{ config('adminlte.classes_brand') }}"
     @else
@@ -18,13 +18,11 @@
     {{-- Small brand logo --}}
     <img src="{{ asset(config('adminlte.logo_img', 'vendor/adminlte/dist/img/AdminLTELogo.png')) }}"
          alt="{{ config('adminlte.logo_img_alt', 'AdminLTE') }}"
-         class="{{ config('adminlte.logo_img_class', 'brand-image img-circle elevation-3') }}"
-         style="width: 35px; height: 35px;">
+         class="{{ config('adminlte.logo_img_class', 'brand-image') }}">
 
     {{-- Brand text --}}
     <span class="brand-text font-weight-light {{ config('adminlte.classes_brand_text') }}" > &nbsp;|&nbsp;
-        <!-- {!! config('adminlte.logo', '<b>Admin</b>LTE') !!} -->
-        <b>IPRS</b>
+        {!! config('adminlte.logo') !!}
     </span>
 
 </a>