From b37641e94d4349e6015cdda508eade14b4a882dd Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 21 Sep 2019 13:12:49 +1000
Subject: [PATCH] Lazyload top navigation icons - refs #4562

---
 modules/backend/assets/css/october.css           | 2 +-
 modules/backend/assets/less/layout/mainmenu.less | 1 +
 modules/backend/layouts/_mainmenu.htm            | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index 29ead2b35..fb572f7c5 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -685,7 +685,7 @@ nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview a {position:relative
 nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account {margin-right:0}
 nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account >a {padding:0 15px 0 10px;font-size:13px;position:relative}
 nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account.highlight >a {z-index:600}
-nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account img.account-avatar {width:45px}
+nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account img.account-avatar {width:45px;height:45px}
 nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account .account-name {margin-right:15px}
 nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account ul {line-height:23px}
 html.svg nav#layout-mainmenu img.svg-icon,
diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less
index 27b125c35..a1af75cc9 100644
--- a/modules/backend/assets/less/layout/mainmenu.less
+++ b/modules/backend/assets/less/layout/mainmenu.less
@@ -214,6 +214,7 @@ nav#layout-mainmenu {
 
             img.account-avatar {
                 width: 45px;
+                height: 45px;
             }
 
             .account-name {
diff --git a/modules/backend/layouts/_mainmenu.htm b/modules/backend/layouts/_mainmenu.htm
index 3b934f2b3..bdcae757f 100644
--- a/modules/backend/layouts/_mainmenu.htm
+++ b/modules/backend/layouts/_mainmenu.htm
@@ -24,7 +24,9 @@
                         <a href="<?= $item->url ?>">
                             <span class="nav-icon">
                                 <?php if ($item->iconSvg): ?>
-                                    <img class="svg-icon" src="<?= Url::asset($item->iconSvg) ?>">
+                                    <img
+                                        src="<?= Url::asset($item->iconSvg) ?>"
+                                        class="svg-icon" loading="lazy" width="30" height="30" />
                                 <?php endif ?>
 
                                 <i class="<?= $item->iconSvg ? 'svg-replace' : null ?> <?= $item->icon ?>"></i>
@@ -60,7 +62,9 @@
                 <a
                     href="javascript:;" onclick="$.oc.layout.toggleAccountMenu(this)"
                     title="<?= e(trans('backend::lang.account.signed_in_as', ['full_name' => $this->user->full_name])) ?>">
-                    <img src="<?= $this->user->getAvatarThumb(90, ['mode' => 'crop', 'extension' => 'png']) ?>" class="account-avatar" />
+                    <img
+                        src="<?= $this->user->getAvatarThumb(90, ['mode' => 'crop', 'extension' => 'png']) ?>"
+                        class="account-avatar" loading="lazy" width="90" height="90" />
                 </a>
                 <div class="mainmenu-accountmenu">
                     <ul>