diff --git a/.htaccess b/.htaccess index 152b6a8a..aa7dff6a 100644 --- a/.htaccess +++ b/.htaccess @@ -10,10 +10,11 @@ ErrorDocument 404 /404.php Header set Cache-Control "max-age=2678400, public" #WEEK - + Header set Cache-Control "max-age=604800, public" + #creator.js - Header set Cache-Control "max-age=0, public" + Header set Cache-Control "max-age=60, public" \ No newline at end of file diff --git a/css/style.css b/css/style.css index a147b557..2875dfdb 100644 --- a/css/style.css +++ b/css/style.css @@ -252,9 +252,9 @@ a:hover { transition: 0.333s ease; } .hamburger:hover + .circle { - padding: 3rem; + /*padding: 3rem; right: -1rem; - top: -1rem; + top: -1rem;*/ } .hamburger.opened + .circle { padding: var(--window-diagonal-size); @@ -549,7 +549,9 @@ textarea.input { position: fixed; max-width: calc(100vw - 6rem); width: 64rem; /*multiple of 16?*/ + max-height: calc(100vh - 6rem); height: auto; + overflow-y: scroll; -webkit-transform: translateX(-50%) translateY(-50%); -moz-transform: translateX(-50%) translateY(-50%); -ms-transform: translateX(-50%) translateY(-50%); diff --git a/globalHTML/header.php b/globalHTML/header.php index 19edc3d7..2e0b5f97 100644 --- a/globalHTML/header.php +++ b/globalHTML/header.php @@ -14,6 +14,7 @@ +

CARD CONJURER

diff --git a/js/creator.js b/js/creator.js index 84c8b207..26e177e6 100644 --- a/js/creator.js +++ b/js/creator.js @@ -149,8 +149,23 @@ function dragStart(event) { function dragEnd(event) { Array.from(document.querySelectorAll('.dragging')).forEach(element => element.classList.remove('dragging')); } -function dragOver(event) { - var eventTarget = event.target.closest('.draggable'); +function touchMove(event) { + var clientX = event.clientX; + var clientY = event.clientY; + Array.from(document.querySelector('.dragging').parentElement.children).forEach(element => { + var elementBounds = element.getBoundingClientRect(); + if (clientY > elementBounds.top && clientY < elementBounds.bottom) { + dragOver(element, false); + } + }) +} +function dragOver(event, drag=true) { + var eventTarget; + if (drag) { + eventTarget = event.target.closest('.draggable'); + } else { + eventTarget = event; + } var movingElement = document.querySelector('.dragging'); if (document.querySelector('.dragging') && !eventTarget.classList.contains('dragging') && eventTarget.parentElement == movingElement.parentElement) { var parentElement = eventTarget.parentElement; @@ -177,8 +192,11 @@ function dragOver(event) { }); Array.from(elements.children).forEach(element => { element.ondragstart = dragStart; + element.ontouchstart = dragStart; element.ondragend = dragEnd; + element.ontouchend = dragEnd; element.ondragover = dragOver; + element.ontouchmove = touchMove; element.onclick = frameElementClicked; element.children[3].onclick = removeFrame; }) @@ -363,6 +381,9 @@ function addFrame(additionalMasks = [], loadingFrame = false) { frameElement.ondragstart = dragStart; frameElement.ondragend = dragEnd; frameElement.ondragover = dragOver; + frameElement.ontouchstart = dragStart; + frameElement.ontouchend = dragEnd; + frameElement.ontouchmove = touchMove; frameElement.onclick = frameElementClicked; var frameElementImage = document.createElement('img'); if (frameToAdd.noThumb || frameToAdd.src.includes('/img/black.png')) {