From 056be55a1f854b316c1edc20fa81c18f542ad4c7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 13 Jan 2025 18:21:44 +0000 Subject: [PATCH] Bug 37222: (follow-up) More corrections to sidebar style Signed-off-by: Lucas Gass Signed-off-by: David Nind --- .../prog/css/src/staff-global.scss | 6 +++- .../intranet-tmpl/prog/js/staff-global.js | 28 ++++++++++--------- .../prog/js/vue/components/ERM/Main.vue | 3 +- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index eb901b6b910..fae8fe3509d 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -478,7 +478,7 @@ aside { list-style: none; a { - border-left: 5px solid #E6E6E6; + border-left: 5px solid transparent; color: #000; display: block; padding: .7em .3em .7em 1rem; @@ -506,6 +506,10 @@ aside { } } } + + .breadcrumb-item { + font-style: normal; + } } div { diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js index bad09d65884..68629ab2262 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js +++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js @@ -192,19 +192,21 @@ $(document).ready(function () { var sidebar_menu = $(".sidebar_menu"); if (sidebar_menu.length > 0) { - var path = location.pathname.substring(1); - var url = window.location.toString(); - var params = ""; - if (url.match(/\?(.+)$/)) { - params = "?" + RegExp.$1; - } - if ($('a[href$="/' + path + params + '"]', sidebar_menu).length == 0) { - $('a[href$="/' + path + '"]', sidebar_menu).addClass("current"); - } else { - $('a[href$="/' + path + params + '"]', sidebar_menu).addClass( - "current" - ); - } + sidebar_menu.each(function () { + var path = location.pathname.substring(1); + var url = window.location.toString(); + var params = ""; + if (url.match(/\?(.+)$/)) { + params = "?" + RegExp.$1; + } + if ($('a[href$="/' + path + params + '"]', $(this)).length == 0) { + $('a[href$="/' + path + '"]', $(this)).addClass("current"); + } else { + $('a[href$="/' + path + params + '"]', $(this)).addClass( + "current" + ); + } + }); } $("#catalog-search-link a").on("mouseenter mouseleave", function () { diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue index dc769258988..c28c5cf0ae7 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue @@ -173,6 +173,7 @@ export default {