Merge pull request #198 from Vivalldi/develop

Fixes #117 & #193

themes/grav/css-compiled/template.css

@@ -408,7 +408,6 @@ hr {
       position: relative;
       z-index: 2;
       float: left;
-      width: 50%;
       height: 100%;
       margin: 0;
       text-align: center; }

themes/grav/js/mobile.js

@@ -14,46 +14,35 @@ $(document).ready(function(){
     var sidebar = document.getElementById("admin-sidebar");
     var overlay = document.getElementById("overlay");
 
-    //var selected = sidebar.getElementsByClassName('selected')[0].getElementsByTagName('a');
-    //Var selected will be added later when solution to a few pages not having it is found.
-    //Var selected is used to prevent the page from reloading when clicking on the current page in the menu
     var mobile = {
         setup: function() {
-            //selected[0].href = 'javascript:void(0)';
-            //actions here please;
-            //console.log("Mobile setup");
-            //event listener to titlebar
+            //add event listeners
             titlebar.addEventListener('click',mobile.titlebar_click);
-            //event listener to admin-sidebar
             sidebar.addEventListener('click',mobile.sidebar_click);
-            //event listener to overlay
             overlay.addEventListener('click',mobile.overlay_click);
         },
         teardown: function() {
-            //teardown actions here please
-            //console.log("Mobile teardown");
             //remove event listeners
             titlebar.removeEventListener('click',mobile.titlebar_click);
             sidebar.removeEventListener('click',mobile.sidebar_click);
             overlay.removeEventListener('click',mobile.overlay_click);
         },
-        titlebar_click: function(){
-            //onclick event stuff here;
-            //console.log("Mobile onClick");
-            $(sidebar).toggle('slide');
-            overlay.style.display = "inherit";
+        titlebar_click: function(event){
+            //titlebar on click - open sidebar (make sure not a button bar child)
+            if(!$(event.target).parents('.button-bar').length>0){
+                $(sidebar).toggle('slide');
+                overlay.style.display = "inherit";
+            }
         },
         sidebar_click: function(){
-            //onclick event stuff here;
-            //console.log("Sidebar Clicked");
+            //sidebar on click - close sidebar
             if(event.target == sidebar || event.target == selected[0]) {
                 $(sidebar).toggle('slide');
                 overlay.style.display = "none";
             }
         },
         overlay_click: function(){
-            //onclick event stuff here;
-            //console.log("Overlay Clicked");
+            //overlay on click - close sidebar
             $(sidebar).toggle('slide');
             overlay.style.display = "none";
         }
@@ -61,9 +50,6 @@ $(document).ready(function(){
 
     var other = {
         setup: function() {
-            //actions here please;
-            //console.log("Other setup");
-            //make sure menu is visible
             if(sidebar && sidebar.style.display == 'none') {
                 sidebar.style.display = 'block';
             }

themes/grav/scss/template/modules/_toggle-switch.scss

@@ -153,7 +153,6 @@ $switch-height: 46px;
         z-index: 2;
 
         float: left;
-        width: 50%;
         height: 100%;
 
         margin: 0;