diff --git a/images/pic1.png b/images/pic1.png index e966693..df3aee9 100644 Binary files a/images/pic1.png and b/images/pic1.png differ diff --git a/src/core/static/css/main.css b/src/core/static/css/main.css index b688417..d7f37aa 100644 --- a/src/core/static/css/main.css +++ b/src/core/static/css/main.css @@ -19,6 +19,7 @@ input { width: 100% !important; margin: 0 auto !important; background-color: #00000000 !important; + height: 2.5em; } @@ -50,29 +51,25 @@ input { border: 2px solid #c3c3c3; } -#rightClickBtn { - border-style: dashed; - border-width: 2px; - overflow: auto; - font-size: 280%; -} - -#rightClickBtn:hover { - background-color: rgba(0, 232, 255, 0.5); - cursor: pointer; -} - +#controlsModalBtn, +#typingModalBtn, #sendKeysBtn, #pressEnterBtn, #scrollToggle, -#mouseHoldToggle { +#mouseHoldToggle, +#rightClickBtn { display: inline-block; font-size: 280%; width: 100%; + height: 5em; } -#scrollToggleContainer, -#rightClickBtn { +#controlsModalBtn, +#typingModalBtn { + height: 2em; +} + +#hideHandler { display: none; /* Hide button unless screen bigger than media query says it is */ } @@ -89,8 +86,7 @@ input { margin: 0 auto; } - #scrollToggleContainer, - #rightClickBtn { + #hideHandler { display: block; } } diff --git a/src/core/static/js/events.js b/src/core/static/js/events.js index a2e1197..ece3cc4 100644 --- a/src/core/static/js/events.js +++ b/src/core/static/js/events.js @@ -180,6 +180,25 @@ function playClickSound() { } +$( "#controlsModalBtn" ).bind( "mouseup", async function(eve) { + $('#controlsModal').modal({"focus": true, "show": true}); +}); + +$( "#typingModalBtn" ).bind( "mouseup", async function(eve) { + $('#typingModal').modal({"focus": true, "show": true}); +}); + +$( "#closeControlsModalBtn" ).bind( "mouseup", async function(eve) { + console.log("here"); + $('#controlsModal').modal({"focus": false, "show": false}); +}); + +$( "#closeTypingModalBtn" ).bind( "mouseup", async function(eve) { + console.log("here2"); + $('#typingModal').modal({"focus": false, "show": false}); +}); + + document.addEventListener("mousedown", setClickkCheck, true); document.addEventListener("mouseup", resetClickCheckAndModBump, true); document.addEventListener("touchstart", touchHandler, true); diff --git a/src/core/templates/body-header.html b/src/core/templates/body-header.html new file mode 100644 index 0000000..31924f8 --- /dev/null +++ b/src/core/templates/body-header.html @@ -0,0 +1,15 @@ + diff --git a/src/core/templates/index.html b/src/core/templates/index.html index 5977fb6..e97322e 100644 --- a/src/core/templates/index.html +++ b/src/core/templates/index.html @@ -5,44 +5,98 @@ {% endblock body_header_additional %} {% block body_content %} - -