Mindfang/cardconjurer
1
0
Fork 0
forked from GithubMirrors/cardconjurer
Code Pull Requests Actions Packages Activity

safari fixes

Browse Source
This commit is contained in:
Kyle
2020-03-30 16:48:18 -07:00
parent 5415e4a406
commit 76f0563ef9
11 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
data/site/askScryfallStyles.css → askScryfallStyles.css
View File

6
askscryfall.html
View File

@@ -2,7 +2,7 @@
<html>
<head>
<script async src="data/scripts/cookies.js"></script>
<link rel="stylesheet" href="data/site/styles.css">
<link rel="stylesheet" href="styles.css">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="apple-touch-icon" sizes="180x180" href="data/site/favicons/apple-touch-icon.png">
@@ -12,7 +12,7 @@
</head>
<body>
<title>CC - Ask Scryfall</title>
<link rel="stylesheet" href="data/site/askScryfallStyles.css">
<link rel="stylesheet" href="askScryfallStyles.css">
<div>
<div class="title darkLayer">
Ask Scryfall
@@ -78,4 +78,4 @@
</div>
<script defer src="data/scripts/animations.js"></script>
</footer>
<html>
<html>

BIN
data/images/blank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

16
data/scripts/main.js
View File

@@ -50,9 +50,10 @@ newCanvas('autoCrop')
var artWidth = cardWidth, artHeight = cardHeight
var setSymbolDrawX, setSymbolDrawY, setSymbolDrawWidth, setSymbolDrawHeight
var watermarkDrawX = 0, watermarkDrawY = 0, watermarkDrawWidth = 0, watermarkDrawHeight = 0
cardArt = new Image()
setSymbol = new Image()
watermark = new Image()
var cardArt = new Image()
cardArt.src = 'data/images/blank.png'
var setSymbol = new Image()
var watermark = new Image()
cardArt.crossOrigin = "anonymous"
setSymbol.crossOrigin = "anonymous"
watermark.crossOrigin = "anonymous"
@@ -116,7 +117,9 @@ class cardPlaceholder {
} else {
mainContext.globalAlpha = 1
}
mainContext.drawImage(this.whatToDraw, scaleX(this.x), scaleY(this.y), scaleX(this.width) * this.zoom, scaleY(this.height) * this.zoom)
console.log(this.whatToDraw, scaleX(this.x), scaleY(this.y), scaleX(this.width) * this.zoom, scaleY(this.height) * this.zoom)
mainContext.drawImage(this.whatToDraw, scaleX(this.x), scaleY(this.y), scaleX(this.width) * this.zoom, scaleY(this.height) * this.zoom)
// breaks here
}
cardMasterElement() {
var temporaryElement = document.createElement('div')
@@ -219,7 +222,8 @@ function drawCardObjects() {
mainContext.drawImage(setSymbol, setSymbolDrawX, setSymbolDrawY, setSymbolDrawWidth, setSymbolDrawHeight)
mainContext.drawImage(bottomInfoCanvas, 0, 0, cardWidth, cardHeight)
mainContext.globalCompositeOperation = 'destination-over'
mainContext.drawImage(cardArt, scaleX(cardMasterList[0].x), scaleY(cardMasterList[0].y), scaleX(cardMasterList[0].width) * cardMasterList[0].zoom, scaleY(cardMasterList[0].height) * cardMasterList[0].zoom)
mainContext.drawImage(cardArt, scaleX(cardMasterList[0].x), scaleY(cardMasterList[0].y), scaleX(cardMasterList[0].width) * cardMasterList[0].zoom, scaleY(cardMasterList[0].height) * cardMasterList[0].zoom)
//breaks here
mainContext.globalCompositeOperation = 'destination-out'
//draw the corner cutters
mainContext.drawImage(cornerCutout, 0, 0, scaleX(59/1500), scaleX(59/1500))
@@ -843,4 +847,4 @@ function autoCrop(targetImage, source = targetImage.src) {
//Must run last:
initialize()
initialize()

2
data/scripts/palettes/dayRave.js
View File

@@ -7,7 +7,7 @@ rootStyles.setProperty('--input-color', '#efefef')
rootStyles.setProperty('--input-font-color', '#000')
rootStyles.setProperty('--font-color', '#000')
rootStyles.setProperty('--font-color-contrast', '#000')
rootStyles.setProperty('--body-background', 'url(images/lowpoly.png)')
rootStyles.setProperty('--body-background', 'url(data/site/images/lowpoly.png)')
setCookie('colorPalette', 'dayRave')
//Cycles through a rainbow!

2
data/scripts/palettes/nightRave.js
View File

@@ -7,7 +7,7 @@ rootStyles.setProperty('--input-color', '#3a3a3a')
rootStyles.setProperty('--input-font-color', '#efefef')
rootStyles.setProperty('--font-color', '#000')
rootStyles.setProperty('--font-color-contrast', '#efefef')
rootStyles.setProperty('--body-background', 'url(images/lowpoly.png)')
rootStyles.setProperty('--body-background', 'url(data/site/images/lowpoly.png)')
setCookie('colorPalette', 'nightRave')
//Cycles through a rainbow!

12
data/scripts/palettes/scholarMode.js
View File

@@ -1,11 +1,11 @@
rootStyles.setProperty('--background-color', 'none')
rootStyles.setProperty('--background-color-contrast', 'url(images/palettes/canvasPaper.png)')
rootStyles.setProperty('--interactable-color', 'url(images/palettes/whitePaperTileable.png)')
rootStyles.setProperty('--interactable-selected-color', 'url(images/palettes/whitePaperHighlightedTileable.png)')
rootStyles.setProperty('--background-color-contrast', 'url(data/site/images/palettes/canvasPaper.png)')
rootStyles.setProperty('--interactable-color', 'url(data/site/images/palettes/whitePaperTileable.png)')
rootStyles.setProperty('--interactable-selected-color', 'url(data/site/images/palettes/whitePaperHighlightedTileable.png)')
rootStyles.setProperty('--interactable-tiling', 'auto')
rootStyles.setProperty('--input-color', 'url(images/palettes/whitePaperTileable.png)')
rootStyles.setProperty('--input-color', 'url(data/site/images/palettes/whitePaperTileable.png)')
rootStyles.setProperty('--input-font-color', '#000')
rootStyles.setProperty('--font-color', '#eee')
rootStyles.setProperty('--font-color-contrast', '#000')
rootStyles.setProperty('--body-background', 'url(images/palettes/darkWood.png)')
setCookie('colorPalette', 'scholarMode')
rootStyles.setProperty('--body-background', 'url(data/site/images/palettes/darkWood.png)')
setCookie('colorPalette', 'scholarMode')

4
disclaimer.html
View File

@@ -2,7 +2,7 @@
<html>
<head>
<script async src="data/scripts/cookies.js"></script>
<link rel="stylesheet" href="data/site/styles.css">
<link rel="stylesheet" href="styles.css">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="apple-touch-icon" sizes="180x180" href="data/site/favicons/apple-touch-icon.png">
@@ -65,4 +65,4 @@
</div>
<script defer src="data/scripts/animations.js"></script>
</footer>
<html>
<html>

4
index.html
View File

@@ -3,7 +3,7 @@
<head>
<script async src="data/scripts/cookies.js"></script>
<!-- <script async src="data/scripts/palettes/dayRave.js"></script> -->
<link rel="stylesheet" href="data/site/styles.css">
<link rel="stylesheet" href="styles.css">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="apple-touch-icon" sizes="180x180" href="data/site/favicons/apple-touch-icon.png">
@@ -270,4 +270,4 @@
</div>
<script defer src="data/scripts/animations.js"></script>
</footer>
<html>
<html>

20
data/site/styles.css → styles.css
View File

@@ -1,39 +1,39 @@
/*fonts*/
@font-face {
font-family: gothammedium;
src: url("../fonts/gotham-medium.ttf");
src: url("data/fonts/gotham-medium.ttf");
}
@font-face {
font-family: belerenb;
src: url("../fonts/beleren-b.ttf");
src: url("data/fonts/beleren-b.ttf");
}
@font-face {
font-family: belerenbsc;
src: url("../fonts/beleren-bsc.ttf");
src: url("data/fonts/beleren-bsc.ttf");
}
@font-face {
font-family: matrix;
src: url("../fonts/matrix.ttf");
src: url("data/fonts/matrix.ttf");
}
@font-face {
font-family: matrixb;
src: url("../fonts/matrix-b.ttf");
src: url("data/fonts/matrix-b.ttf");
}
@font-face {
font-family: matrixbsc;
src: url("../fonts/matrix-bsc.ttf");
src: url("data/fonts/matrix-bsc.ttf");
}
@font-face {
font-family: mplantin;
src: url("../fonts/mplantin.ttf");
src: url("data/fonts/mplantin.ttf");
}
@font-face {
font-family: mplantini;
src: url("../fonts/mplantin-i.ttf");
src: url("data/fonts/mplantin-i.ttf");
}
@font-face {
font-family: goudymedieval;
src: url("../fonts/goudy-medieval.ttf");
src: url("data/fonts/goudy-medieval.ttf");
}
:root {
@@ -448,4 +448,4 @@ canvas {
html {
font: 20pt georgia;
}
}
}

4
termsofuse.html
View File

@@ -2,7 +2,7 @@
<html>
<head>
<script async src="data/scripts/cookies.js"></script>
<link rel="stylesheet" href="data/site/styles.css">
<link rel="stylesheet" href="styles.css">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="apple-touch-icon" sizes="180x180" href="data/site/favicons/apple-touch-icon.png">
@@ -56,4 +56,4 @@
</div>
<script defer src="data/scripts/animations.js"></script>
</footer>
<html>
<html>