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

fixes

Browse Source
This commit is contained in:
Kyle
2019-10-21 09:14:43 -07:00
parent b188c7af40
commit 452e08b900
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/scripts/colors.js
View File

@@ -1,15 +1,15 @@
//Cycles through a rainbow! //Cycles through a rainbow!
setInterval(changeColor, 100) setInterval(changeColor, 100)
var regularAdjust = -60 var regularAdjust = 60
var lightAdjust = 100 var lightAdjust = 100
var lightLead = 100 var lightLead = 128
var currentColorIndex = 0 var currentColorIndex = 0
function changeColor() { function changeColor() {
var colors = indexToColor(currentColorIndex) var colors = indexToColor(currentColorIndex)
document.documentElement.style.setProperty("--shifting-color-1", "rgb(" + parseInt(colors[0] + regularAdjust) + "," + parseInt(colors[1] + regularAdjust) + "," + parseInt(colors[2] + regularAdjust) + ")") document.documentElement.style.setProperty("--shifting-color-1", "rgb(" + parseInt(colors[0] + regularAdjust) + "," + parseInt(colors[1] + regularAdjust) + "," + parseInt(colors[2] + regularAdjust) + ")")
var lightColors = indexToColor(currentColorIndex + lightLead) var lightColors = indexToColor(currentColorIndex + lightLead)
document.documentElement.style.setProperty("--shifting-color-1-light", "rgb(" + parseInt(lightColors[0] + lightAdjust) + "," + parseInt(lightColors[1] + lightAdjust) + "," + parseInt(lightColors[2] + lightAdjust) + ")") document.documentElement.style.setProperty("--shifting-color-1-light", "rgb(" + parseInt(lightColors[0] + lightAdjust) + "," + parseInt(lightColors[1] + lightAdjust) + "," + parseInt(lightColors[2] + lightAdjust) + ")")
currentColorIndex += colorJumpSize = 153 / 60 //The second number is how many seconds it takes to do a full loop currentColorIndex += colorJumpSize = 153 / 120 //The second number is how many seconds it takes to do a full loop
} }
function indexToColor(colorIndex) { function indexToColor(colorIndex) {
var red = 0, green = 0, blue = 0 var red = 0, green = 0, blue = 0
@@ -42,4 +42,4 @@ function indexToColor(colorIndex) {
break break
} }
return [red, green, blue] return [red, green, blue]
} }

6
data/site/main.js
View File

@@ -372,9 +372,9 @@ CanvasRenderingContext2D.prototype.writeText = function(text = "", textX = 0, te
//It may be a code //It may be a code
wordToWrite = "" wordToWrite = ""
possibleCodeLower = splitString[i].toLowerCase().replace("{", "").replace("}", "") possibleCodeLower = splitString[i].toLowerCase().replace("{", "").replace("}", "")
if (possibleCodeLower == "line" && !oneline) { if (possibleCodeLower == "line" && !oneLine) {
finishLine = true finishLine = true
} else if (possibleCodeLower == "linenospace" && ! oneline) { } else if (possibleCodeLower == "linenospace" && ! oneLine) {
finishLine = true finishLine = true
} else if (possibleCodeLower == "bar" || possibleCodeLower == "flavor") { } else if (possibleCodeLower == "bar" || possibleCodeLower == "flavor") {
finishLine = true finishLine = true
@@ -716,4 +716,4 @@ watermarks
possibly border color? possibly border color?
*/ */

8
data/site/styles.css
View File

@@ -40,6 +40,7 @@
--shifting-color-1-light: #c8ff64; --shifting-color-1-light: #c8ff64;
--light-color: #eee; --light-color: #eee;
--dark-color: #333; --dark-color: #333;
--clear-light: #1111;
} }
footer { footer {
background-color: var(--dark-color); background-color: var(--dark-color);
@@ -192,8 +193,9 @@ footer a:hover {
color: black; color: black;
font-size: 2em; font-size: 2em;
text-align: center; text-align: center;
margin: 3em 0px;
} }
.layer:nth-child(even) { .layer { /*:nth-child(even)*/
background-color: var(--light-color); background-color: var(--light-color);
background-image: url(images/layerBackground.png); background-image: url(images/layerBackground.png);
background-position: center; background-position: center;
@@ -221,7 +223,7 @@ footer a:hover {
text-decoration: underline; text-decoration: underline;
} }
.donate > div { .donate > div {
background-color: #1111; background-color: var(--clear-light);
border-radius: 2em; border-radius: 2em;
font: 2em belerenbsc; font: 2em belerenbsc;
} }
@@ -273,4 +275,4 @@ footer a:hover {
grid-template-columns: repeat(auto-fit, minmax(0px, 1fr)); grid-template-columns: repeat(auto-fit, minmax(0px, 1fr));
grid-gap: 1em; grid-gap: 1em;
} }
} }

26
index.html
View File

@@ -59,7 +59,7 @@
<div class="tooltip"><input type="number" class="input number" id="inputCardArtNameNumber" onchange="inputCardArtNameNumber(this.value)" value="" min="1" max="1" placeholder="Which Art From Card Name"><span class="tooltiptext">Select which art to use (from the entered card name)</span></div> <div class="tooltip"><input type="number" class="input number" id="inputCardArtNameNumber" onchange="inputCardArtNameNumber(this.value)" value="" min="1" max="1" placeholder="Which Art From Card Name"><span class="tooltiptext">Select which art to use (from the entered card name)</span></div>
</div> </div>
<div> <div>
<div style="text-align: center; margin: 0.18em 0px">Placement & Zoom:</div> <div style="text-align: center; margin: 0.18em 0px">Placement &amp; Zoom:</div>
<div class="tooltip"><input type="number" class="input number" value="0" id="inputCardArtX" oninput="updateCardCanvas()"><span class="tooltiptext">Shift art to the right</span></div> <div class="tooltip"><input type="number" class="input number" value="0" id="inputCardArtX" oninput="updateCardCanvas()"><span class="tooltiptext">Shift art to the right</span></div>
<div class="tooltip"><input type="number" class="input number" value="0" id="inputCardArtY" oninput="updateCardCanvas()"><span class="tooltiptext">Shift art down</span></div> <div class="tooltip"><input type="number" class="input number" value="0" id="inputCardArtY" oninput="updateCardCanvas()"><span class="tooltiptext">Shift art down</span></div>
<div class="tooltip"><input type="number" class="input number" value="100" step="0.1" min="0" id="inputCardArtZoom" oninput="updateCardCanvas()"><span class="tooltiptext">Art zoom level</span></div> <div class="tooltip"><input type="number" class="input number" value="100" step="0.1" min="0" id="inputCardArtZoom" oninput="updateCardCanvas()"><span class="tooltiptext">Art zoom level</span></div>
@@ -149,18 +149,16 @@
This version of the website is currently a work in progress, so it doesn't have all the features the original Card Conjurer had. If you'd like to go back to the old version, <a href="old/index.html">click here</a>. This version of the website is currently a work in progress, so it doesn't have all the features the original Card Conjurer had. If you'd like to go back to the old version, <a href="old/index.html">click here</a>.
</div> </div>
</div> </div>
<div class="layer"> <!-- <div class="layer">-->
<div class="title">How You Can Help</div> <!-- <div class="title">How You Can Help</div>-->
<div class="paragraph indent"> <!-- <div class="paragraph indent">-->
I hope that you found Card Conjurer useful! If you did, you can help me out tremendously by using one of the following referral links: <!-- I hope that you found Card Conjurer useful! If you did, you can help me out tremendously by using one of the following referral links:-->
</div> <!-- </div>-->
<div class="autoGrid donate"> <!-- <div class="autoGrid donate">-->
<!-- <div onclick="window.open('https://www.paypal.me/kyleburtondonate', '_blank');" style="color:rgb(0,37,134);">PayPal<img src="data/site/icons/paypal.png"></div> --> <!-- <div onclick="window.open('https://pucatrade.com/invite/gift/186748', '_blank');" style="color:#3d213a;">PucaTrade<img src="data/site/icons/pucatrade.png"></div>-->
<div onclick="window.open('https://pucatrade.com/invite/gift/186748', '_blank');" style="color:#3d213a;">PucaTrade<img src="data/site/icons/pucatrade.png"></div> <!-- <div onclick="window.open('https://www.massdrop.com/?referer=LNWNLL', '_blank');" style="color:#ffffff;">Massdrop<img src="data/site/icons/massdrop.png"></div>-->
<!-- <div onclick="window.open('https://twitter.com/ImKyle4815', '_blank');" style="color:rgb(0,174,239);">@ImKyle4815<img src="data/site/icons/twitter.png"></div> --> <!-- </div>-->
<div onclick="window.open('https://www.massdrop.com/?referer=LNWNLL', '_blank');" style="color:#ffffff;">Massdrop<img src="data/site/icons/massdrop.png"></div> <!-- </div>-->
</div>
</div>
<div class="layer"> <div class="layer">
<div class="title">Have Any Questions?</div> <div class="title">Have Any Questions?</div>
<div class="paragraph indent"> <div class="paragraph indent">
@@ -190,4 +188,4 @@
<script src="data/scripts/colors.js"></script> <script src="data/scripts/colors.js"></script>
<script src="data/site/main.js"></script> <script src="data/site/main.js"></script>
<script src="data/scripts/setCodeList.js"></script> <script src="data/scripts/setCodeList.js"></script>
<html> <html>