Skip to content

Commit

Permalink
Merge pull request #185 from isubit/development
Browse files Browse the repository at this point in the history
1.7.2
  • Loading branch information
sacarney committed Nov 1, 2021
2 parents 1dc6c06 + 9473388 commit 027b629
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 50 deletions.
6 changes: 3 additions & 3 deletions css/bootstrap/bootstrap-grid.min.css

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions css/bootstrap/bootstrap-reboot.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions css/bootstrap/bootstrap.min.css

Large diffs are not rendered by default.

26 changes: 0 additions & 26 deletions js/isu-navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,6 @@ $(document).ready(function() {
}
});

// Traverse Signons menu with up/down arrow keys
$('.isu-navbar_signons').on('keydown', function(event) {
if (event.keyCode === 40) { // down
event.preventDefault();
// Change the focus to the link in the next li
$(':focus').parent('li').next('li').children('a').focus();
} else if (event.keyCode == 38) { // up
if ( $(':focus').is('.isu-navbar_signons li:not(:first-of-type) a') ) {
// If the focus is NOT the first item in the list...
// Change the focus to the link in the previous li
$(':focus').parent('li').prev().children('a').focus();
}
}
})

// Enter dropdowns with the down arrow
$('.isu-navbar_dropdown > .isu-navbar_dropdown-toggle').on('keydown', function(event) {
var dropdownToggle = $(this);
Expand All @@ -82,17 +67,6 @@ $(document).ready(function() {
}
});

// Exit the Sign-Ons menu with up arrow
$('.isu-navbar_signons > li:first-of-type a').on('keydown', function(event) {
var dropdownMenuItem = $(this);
if (event.keyCode === 38) { // up
// Close the dropdown
dropdownMenuItem.closest('.isu-navbar_dropdown').attr('data-isu-navbar-expanded', 'false');
// Refocus on the parent link.
dropdownMenuItem.closest('.isu-navbar_dropdown').find('a').focus();
}
});

// Close dropdowns upon exit
$('.isu-navbar_dropdown-menu').on('mouseleave focusout', function(e) {
var dropdownMenu = $(this);
Expand Down
1 change: 1 addition & 0 deletions templates/parts/footer.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
<li><a href="http://www.policy.iastate.edu/policy/discrimination">Non-discrimination Policy</a></li>
<li><a href="http://www.policy.iastate.edu/electronicprivacy">Privacy Policy</a></li>
<li><a href="http://digitalaccess.iastate.edu">Digital Access &amp; Accessibility</a></li>
<li><a href="https://www.iastate.edu/about/consumer">Consumer Information</a></li>
</ul>
</div>
{% endif %}
Expand Down
14 changes: 1 addition & 13 deletions templates/parts/isu-navbar.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,6 @@
<li><a href="https://info.iastate.edu/">Directory</a></li>
<li><a href="https://www.fpm.iastate.edu/maps/">Maps</a></li>
<li><a href="https://web.iastate.edu/safety/">Safety</a></li>
<li class="isu-navbar_dropdown_signons isu-navbar_dropdown" data-isu-navbar-expanded="false">
<a href="https://web.iastate.edu/signons" class="isu-navbar_dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false">Sign Ons</a>
<ul class="isu-navbar_dropdown-menu isu-navbar_signons">
<li><a href="https://accessplus.iastate.edu/">AccessPlus</a></li>
<li><a href="https://canvas.iastate.edu/">Canvas</a></li>
<li><a href="https://iastate.box.com/">CyBox</a></li>
<li><a href="http://cymail.iastate.edu/">CyMail</a></li>
<li><a href="https://login.iastate.edu/">Okta</a></li>
<li><a href="https://outlook.iastate.edu/">Outlook</a></li>
<li><a href="https://workday.iastate.edu/">Workday</a></li>
<li><a href="https://web.iastate.edu/signons">More Sign Ons...</a></li>
</ul>
</li>
<li><a href="https://iastate.okta.com/">Sign Ons</a></li>
</ul>
</nav>

0 comments on commit 027b629

Please sign in to comment.