Merge pull request #662 from mikemand/feature/upgrade-to-font-awesome-5

Upgrade to Font Awesome 5
AsgardCms · Feb 6, 2019 · 1c4f412 · 1c4f412
2 parents 9c2b374 + 82513be
commit 1c4f412
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/Themes/Adminlte/assets/vendor/admin-lte/dist/css/AdminLTE.css b/Themes/Adminlte/assets/vendor/admin-lte/dist/css/AdminLTE.css
@@ -545,9 +545,7 @@ a:focus {
 .sidebar-menu li > a > .fa-angle-left,
 .sidebar-menu li > a > .pull-right-container > .fa-angle-left {
   width: auto;
-  height: auto;
   padding: 0;
-  margin-right: 10px;
   -webkit-transition: transform 0.5s ease;
   -o-transition: transform 0.5s ease;
   transition: transform 0.5s ease;

diff --git a/Themes/Adminlte/views/partials/top-nav.blade.php b/Themes/Adminlte/views/partials/top-nav.blade.php
@@ -3,9 +3,7 @@
     <!-- Sidebar toggle button-->
     <a href="#" class="navbar-btn sidebar-toggle" data-toggle="push-menu" role="button" style="margin: 0;">
         <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
+        <i class="fa fa-bars" title="Toggle navigation"></i>
     </a>
 
     <div class="navbar-custom-menu">

diff --git a/config/asgard/core/core.php b/config/asgard/core/core.php
@@ -82,7 +82,6 @@
     'admin-assets' => [
         // Css
         'bootstrap.css' => ['theme' => 'vendor/bootstrap/dist/css/bootstrap.min.css'],
-        'font-awesome.css' => ['cdn' => 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css'],
         'alertify.core.css' => ['theme' => 'css/vendor/alertify/alertify.core.css'],
         'alertify.default.css' => ['theme' => 'css/vendor/alertify/alertify.default.css'],
         'dataTables.bootstrap.css' => ['theme' => 'vendor/datatables.net-bs/css/dataTables.bootstrap.min.css'],
@@ -100,6 +99,8 @@
         'simplemde.css' => ['theme' => 'vendor/simplemde/dist/simplemde.min.css'],
         // Javascript
         'bootstrap.js' => ['theme' => 'vendor/bootstrap/dist/js/bootstrap.min.js'],
+        'font-awesome.js' => ['cdn' => 'https://use.fontawesome.com/releases/v5.7.1/js/all.js'],
+        'font-awesome-v4-shims.js' => ['cdn' => 'https://use.fontawesome.com/releases/v5.7.1/js/v4-shims.js'],
         'mousetrap.js' => ['theme' => 'js/vendor/mousetrap.min.js'],
         'alertify.js' => ['theme' => 'js/vendor/alertify/alertify.js'],
         'icheck.js' => ['theme' => 'vendor/iCheck/icheck.min.js'],
@@ -136,7 +137,6 @@
     'admin-required-assets' => [
         'css' => [
             'bootstrap.css',
-            'font-awesome.css',
             'dataTables.bootstrap.css',
             'icheck.blue.css',
             'AdminLTE.css',
@@ -148,6 +148,8 @@
         ],
         'js' => [
             'bootstrap.js',
+            'font-awesome.js',
+            'font-awesome-v4-shims.js',
             'mousetrap.js',
             'icheck.js',
             'jquery.dataTables.js',

diff --git a/public/themes/adminlte/vendor/admin-lte/dist/css/AdminLTE.css b/public/themes/adminlte/vendor/admin-lte/dist/css/AdminLTE.css
@@ -545,9 +545,7 @@ a:focus {
 .sidebar-menu li > a > .fa-angle-left,
 .sidebar-menu li > a > .pull-right-container > .fa-angle-left {
   width: auto;
-  height: auto;
   padding: 0;
-  margin-right: 10px;
   -webkit-transition: transform 0.5s ease;
   -o-transition: transform 0.5s ease;
   transition: transform 0.5s ease;