Merge pull request #42 from TheExtensionLab/dev

Dev
TheExtensionLab · Apr 22, 2016 · 439b34f · 439b34f
2 parents 824518e + 9032b50
commit 439b34f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/...ty/TheExtensionLab/MegaMenu/Block/Adminhtml/Catalog/Category/Widget/Draggable/Chooser.php b/...ty/TheExtensionLab/MegaMenu/Block/Adminhtml/Catalog/Category/Widget/Draggable/Chooser.php
@@ -82,6 +82,7 @@ public function getEmptyTreeJson($parenNodeCategory = null)
         $rootArray['use_ajax'] = false;
 
         $rootArray['children']['0']['text'] = $this->__("Drag your categories here");
+        $rootArray['children']['0']['id'] = 2;
         $json = Mage::helper('core')->jsonEncode(
             isset($rootArray['children'])
                 ? $rootArray['children'] : array()

diff --git a/app/code/community/TheExtensionLab/MegaMenu/etc/config.xml b/app/code/community/TheExtensionLab/MegaMenu/etc/config.xml
@@ -9,7 +9,7 @@
 <config>
     <modules>
         <TheExtensionLab_MegaMenu>
-            <version>1.5.3</version>
+            <version>1.5.4</version>
         </TheExtensionLab_MegaMenu>
     </modules>
 

diff --git a/skin/frontend/base/default/css/theextensionlab/megamenu/main.css b/skin/frontend/base/default/css/theextensionlab/megamenu/main.css
@@ -39,14 +39,16 @@
   display: block;
 }
 .megamenu-nav-primary a, .megamenu-nav-primary span.level0 {
-  line-height: 30px;
   color: #636363;
   display: block;
 }
 .megamenu-nav-primary a:hover, .megamenu-nav-primary span.level0:hover {
   color: #3399cc;
   text-decoration: none;
 }
+.megamenu-nav-primary a, .megamenu-nav-primary span.level0, .megamenu-nav-primary .section-title span {
+  line-height: 30px;
+}
 .megamenu-nav-primary li:hover > a {
   color: #3399cc;
   text-decoration: none;

diff --git a/skin/frontend/base/default/scss/theextensionlab/megamenu/main.scss b/skin/frontend/base/default/scss/theextensionlab/megamenu/main.scss
@@ -53,7 +53,6 @@ $dropdwon-external-border-color: #e8eaeb;
   }
 
   a,span.level0 {
-    line-height:30px;
     color: #636363;
     display:block;
     &:hover{
@@ -62,6 +61,10 @@ $dropdwon-external-border-color: #e8eaeb;
     }
   }
 
+  a,span.level0,.section-title span{
+    line-height:30px;
+  }
+
   li{
     &:hover{
       > a{