From 87819891a1f78163531f527908413dab737f849d Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Wed, 6 May 2020 16:30:16 +1000
Subject: [PATCH] Updated Fontawesome to v5

---
 .../adminlte/views/auth/login.blade.php       | 34 ++++++++++++-------
 .../auth/partials/social_login.blade.php      |  4 +--
 .../views/auth/passwords/email.blade.php      |  2 +-
 .../views/auth/passwords/reset.blade.php      |  6 ++--
 .../layouts/partials/htmlheader.blade.php     |  7 ++--
 .../layouts/partials/mainheader.blade.php     | 18 +++++-----
 .../views/layouts/partials/sidebar.blade.php  |  2 +-
 .../layouts/partials/sidebarmenu.blade.php    |  2 +-
 8 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/resources/themes/adminlte/views/auth/login.blade.php b/resources/themes/adminlte/views/auth/login.blade.php
index 747ef65..2149176 100644
--- a/resources/themes/adminlte/views/auth/login.blade.php
+++ b/resources/themes/adminlte/views/auth/login.blade.php
@@ -8,7 +8,7 @@
 	@if(isset($login_note) AND $login_note)
 		<div class="alert alert-info alert-dismissible m-auto">
 			<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-			<h5><i class="icon fa fa-info"></i> NOTE!</h5>
+			<h5><i class="icon fas fa-info"></i> NOTE!</h5>
 			{!! $login_note !!}
 		</div>
 		<br>
@@ -46,18 +46,27 @@
 
 				<form method="post">
 					{{ csrf_field() }}
-					<div class="input-group mb-3">
-						<input type="email" name="email" class="form-control" placeholder="Email">
-						<div class="input-group-append">
-							<span class="fa fa-envelope input-group-text"></span>
-						</div>
-					</div>
-					<div class="input-group mb-3">
-						<input type="password" name="password" class="form-control" placeholder="Password">
-						<div class="input-group-append">
-							<span class="fa fa-lock input-group-text"></span>
+
+					<div class="row">
+						<div class="col-12">
+							<div class="input-group mb-3">
+								<input type="email" name="email" class="form-control" placeholder="Email">
+								<div class="input-group-append">
+									<span class="input-group-text"><i class="fas fa-envelope fa-fw"></i></span>
+								</div>
+							</div>
+						</div>
+
+						<div class="col-12">
+							<div class="input-group mb-3">
+								<input type="password" name="password" class="form-control" placeholder="Password">
+								<div class="input-group-append">
+									<span class="input-group-text"><i class="fas fa-key fa-fw"></i></span>
+								</div>
+							</div>
 						</div>
 					</div>
+
 					<div class="row">
 						<div class="col-8">
 							<div class="checkbox icheck">
@@ -66,9 +75,10 @@
 								</label>
 							</div>
 						</div>
+
 						<!-- /.col -->
 						<div class="col-4">
-							<button type="submit" name="submit" class="btn btn-primary btn-block btn-flat">Sign In</button>
+							<button type="submit" name="submit" class="btn btn-primary mr-0 float-right">Sign In</button>
 						</div>
 						<!-- /.col -->
 					</div>
diff --git a/resources/themes/adminlte/views/auth/partials/social_login.blade.php b/resources/themes/adminlte/views/auth/partials/social_login.blade.php
index 5ce12e7..2d48c51 100644
--- a/resources/themes/adminlte/views/auth/partials/social_login.blade.php
+++ b/resources/themes/adminlte/views/auth/partials/social_login.blade.php
@@ -1,8 +1,8 @@
 <div class="social-auth-links text-center mb-3">
 	<p>- OR -</p>
 	@foreach(config('auth.social') as $o)
-	<a href="{{ url('/auth/'.$o['id']) }}" class="btn btn-block btn-{{ $o['class'] }}">
-		<i class="fa fa-{{ $o['icon'] }} mr-2"></i> {{ trans('adminlte_lang::message.sign'.$o['name']) }}
+	<a href="{{ url('/auth/'.$o['id']) }}" class="btn btn-block {{ $o['class'] }}">
+		<i class="{{ $o['icon'] }} fa-fw mr-2"></i> {{ trans('adminlte_lang::message.sign'.$o['name']) }}
 	</a>
 	@endforeach
 </div>
diff --git a/resources/themes/adminlte/views/auth/passwords/email.blade.php b/resources/themes/adminlte/views/auth/passwords/email.blade.php
index 676b828..75c3876 100644
--- a/resources/themes/adminlte/views/auth/passwords/email.blade.php
+++ b/resources/themes/adminlte/views/auth/passwords/email.blade.php
@@ -39,7 +39,7 @@
 					<div class="input-group mb-3">
 						<input type="email" name="email" class="form-control" placeholder="Email" required>
 						<div class="input-group-append">
-							<span class="fa fa-envelope input-group-text"></span>
+							<span class="fas fa-envelope input-group-text"></span>
 						</div>
 					</div>
 					<div class="row">
diff --git a/resources/themes/adminlte/views/auth/passwords/reset.blade.php b/resources/themes/adminlte/views/auth/passwords/reset.blade.php
index 06d0180..23079d0 100644
--- a/resources/themes/adminlte/views/auth/passwords/reset.blade.php
+++ b/resources/themes/adminlte/views/auth/passwords/reset.blade.php
@@ -31,19 +31,19 @@
 					<div class="input-group mb-3">
 						<input type="email" name="email" class="form-control" placeholder="Email" required>
 						<div class="input-group-append">
-							<span class="fa fa-envelope input-group-text"></span>
+							<span class="fas fa-envelope fa-fw input-group-text"></span>
 						</div>
 					</div>
 					<div class="input-group mb-3">
 						<input type="password" name="password" class="form-control" placeholder="Password" required>
 						<div class="input-group-append">
-							<span class="fa fa-lock input-group-text"></span>
+							<span class="fas fa-lock input-group-text"></span>
 						</div>
 					</div>
 					<div class="input-group mb-3">
 						<input type="password" name="password_confirmation" class="form-control" placeholder="Confirm Password" data-match="#password" required>
 						<div class="input-group-append">
-							<span class="fa fa-lock input-group-text"></span>
+							<span class="fas fa-lock input-group-text"></span>
 						</div>
 					</div>
 					<div class="row">
diff --git a/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php b/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
index 3d64875..1ea2b8c 100644
--- a/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
@@ -9,12 +9,11 @@
 	<link rel="stylesheet" href="{{ asset('/css/app.css') }}">
 
 	<!-- Font Awesome Icons -->
-	<link rel="stylesheet" href="{{ asset('/plugin/font-awesome/css/font-awesome.min.css') }}">
-	<!-- IonIcons -->
-	<link rel="stylesheet" href="{{ request()->getScheme() }}://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
+	<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/all.css') }}">
+	<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/v4-shims.css') }}">
 
 	<!-- Google Font: Source Sans Pro -->
-	<link href="{{ request()->getScheme() }}://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
+	<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@300&display=swap" rel="stylesheet">
 
 	@if(file_exists('css/social.css'))
 		<!-- Social Logins -->
diff --git a/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php b/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
index 2ad4ec1..d85a209 100644
--- a/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
@@ -4,7 +4,7 @@
 	<!-- Left navbar links -->
 	<ul class="navbar-nav">
 		<li class="nav-item">
-			<a class="nav-link" data-widget="pushmenu" href="#"><i class="fa fa-bars"></i></a>
+			<a class="nav-link" data-widget="pushmenu" href="#"><i class="fas fa-bars"></i></a>
 		</li>
 	</ul>
 
@@ -14,10 +14,10 @@
 			<input class="form-control form-control-navbar" name="q" type="search" placeholder="Search" aria-label="Search" autocomplete="off">
 			<div class="input-group-append">
 				<button class="btn btn-navbar" type="submit">
-					<i class="fa fa-search"></i>
+					<i class="fas fa-search"></i>
 				</button>
 			</div>
-			<span name="searching" class="d-none"><i class="fa fa-spinner fa-spin fa-fw" style="margin-top: .33em; width: 1em; height: 1em;"></i></span>
+			<span name="searching" class="d-none"><i class="fas fa-spinner fa-spin fa-fw" style="margin-top: .33em; width: 1em; height: 1em;"></i></span>
 			<div id="search_results"></div>
 		</div>
 	</form>
@@ -30,7 +30,7 @@
 			<!-- Profile Settings -->
 			<li class="nav-item dropdown">
 				<a class="nav-link" data-toggle="dropdown" href="#">
-					<i class="fa fa-cog"></i>
+					<i class="fas fa-cog"></i>
 				</a>
 				<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
 					<span class="dropdown-item dropdown-header @if($user->switched) bg-danger @endif">
@@ -43,30 +43,30 @@
 
 					<div class="dropdown-divider"></div>
 					<a href="{{ url('settings') }}" class="dropdown-item">
-						<i class="fa fa-user mr-2"></i> Settings
+						<i class="fas fa-user mr-2"></i> Settings
 					</a>
 
 					<div class="dropdown-divider"></div>
 					@if ($user->switched)
 						<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item" id="switch">
-							<i class="fa fa-sign-out mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
+							<i class="fas fa-sign-out-alt mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
 						</a>
 					@else
 						<a href="{{ url('logout') }}" class="dropdown-item">
-							<i class="fa fa-sign-out mr-2"></i> Log Out
+							<i class="fas fa-sign-out-alt mr-2"></i> Log Out
 						</a>
 					@endif
 				</div>
 			</li>
 		@else
-			<a href="{{ url()->current().'?login=1' }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
+			<a href="{{ url()->current().'?login=1' }}" class="text-muted pr-2"><i class="fas fa-lock"></i></a>
 		@endif
 
 		<!-- Control Side Bar -->
 		@isset($controlsidebar)
 			<li class="nav-item">
 				<a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#">
-					<i class="fa fa-th-large"></i>
+					<i class="fas fa-th"></i>
 				</a>
 			</li>
 		@endisset
diff --git a/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php b/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php
index 6d17984..ae2f76c 100644
--- a/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php
@@ -14,7 +14,7 @@
 				@if($user->exists)
 					<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
 				@else
-					<a name="login" href="{{ url()->current().'?login=1' }}" class="d-block"><i class="pl-1 fa fa-3x fa-lock"></i></a>
+					<a name="login" href="{{ url()->current().'?login=1' }}" class="d-block"><i class="pl-1 fas fa-lock fa-2x"></i></a>
 				@endif
 			</div>
 
diff --git a/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php b/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php
index 34291d6..a8febed 100644
--- a/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php
@@ -2,7 +2,7 @@
 
 <li class="nav-item">
 	<a href="#" class="nav-link @if(Route::current()->getName() == 'home') active @endif">
-		<i class="nav-icon fa fa-th"></i>
+		<i class="nav-icon fas fa-th"></i>
 		<p>
 			My Link Title
 			<span class="right badge badge-danger">New</span>