From 452e08b9000398065f58dbc28c1220f85f89e309 Mon Sep 17 00:00:00 2001
From: Kyle <41976328+ImKyle4815@users.noreply.github.com>
Date: Mon, 21 Oct 2019 09:14:43 -0700
Subject: [PATCH] fixes
---
data/scripts/colors.js | 8 ++++----
data/site/main.js | 6 +++---
data/site/styles.css | 8 +++++---
index.html | 26 ++++++++++++--------------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/data/scripts/colors.js b/data/scripts/colors.js
index 7a78d0c4..98b29b0f 100644
--- a/data/scripts/colors.js
+++ b/data/scripts/colors.js
@@ -1,15 +1,15 @@
//Cycles through a rainbow!
setInterval(changeColor, 100)
-var regularAdjust = -60
+var regularAdjust = 60
var lightAdjust = 100
-var lightLead = 100
+var lightLead = 128
var currentColorIndex = 0
function changeColor() {
var colors = indexToColor(currentColorIndex)
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)
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) {
var red = 0, green = 0, blue = 0
@@ -42,4 +42,4 @@ function indexToColor(colorIndex) {
break
}
return [red, green, blue]
-}
\ No newline at end of file
+}
diff --git a/data/site/main.js b/data/site/main.js
index e1984aec..d67aa632 100644
--- a/data/site/main.js
+++ b/data/site/main.js
@@ -372,9 +372,9 @@ CanvasRenderingContext2D.prototype.writeText = function(text = "", textX = 0, te
//It may be a code
wordToWrite = ""
possibleCodeLower = splitString[i].toLowerCase().replace("{", "").replace("}", "")
- if (possibleCodeLower == "line" && !oneline) {
+ if (possibleCodeLower == "line" && !oneLine) {
finishLine = true
- } else if (possibleCodeLower == "linenospace" && ! oneline) {
+ } else if (possibleCodeLower == "linenospace" && ! oneLine) {
finishLine = true
} else if (possibleCodeLower == "bar" || possibleCodeLower == "flavor") {
finishLine = true
@@ -716,4 +716,4 @@ watermarks
possibly border color?
-*/
\ No newline at end of file
+*/
diff --git a/data/site/styles.css b/data/site/styles.css
index 4e934829..53f29b37 100644
--- a/data/site/styles.css
+++ b/data/site/styles.css
@@ -40,6 +40,7 @@
--shifting-color-1-light: #c8ff64;
--light-color: #eee;
--dark-color: #333;
+ --clear-light: #1111;
}
footer {
background-color: var(--dark-color);
@@ -192,8 +193,9 @@ footer a:hover {
color: black;
font-size: 2em;
text-align: center;
+ margin: 3em 0px;
}
-.layer:nth-child(even) {
+.layer { /*:nth-child(even)*/
background-color: var(--light-color);
background-image: url(images/layerBackground.png);
background-position: center;
@@ -221,7 +223,7 @@ footer a:hover {
text-decoration: underline;
}
.donate > div {
- background-color: #1111;
+ background-color: var(--clear-light);
border-radius: 2em;
font: 2em belerenbsc;
}
@@ -273,4 +275,4 @@ footer a:hover {
grid-template-columns: repeat(auto-fit, minmax(0px, 1fr));
grid-gap: 1em;
}
-}
\ No newline at end of file
+}
diff --git a/index.html b/index.html
index 6bb3d158..c593c7f9 100644
--- a/index.html
+++ b/index.html
@@ -59,7 +59,7 @@
Select which art to use (from the entered card name)
-
Placement & Zoom:
+
Placement & Zoom:
Shift art to the right
Shift art down
Art zoom level
@@ -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, click here.
-
-
How You Can Help
-
- 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:
-
-
-
-
PucaTrade
-
-
Massdrop
-
-
+
+
+
+
+
+
+
+
+
+
Have Any Questions?
@@ -190,4 +188,4 @@
-
\ No newline at end of file
+
