From 9e19d4d2c938b936727fc726eade0fb050ce5f45 Mon Sep 17 00:00:00 2001 From: Micheal Mand Date: Tue, 11 Dec 2018 21:27:31 -0700 Subject: [PATCH 1/4] Upgrade to Font Awesome v5 Signed-off-by: Micheal Mand --- Themes/Adminlte/views/partials/top-nav.blade.php | 4 +--- config/asgard/core/core.php | 8 ++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Themes/Adminlte/views/partials/top-nav.blade.php b/Themes/Adminlte/views/partials/top-nav.blade.php index 703d33f11..a712d2480 100644 --- a/Themes/Adminlte/views/partials/top-nav.blade.php +++ b/Themes/Adminlte/views/partials/top-nav.blade.php @@ -3,9 +3,7 @@ Toggle navigation - - - +
diff --git a/config/asgard/core/core.php b/config/asgard/core/core.php index d7951a166..5afbdf80d 100644 --- a/config/asgard/core/core.php +++ b/config/asgard/core/core.php @@ -82,7 +82,7 @@ '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'], + // '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 +100,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.6.0/js/all.js'], + 'font-awesome-v4-shims.js' => ['cdn' => 'https://use.fontawesome.com/releases/v5.6.0/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 +138,7 @@ 'admin-required-assets' => [ 'css' => [ 'bootstrap.css', - 'font-awesome.css', + // 'font-awesome.css', 'dataTables.bootstrap.css', 'icheck.blue.css', 'AdminLTE.css', @@ -148,6 +150,8 @@ ], 'js' => [ 'bootstrap.js', + 'font-awesome.js', + 'font-awesome-v4-shims.js', 'mousetrap.js', 'icheck.js', 'jquery.dataTables.js', From a0bebdec96c4301227e88fcbda96faa41312e3c4 Mon Sep 17 00:00:00 2001 From: Micheal Mand Date: Mon, 3 Dec 2018 15:29:11 -0700 Subject: [PATCH 2/4] Fix sidebar dropdown icon positioning for Font Awesome 5 Signed-off-by: Micheal Mand --- Themes/Adminlte/assets/vendor/admin-lte/dist/css/AdminLTE.css | 2 -- public/themes/adminlte/vendor/admin-lte/dist/css/AdminLTE.css | 2 -- 2 files changed, 4 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 index 04717ce32..98b7644fd 100644 --- 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/public/themes/adminlte/vendor/admin-lte/dist/css/AdminLTE.css b/public/themes/adminlte/vendor/admin-lte/dist/css/AdminLTE.css index 04717ce32..98b7644fd 100644 --- 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; From b1e1819ec820db384e31ec092b4e2243c4b0a67c Mon Sep 17 00:00:00 2001 From: Micheal Mand Date: Thu, 13 Dec 2018 10:11:35 -0700 Subject: [PATCH 3/4] Remove commented reference to Font Awesome 4 Signed-off-by: Micheal Mand --- config/asgard/core/core.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/asgard/core/core.php b/config/asgard/core/core.php index 5afbdf80d..0a29aa5ed 100644 --- 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'], @@ -138,7 +137,6 @@ 'admin-required-assets' => [ 'css' => [ 'bootstrap.css', - // 'font-awesome.css', 'dataTables.bootstrap.css', 'icheck.blue.css', 'AdminLTE.css', From 82513bef42580a4732689194c2b3c25ceac60b82 Mon Sep 17 00:00:00 2001 From: Micheal Mand Date: Tue, 5 Feb 2019 12:39:26 -0700 Subject: [PATCH 4/4] Update Font Awesome version Signed-off-by: Micheal Mand --- config/asgard/core/core.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/asgard/core/core.php b/config/asgard/core/core.php index 0a29aa5ed..2f6b0e201 100644 --- a/config/asgard/core/core.php +++ b/config/asgard/core/core.php @@ -99,8 +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.6.0/js/all.js'], - 'font-awesome-v4-shims.js' => ['cdn' => 'https://use.fontawesome.com/releases/v5.6.0/js/v4-shims.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'],