Merge pull request #29 from dotkernel/develop

Develop
dotkernel · Jun 1, 2017 · bb1597b · bb1597b
2 parents 6ffe0db + a7b9215
commit bb1597b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 0.4.1 - 2017-06-01
+
+### Changed
+* Nothing
+
+### Added
+* Nothing
+
+### Deprecated
+* Nothing
+
+### Removed
+* Nothing
+
+### Fixed
+* admin side menu glitches described in issue [#24](https://github.com/dotkernel/admin/issues/24)
+
+
 ## 0.4.0 - 2017-05-27
 
 ### Changed

diff --git a/public/js/admin.js b/public/js/admin.js
@@ -26,8 +26,9 @@ $(document).ready(function() {
     });
 
     // on small devices click on menu item will not open the left sidebar
-    $(".sideRightIn i, .sideRightIn .submenu").click(function (e) {
+    $(".sideRightIn .submenu").click(function (e) {
         e.preventDefault();
+
         if ($(window).width() > 767) {
             $(".main-content").addClass("toggled");
             $("#sidebar-collapse").addClass("sideRightOut").removeClass("sideRightIn");

diff --git a/src/App/templates/partial/menu.html.twig b/src/App/templates/partial/menu.html.twig
@@ -31,13 +31,13 @@
                         {% endif %}
                     {% else %}
                         {% if depth == 0 %}
-                            <i class="{{ page.getOption('icon') }} master-tooltip" title="{{ page.getOption('label') }}"></i>
                             <a class="master-tooltip clearfix" href="{{ navigation.getHref(page) }}" {% autoescape false %}{{ pageAttributes(page) ~ extraAttributes }}{% endautoescape %} title="{{ page.getOption('label') }}">
+                                <i class="{{ page.getOption('icon') }} master-tooltip" title="{{ page.getOption('label') }}"></i>
                                 <div class="item-label">{{ page.getOption('label') }}</div>
                             </a>
                         {% else %}
-                            <i class="{{ page.getOption('icon') }}"></i>
                             <a class="clearfix" href="{{ navigation.getHref(page) }}" {% autoescape false %}{{ pageAttributes(page) ~ extraAttributes }}{% endautoescape %} >
+                                <i class="{{ page.getOption('icon') }}"></i>
                                 {{ page.getOption('label') }}
                             </a>
                         {% endif %}