From bdd9d02fdc6056adab528d97e9ee28a018d01eae Mon Sep 17 00:00:00 2001
From: alekseybobkov <aleksey.bobkov@gmail.com>
Date: Mon, 28 Jul 2014 16:41:08 +1100
Subject: [PATCH] Minor fixes in the main menu

---
 modules/backend/assets/css/october.css           | 5 +++++
 modules/backend/assets/js/october.dragscroll.js  | 4 +++-
 modules/backend/assets/js/october.layout.js      | 1 +
 modules/backend/assets/js/october.navbar.js      | 6 ++++++
 modules/backend/assets/less/layout/mainmenu.less | 6 ++++++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index 3e0d7d4a4..21e367c8e 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -7820,6 +7820,11 @@ nav#layout-mainmenu .menu-toggle i,
   vertical-align: middle;
   margin-right: 10px;
 }
+.mainmenu-collapsed li a i {
+  width: 40px;
+  text-align: left;
+  display: inline-block;
+}
 nav#layout-mainmenu.navbar ul li:hover a:active,
 .mainmenu-collapsed li:hover a:active,
 nav#layout-mainmenu.navbar ul li:hover a:focus,
diff --git a/modules/backend/assets/js/october.dragscroll.js b/modules/backend/assets/js/october.dragscroll.js
index 745fcdbe9..38af4b4a2 100644
--- a/modules/backend/assets/js/october.dragscroll.js
+++ b/modules/backend/assets/js/october.dragscroll.js
@@ -268,7 +268,7 @@
             return (activeElement.get(0).offsetTop + activeElement.height()) < this.el.scrollTop()
     }
 
-    DragScroll.prototype.goToElement = function(element, callback) {
+    DragScroll.prototype.goToElement = function(element, callback, options) {
         var $el = $(element)
         if (!$el.length)
             return;
@@ -284,6 +284,8 @@
             }
         }
 
+        params = $.extend(params, options || {})
+
         var offset = 0,
             animated = false
 
diff --git a/modules/backend/assets/js/october.layout.js b/modules/backend/assets/js/october.layout.js
index a9c992c47..f243ef1fc 100644
--- a/modules/backend/assets/js/october.layout.js
+++ b/modules/backend/assets/js/october.layout.js
@@ -21,6 +21,7 @@
                 }
 
                 $(this).width($el.get(0).offsetWidth + margin)
+                $(this).trigger('oc.widthFixed')
             }
         })
     }
diff --git a/modules/backend/assets/js/october.navbar.js b/modules/backend/assets/js/october.navbar.js
index eb54b4207..71c9c7b41 100644
--- a/modules/backend/assets/js/october.navbar.js
+++ b/modules/backend/assets/js/october.navbar.js
@@ -21,6 +21,12 @@
             $('[data-toggle="tooltip"]', navbar).tooltip({
                 'container': 'body'
             })
+
+            $('.layout-cell.width-fix', navbar).one('oc.widthFixed', function(){
+                var dragScroll = $('[data-control=toolbar]', navbar).data('oc.dragScroll')
+                if (dragScroll)
+                    dragScroll.goToElement($('ul.nav > li.active', navbar), undefined, {'duration': 0})
+            })
         })
     })
 })(jQuery);
\ No newline at end of file
diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less
index ba16611c7..a09d2eb16 100644
--- a/modules/backend/assets/less/layout/mainmenu.less
+++ b/modules/backend/assets/less/layout/mainmenu.less
@@ -113,6 +113,12 @@ nav#layout-mainmenu .menu-toggle,
     }
 }
 
+.mainmenu-collapsed li a i {
+    width: 40px;
+    text-align: left;
+    display: inline-block;
+}
+
 nav#layout-mainmenu.navbar ul li:hover,
 .mainmenu-collapsed li:hover {
     a {