Skip to content

Commit cce10cb

Browse files
committed
Menu fixes
1 parent 716f39b commit cce10cb

File tree

1 file changed

+13
-20
lines changed

1 file changed

+13
-20
lines changed

_layouts/default.html

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -119,29 +119,22 @@ <h2>
119119
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
120120
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
121121
<script>
122-
$(function () {
123-
var navbar = $(".navbar")
124-
var topMenu = $("#PrimaryMenu"),
125-
topMenuHeight = topMenu.outerHeight() + 15,
126-
menuItems = topMenu.find("li a"),
127-
scrollItems = menuItems.map(function () {
128-
var item = $($(this).attr("href"));
129-
if (item.length) {
130-
return item;
131-
}
132-
});
133-
134-
// Close navbar on click
135-
$(".nav-link").on("click", function () {
136-
$(".navbar-collapse").collapse("hide");
137-
});
138-
});
139-
122+
var PrimaryMenu = $("#PrimaryMenu");
123+
var navbar = $(".navbar");
140124
$(window).bind("scroll", function () {
141125
if ($(window).scrollTop() > 50) {
142-
$(".navbar").removeClass("bg-transparent");
126+
if (!PrimaryMenu.hasClass("show")) {
127+
navbar.removeClass("bg-transparent");
128+
}
143129
} else {
144-
$(".navbar").addClass("bg-transparent");
130+
if (!PrimaryMenu.hasClass("show")) {
131+
navbar.addClass("bg-transparent");
132+
}
133+
}
134+
});
135+
$(".navbar-toggler").click(function() {
136+
if (navbar.hasClass("bg-transparent")) {
137+
navbar.removeClass("bg-transparent");
145138
}
146139
});
147140
</script>

0 commit comments

Comments
 (0)