diff --git a/drupal/themes/fuq/css/uq.css b/drupal/themes/fuq/css/uq.css
index e0dc9dc..a3b4591 100644
Binary files a/drupal/themes/fuq/css/uq.css and b/drupal/themes/fuq/css/uq.css differ
diff --git a/drupal/themes/fuq/css/uq.css.map b/drupal/themes/fuq/css/uq.css.map
index 36949c9..bc5597e 100644
Binary files a/drupal/themes/fuq/css/uq.css.map and b/drupal/themes/fuq/css/uq.css.map differ
diff --git a/drupal/themes/fuq/js/uq.mobile-menu.js b/drupal/themes/fuq/js/uq.mobile-menu.js
index b56ec2e..156bd0b 100644
--- a/drupal/themes/fuq/js/uq.mobile-menu.js
+++ b/drupal/themes/fuq/js/uq.mobile-menu.js
@@ -1,74 +1,20 @@
(function ($) {
- $(document).ready(function(){
- var width= $(window).width(), height = $(window).height();
-
- /* if on small device, setup mobile menu, else setup large */
- if ($(window).width() < 769) {
- set_mobile_menu();
- } else {
- set_large_menu();
- }
-
- /* show dropdown menu */
- $("uq-top-menu").find("li.expanded").hover(
- function() {
- $(this).find("ul").show();
- }, function() {
- $(this).find("ul").hide();
+ $(document).ready(function() {
+ // add button for expanding drop down lists
+ $('').insertAfter( $("#top-menu-inner .menu-block-wrapper ul.menu:first-of-type .expanded > a"));
+
+ // toggle expandable items
+ $(".menu-item-expand-link").click(function() {
+ $(this).next(".menu").toggleClass("expanded");
+ $(this).toggleClass("dropdown-closed dropdown-open");
});
- /* set menu to mobile view */
- function set_mobile_menu() {
- $("#menu-button").css("display", "block");
- $("ul.menu").first().addClass("mobile-menu");
- $("ul.menu").first().hide();
- if ($("ul.menu").first().hasClass("large-menu")) {
- $("ul.menu").first().removeClass("large-menu");
- }
- }
-
- /* set menu to large view */
- function set_large_menu() {
- $("#menu-button").css("display", "none");
- $("ul.menu").first().addClass("large-menu");
- $("ul.menu").first().show();
- if ($("ul.menu").first().hasClass("mobile-menu")) {
- $("ul.menu").first().removeClass("mobile-menu");
- }
- }
-
-
- /* set display of menu to block */
- function show_menu() {
- $("ul.menu").first().slideDown();
- }
-
- /* set display of menu to none */
- function hide_menu() {
- $("ul.menu").first().slideUp();
- }
-
- /* display or hide mobile menu on button click */
- $("#menu-button").click(function(e) {
- e.preventDefault();
- if ($("ul.menu").first().css("display") != "block") {
- show_menu();
- } else {
- hide_menu();
- }
+ // toggle dropdown menu show/hide
+ $("#menu-button").click(function() {
+ $(this).toggleClass("mobile-menu-open");
+ $(this).parent().find("ul.menu").first().toggleClass("expand");
});
- /* add or remove the mobile-menu class on screen resize */
- $(window).resize(function() {
- if ($(window).width() != width) {
- if ($(window).width() < 769) {
- set_mobile_menu();
- } else {
- set_large_menu();
- }
- width = $(window).width();
- height = $(window).height();
- }
- });
- });
-})(jQuery);
+ SVGInjector(document.querySelectorAll("img.inject-me"));
+ });
+}) (jQuery);
diff --git a/drupal/themes/fuq/template.php b/drupal/themes/fuq/template.php
index 205b789..4d983c2 100755
--- a/drupal/themes/fuq/template.php
+++ b/drupal/themes/fuq/template.php
@@ -89,7 +89,9 @@ function fuq_preprocess_html(&$vars, $hook) {
$vars['classes_array'][] = $c['container_width_default'];
}
- drupal_add_js(drupal_get_path('theme', 'fuq') . '/js/uq.mobile-menu.js', array('scope' => 'header', 'weight' => '15'));
+ drupal_add_js('https://eait.uqstatic.net/lib/SVGInjector/SVGInjector-1.1.3/svg-injector.js', array('scope' => 'header', 'weight' => '16'));
+ drupal_add_js(drupal_get_path('theme', 'fuq') . '/js/uq.mobile-menu.js', array('scope' => 'header', 'weight' => '16'));
+ #drupal_add_js('SVGInjector(document.querySelectorAll("img.inject-me"));', [ 'type' => 'inline', 'scope' => 'footer' ]);
}
function fuq_process_html(&$vars) {
diff --git a/drupal/themes/fuq/templates/page.tpl.php b/drupal/themes/fuq/templates/page.tpl.php
index 29efc9d..3a50fa8 100755
--- a/drupal/themes/fuq/templates/page.tpl.php
+++ b/drupal/themes/fuq/templates/page.tpl.php
@@ -40,7 +40,10 @@