From 31f39de4ea22526a671c004bd7f48dc372e5962b Mon Sep 17 00:00:00 2001
From: bcanini <canini.16@osu.edu>
Date: Tue, 2 Apr 2019 12:35:41 -0400
Subject: [PATCH] asc_bootstrap - reconfiguring sidebar menu dropdown behavior

---
 .../assets/sass/components/_sidebar-menu.scss |  9 +++++++++
 web/themes/asc_bootstrap/css/style.css        | 20 +++++++++++++------
 web/themes/asc_bootstrap/js/scripts.js        | 11 +++++-----
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss b/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss
index 92fd044c40..825ef9bb26 100644
--- a/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss
+++ b/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss
@@ -89,6 +89,15 @@
       display: inherit;
     }
 
+    .active-link-li {
+      ul {
+          display: block;
+
+          ul {
+            display: none;
+          }
+        }
+    }
 
     i {
       float: right;
diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css
index 79eb6b1673..ebff4c1bd4 100644
--- a/web/themes/asc_bootstrap/css/style.css
+++ b/web/themes/asc_bootstrap/css/style.css
@@ -11782,37 +11782,45 @@ body {
   display: inherit;
 }
 /* line 93, ../assets/sass/components/_sidebar-menu.scss */
+#block-mainnavigation-2 .navbar-nav .active-link-li ul {
+  display: block;
+}
+/* line 96, ../assets/sass/components/_sidebar-menu.scss */
+#block-mainnavigation-2 .navbar-nav .active-link-li ul ul {
+  display: none;
+}
+/* line 102, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .navbar-nav i {
   float: right;
   padding: 2px 10px;
   cursor: pointer;
 }
-/* line 99, ../assets/sass/components/_sidebar-menu.scss */
+/* line 108, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .navbar-nav:nth-last-child(1) {
   border-bottom: 1px #979797 dotted;
   border-top: none;
 }
-/* line 106, ../assets/sass/components/_sidebar-menu.scss */
+/* line 115, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .nav > li > a:hover, #block-mainnavigation-2 .nav > li > a:focus {
   background-color: transparent;
 }
-/* line 110, ../assets/sass/components/_sidebar-menu.scss */
+/* line 119, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .active-link {
   background-color: #ffffff;
   border-left: solid #D0021B 3px;
   padding-left: 5px;
 }
-/* line 118, ../assets/sass/components/_sidebar-menu.scss */
+/* line 127, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 .link-wrapper:hover {
   background-color: #ffffff;
 }
-/* line 123, ../assets/sass/components/_sidebar-menu.scss */
+/* line 132, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 h2.active-link {
   background-color: transparent;
   border-left: none;
   padding-left: 0;
 }
-/* line 131, ../assets/sass/components/_sidebar-menu.scss */
+/* line 140, ../assets/sass/components/_sidebar-menu.scss */
 #block-mainnavigation-2 h2 a {
   color: #000000;
 }
diff --git a/web/themes/asc_bootstrap/js/scripts.js b/web/themes/asc_bootstrap/js/scripts.js
index 29f1176890..7d2461288a 100644
--- a/web/themes/asc_bootstrap/js/scripts.js
+++ b/web/themes/asc_bootstrap/js/scripts.js
@@ -104,21 +104,22 @@ jQuery(document).ready(function(){
 
   //sidebar arrows
   if (jQuery(".sidebar-nav .active-trail").length) {
-    jQuery(".sidebar-nav .active-trail").find("i").removeClass('fa-angle-right').addClass( 'fa-angle-down' );
+    jQuery(".sidebar-nav .active-trail").find("i:first").removeClass('fa-angle-right').addClass( 'fa-angle-down' );
   }
 
   jQuery(".sidebar-nav li").click(function(e){
     e.stopPropagation();
-    if ( jQuery(this).find("ul").css('display') == 'none' ) {
-      jQuery(this).find("i").removeClass('fa-angle-right').addClass( 'fa-angle-down' );
+    if ( jQuery(this).find("ul:first").css('display') == 'none' ) {
+      jQuery(this).find("i:first").removeClass('fa-angle-right').addClass( 'fa-angle-down' );
     } else {
-      jQuery(this).find("i").removeClass( 'fa-angle-down' ).addClass( 'fa-angle-right' );
+      jQuery(this).find("i:first").removeClass( 'fa-angle-down' ).addClass( 'fa-angle-right' );
     }
-    jQuery(this).find("ul").slideToggle();
+    jQuery(this).find("ul:first").slideToggle();
   });
 
   if (jQuery(".is-active").length) {
     jQuery( ".is-active" ).parent().addClass( "active-link" );
+    jQuery( ".is-active" ).parent().parent().addClass( "active-link-li" );
   }
 
 });
-- 
GitLab