diff --git a/assets/global.js b/assets/global.js index 790eb5d..541aa90 100644 --- a/assets/global.js +++ b/assets/global.js @@ -1,18 +1,20 @@ $(document).ready(function(){ // include navbar $(".mdc-drawer").load("/page-inserts/navbar.html", function(){ - // initiate MDC drawer - const drawer = new mdc.drawer.MDCDrawer.attachTo(document.querySelector('.mdc-drawer')); - // include top app bar $(".mdc-top-app-bar").load("/page-inserts/top-app-bar.html", function(){ + + // initiate MDC drawer + const drawer = new mdc.drawer.MDCDrawer.attachTo(document.querySelector(".mdc-drawer")); + // initiate MDC top app bar const mdc_top_app_bar = new mdc.topAppBar.MDCTopAppBar.attachTo(document.querySelector('.mdc-top-app-bar')); - setScrollTarget(document.getElementById('main-content'), mdc_top_app_bar); - - mdc_top_app_bar.listen('MDCTopAppBar:nav', () => { + + mdc_top_app_bar.listen("MDCTopAppBar:nav", () => { drawer.open = !drawer.open; }); + + // initiate MDC items mdc.autoInit(); diff --git a/images/page-logo.png b/images/page-logo.png index 8810bff..3f1f2f4 100644 Binary files a/images/page-logo.png and b/images/page-logo.png differ diff --git a/page-inserts/top-app-bar.html b/page-inserts/top-app-bar.html index 8328d1d..d6c14b6 100644 --- a/page-inserts/top-app-bar.html +++ b/page-inserts/top-app-bar.html @@ -1,21 +1,9 @@ - - -
menu BBC School Report | Reading School