Merge pull request #12 from joshbirnholz/master

Upgrade with CompC's fork

creator/index.html

@@ -367,10 +367,14 @@
 								<input id='set-symbol-code' type='text' placeholder='Set Code' class='input' onchange='fetchSetSymbol();'>
 								<input id='set-symbol-rarity' type='text' placeholder='Rarity' class='input' onchange='fetchSetSymbol();'>
 							</div>
-							<label class='checkbox-container input margin-bottom'>Fetch from Gatherer
+							<h5 class='margin-bottom padding input-description'>Load set symbols from:</h5>
-								<input id='fetchSetSymbolFromGatherer' type='checkbox' checked onchange='fetchSetSymbol();'>
+							<div class='input-grid margin-bottom'>
-								<span class='checkmark'></span>
+								<select id='set-symbol-source' class='input' onchange='fetchSetSymbol();'>
-							</label>
+									<option value='cardconjurer'>CardConjurer</option>
+									<option value='gatherer'>Gatherer</option>
+									<option value='hexproof'>Hexproof.io</option>
+								</select>
+							</div>
 							<h5 class='collapsible collapsed padding input-description' onclick='toggleCollapse(event);'>
 								How to find set codes
 							</h5>
@@ -427,6 +431,7 @@
 								<option disabled selected='selected'>None</option>
 								<option disabled>General</option>
 								<option value="/img/watermarks/planeswalker.svg">Planeswalker</option>
+								<option value="/img/watermarks/desparked-planeswalker.svg">Desparked Planeswalker</option>
 								<option value="/img/watermarks/misc-star.svg">DCI Star</option>
 								<option value="/img/watermarks/misc-dci.svg">DCI Logo</option>
 								<option disabled>Monocolors</option>
@@ -569,7 +574,7 @@
 								<input id='info-language' type='text' class='input' oninput='bottomInfoEdited();' placeholder='Language' value='EN'>
 								<input id='info-artist' type='text' class='input' oninput='artistEdited(this.value);' placeholder='Artist'>
 							</div>
-							<div cl<!-- ass='padding input-grid'>
+							<div class='padding input-grid'>
 								<input id='info-year' type='number' class='input' oninput='bottomInfoEdited();' placeholder='0' value='1993'>
 							</div>
 						</div>
@@ -594,6 +599,25 @@
 								<span class='checkmark'></span>
 							</label>
 						</div>
+
+						<div class='readable-background padding margin-bottom'>
+							<h5 class='padding input-description'>Serial Number (leave both blank to hide)</h5>
+							<div class='padding input-grid'>
+								<input id='serial-number' type='number' class='input' oninput='serialInfoEdited();' placeholder='001' min='0' value=''>
+								<input id='serial-total' type='number' class='input' oninput='serialInfoEdited();' placeholder='500' min='0' value=''>
+							</div>
+
+							<h5 class='padding input-description'>Placement (X, Y, Scale)</h5>
+							<div class='padding input-grid'>
+								<input id='serial-x' type='number' class='input' oninput='serialInfoEdited();' min='0' value='172'>
+								<input id='serial-y' type='number' class='input' oninput='serialInfoEdited();' min='0' value='1383'>
+								<input id='serial-scale' type='number' class='input' oninput='serialInfoEdited();' min='0' step='0.01' value='1'>
+							</div>
+							<div class='padding input-grid'>
+								<button class='input' onclick='resetSerial();'>Reset Serial Number Placement</button>
+							</div>
+						</div>
+
 						<div class='readable-background padding margin-bottom'>
 							<h5 class='input-description padding margin-bottom'>Toggle between star (seen on foils) and dot (seen on regular cards)</h5>
 							<div class='padding'>

css/style-9.css

@@ -3,6 +3,10 @@
 	font-family: gothammedium;
 	src: url("../fonts/gotham-medium.ttf") format('truetype');
 }
+@font-face {
+	font-family: gothambold;
+	src: url("../fonts/gothambold.otf") format('opentype');
+}
 @font-face {
 	font-family: belerenb;
 	src: url("../fonts/beleren-b.ttf") format('truetype');
@@ -114,6 +118,8 @@
 @font-face {
 	font-family: specialelite;
 	src: url('../fonts/SpecialElite-Regular.ttf') format('truetype');
+}
+@font-face {
 	font-family: neosans;
 	src: url('../fonts/NeoSansProRegular.OTF') format('opentype');
 }
@@ -125,6 +131,30 @@
 	font-family: ocra;
 	src: url('../fonts/OCR A Std Regular.ttf') format('truetype');
 }
+@font-face {
+	font-family: decour;
+	src: url('../fonts/decour-cnd-regular.ttf') format('truetype');
+}
+@font-face {
+	font-family: decouritalic;
+	src: url('../fonts/decour-cnd-regular-italic.ttf') format('truetype');
+}
+@font-face {
+	font-family: officina;
+	src: url('../fonts/officina-ser-itc-black.otf') format('opentype');
+}
+@font-face {
+	font-family: davisonamericana;
+	src: url('../fonts/Davison Americana CG Regular.otf') format('opentype');
+}
+@font-face {
+	font-family: saloongirl;
+	src: url('../fonts/saloon-girl.ttf') format('truetype');
+}
+@font-face {
+	font-family: arialblack;
+	src: url('../fonts/arial_black.ttf') format('truetype');
+}
 /*Variables*/
 :root {
 	--site-background: url('../img/lowpolyBackground.svg');