From d3c9a7e629eada0129de9ccc5e01a2e2d89c1668 Mon Sep 17 00:00:00 2001 From: Brian Canini <canini.16@osu.edu> Date: Thu, 5 Nov 2020 09:26:58 -0500 Subject: [PATCH] fixing sidebar menu bug --- .../assets/sass/components/_sidebar-menu.scss | 6 ++++ web/themes/asc_bootstrap/css/style.css | 28 +++++++++++-------- web/themes/asc_bootstrap/js/scripts.js | 4 +++ 3 files changed, 26 insertions(+), 12 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 405ee6df6f..6301e0b32d 100644 --- a/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss +++ b/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss @@ -116,6 +116,12 @@ aside { } } + .active-link-li { + ul { + display: block; + } + } + i { float: right; padding: 2px 10px; diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css index 527e3a9fc8..eb0d5b5648 100644 --- a/web/themes/asc_bootstrap/css/style.css +++ b/web/themes/asc_bootstrap/css/style.css @@ -13018,54 +13018,58 @@ aside .sidebar-nav .active-trail .active-link-li ul { aside .sidebar-nav .active-trail .active-link-li ul ul { display: none; } -/* line 119, ../assets/sass/components/_sidebar-menu.scss */ +/* line 120, ../assets/sass/components/_sidebar-menu.scss */ +aside .sidebar-nav .active-link-li ul { + display: block; +} +/* line 125, ../assets/sass/components/_sidebar-menu.scss */ aside .sidebar-nav i { float: right; padding: 2px 10px; cursor: pointer; } -/* line 125, ../assets/sass/components/_sidebar-menu.scss */ +/* line 131, ../assets/sass/components/_sidebar-menu.scss */ aside .sidebar-nav:nth-last-child(1) { border-top: none; } -/* line 131, ../assets/sass/components/_sidebar-menu.scss */ +/* line 137, ../assets/sass/components/_sidebar-menu.scss */ aside .dropdown-menu { z-index: 20; } -/* line 135, ../assets/sass/components/_sidebar-menu.scss */ +/* line 141, ../assets/sass/components/_sidebar-menu.scss */ aside .nav > li > a:hover, aside .nav > li > a:focus { background-color: transparent; } -/* line 139, ../assets/sass/components/_sidebar-menu.scss */ +/* line 145, ../assets/sass/components/_sidebar-menu.scss */ aside .active-link { background-color: #ffffff; border-left: solid #D0021B 3px; padding-left: 5px; margin-left: -8px; } -/* line 147, ../assets/sass/components/_sidebar-menu.scss */ +/* line 153, ../assets/sass/components/_sidebar-menu.scss */ aside ul .active-link { margin-left: -5px; } -/* line 152, ../assets/sass/components/_sidebar-menu.scss */ +/* line 158, ../assets/sass/components/_sidebar-menu.scss */ aside ul ul .active-link { margin-left: -2px; } -/* line 157, ../assets/sass/components/_sidebar-menu.scss */ +/* line 163, ../assets/sass/components/_sidebar-menu.scss */ aside ul ul ul .active-link { margin-left: 0; } -/* line 165, ../assets/sass/components/_sidebar-menu.scss */ +/* line 171, ../assets/sass/components/_sidebar-menu.scss */ aside h2.active-link { background-color: transparent; border-left: none; padding-left: 0; } -/* line 173, ../assets/sass/components/_sidebar-menu.scss */ +/* line 179, ../assets/sass/components/_sidebar-menu.scss */ aside h2 a { color: #000000; } -/* line 178, ../assets/sass/components/_sidebar-menu.scss */ +/* line 184, ../assets/sass/components/_sidebar-menu.scss */ aside .nav { border-bottom: 1px #979797 dotted; } @@ -13077,7 +13081,7 @@ aside .nav { } @media (max-width: 768px) { - /* line 188, ../assets/sass/components/_sidebar-menu.scss */ + /* line 194, ../assets/sass/components/_sidebar-menu.scss */ .region-sidebar-menu { display: none; } diff --git a/web/themes/asc_bootstrap/js/scripts.js b/web/themes/asc_bootstrap/js/scripts.js index ab34ced0ce..e75f246103 100644 --- a/web/themes/asc_bootstrap/js/scripts.js +++ b/web/themes/asc_bootstrap/js/scripts.js @@ -166,6 +166,10 @@ jQuery(document).ready(function(){ } + if (jQuery(".sidebar-nav .active-link-li").length) { + jQuery(".sidebar-nav .active-link-li").find("i:first").removeClass('fa-angle-right').addClass( 'fa-angle-down' ); + } + if(jQuery("#views-exposed-form-events-page-1").length) { -- GitLab