GithubMirrors/cardconjurer
1
0
Fork 1
mirror of https://github.com/Investigamer/cardconjurer.git synced 2025-07-27 05:14:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Kyle
2020-12-20 10:54:03 -08:00
parent d2602c12e4
commit 51dbab5b0e
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.htaccess
View File

@@ -10,10 +10,11 @@ ErrorDocument 404 /404.php
Header set Cache-Control "max-age=2678400, public" Header set Cache-Control "max-age=2678400, public"
</filesMatch> </filesMatch>
#WEEK #WEEK
<filesMatch "\.(js)$"> <filesMatch "\.(js|php)$">
Header set Cache-Control "max-age=604800, public" Header set Cache-Control "max-age=604800, public"
</filesMatch> </filesMatch>
#creator.js
<files creator.js> <files creator.js>
Header set Cache-Control "max-age=0, public" Header set Cache-Control "max-age=60, public"
</files> </files>
</IfModule> </IfModule>

6
css/style.css
View File

@@ -252,9 +252,9 @@ a:hover {
transition: 0.333s ease; transition: 0.333s ease;
} }
.hamburger:hover + .circle { .hamburger:hover + .circle {
padding: 3rem; /*padding: 3rem;
right: -1rem; right: -1rem;
top: -1rem; top: -1rem;*/
} }
.hamburger.opened + .circle { .hamburger.opened + .circle {
padding: var(--window-diagonal-size); padding: var(--window-diagonal-size);
@@ -549,7 +549,9 @@ textarea.input {
position: fixed; position: fixed;
max-width: calc(100vw - 6rem); max-width: calc(100vw - 6rem);
width: 64rem; /*multiple of 16?*/ width: 64rem; /*multiple of 16?*/
max-height: calc(100vh - 6rem);
height: auto; height: auto;
overflow-y: scroll;
-webkit-transform: translateX(-50%) translateY(-50%); -webkit-transform: translateX(-50%) translateY(-50%);
-moz-transform: translateX(-50%) translateY(-50%); -moz-transform: translateX(-50%) translateY(-50%);
-ms-transform: translateX(-50%) translateY(-50%); -ms-transform: translateX(-50%) translateY(-50%);

1
globalHTML/header.php
View File

@@ -14,6 +14,7 @@
<script src='/js/main.js'></script> <script src='/js/main.js'></script>
</head> </head>
<body> <body>
<script>(function(a,b,c){if(c in b&&b[c]){var d,e=a.location,f=/^(a|html)$/i;a.addEventListener("click",function(a){d=a.target;while(!f.test(d.nodeName))d=d.parentNode;"href"in d&&(d.href.indexOf("http")||~d.href.indexOf(e.host))&&(a.preventDefault(),e.href=d.href)},!1)}})(document,window.navigator,"standalone")</script> <!--https://stackoverflow.com/questions/2898740/iphone-safari-web-app-opens-links-in-new-window-->
<div class='background'></div> <div class='background'></div>
<header> <header>
<h1 class='title center'>CARD CONJURER</h1> <h1 class='title center'>CARD CONJURER</h1>

25
js/creator.js
View File

@@ -149,8 +149,23 @@ function dragStart(event) {
function dragEnd(event) { function dragEnd(event) {
Array.from(document.querySelectorAll('.dragging')).forEach(element => element.classList.remove('dragging')); Array.from(document.querySelectorAll('.dragging')).forEach(element => element.classList.remove('dragging'));
} }
function dragOver(event) { function touchMove(event) {
var eventTarget = event.target.closest('.draggable'); 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'); var movingElement = document.querySelector('.dragging');
if (document.querySelector('.dragging') && !eventTarget.classList.contains('dragging') && eventTarget.parentElement == movingElement.parentElement) { if (document.querySelector('.dragging') && !eventTarget.classList.contains('dragging') && eventTarget.parentElement == movingElement.parentElement) {
var parentElement = eventTarget.parentElement; var parentElement = eventTarget.parentElement;
@@ -177,8 +192,11 @@ function dragOver(event) {
}); });
Array.from(elements.children).forEach(element => { Array.from(elements.children).forEach(element => {
element.ondragstart = dragStart; element.ondragstart = dragStart;
element.ontouchstart = dragStart;
element.ondragend = dragEnd; element.ondragend = dragEnd;
element.ontouchend = dragEnd;
element.ondragover = dragOver; element.ondragover = dragOver;
element.ontouchmove = touchMove;
element.onclick = frameElementClicked; element.onclick = frameElementClicked;
element.children[3].onclick = removeFrame; element.children[3].onclick = removeFrame;
}) })
@@ -363,6 +381,9 @@ function addFrame(additionalMasks = [], loadingFrame = false) {
frameElement.ondragstart = dragStart; frameElement.ondragstart = dragStart;
frameElement.ondragend = dragEnd; frameElement.ondragend = dragEnd;
frameElement.ondragover = dragOver; frameElement.ondragover = dragOver;
frameElement.ontouchstart = dragStart;
frameElement.ontouchend = dragEnd;
frameElement.ontouchmove = touchMove;
frameElement.onclick = frameElementClicked; frameElement.onclick = frameElementClicked;
var frameElementImage = document.createElement('img'); var frameElementImage = document.createElement('img');
if (frameToAdd.noThumb || frameToAdd.src.includes('/img/black.png')) { if (frameToAdd.noThumb || frameToAdd.src.includes('/img/black.png')) {