General Code Cleanup

Fixing a VERY old mistake.

Author: farfromunique

README.md

@@ -6,10 +6,7 @@ A character creation guide (with minimal rules-checking) for Vampire: the Masque
 Compatibility
 ==============
 Browser compatibility tracker: Issue #19
-<<<<<<< HEAD
-=======
 
->>>>>>> origin/PHP-ify
 Tested and developed in Chrome 32.0.1700.107 m using no addons. (2/11/2014)
 Tested and passed in Firefox 27 using no addons. (2/14/2014)
 

basic.css

@@ -24,7 +24,6 @@ input[type=text] {
 	right: 5px;
 }
 
-<<<<<<< HEAD
 /* Dots */
 .dots {
 	width: 20px;
@@ -62,18 +61,7 @@ input[type=text] {
 	width: 12px;
 	height: 12px;
 	background: #000;
-
 	-webkit-border-radius: 15px;
-=======
-.holder {
-	width: 850px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-.characterBox {
-	border: 1px black solid;
->>>>>>> origin/PHP-ify
 	border-radius: 15px;
 	width: 148px;
 	height: 148px;
@@ -106,7 +94,6 @@ input[type=text] {
 	margin: 0px;
 }
 
-<<<<<<< HEAD
 /* bloodPool */
 .bloodPool {
 	width: 20px;
@@ -157,7 +144,7 @@ input[type=text] {
 }
 
 .bloodPool input[type=checkbox]:checked + label {
-visibility: hidden;
+	visibility: hidden;
 }
 
 .bloodPool input[type=checkbox]:checked + label:after {
@@ -174,10 +161,6 @@ visibility: hidden;
 /* Character Sheet sections */
 #text1 {
 	text-align: left;
-=======
-.spacer {
-	height: 30px;
->>>>>>> origin/PHP-ify
 }
 
 #newCharacter {
@@ -244,11 +227,6 @@ visibility: hidden;
 	background-image: url('images/tremere-light.png');
 }
 
-<<<<<<< HEAD
-.checks {
-	position: absolute;
-	left: 30;
-=======
 .Tremere:hover {
 	background: rgba(0, 0, 0, 0.75);
 	background-image: url('images/tremere.png');
@@ -257,7 +235,6 @@ visibility: hidden;
 
 .Ventrue {
 	background-image: url('images/ventrue-light.png');
->>>>>>> origin/PHP-ify
 }
 
 .Ventrue:hover {

classes/attribute.class.php

@@ -82,5 +82,4 @@ private function buildPrint() {
 	public function showPrint() {
 		return $this->printCode;
 	}
-}
-?>
+}

classes/attributeGroup.class.php

@@ -47,4 +47,3 @@ public function showPrint() {
 		return $this->printCode;
 	}
 }
-?>

classes/blood.class.php

@@ -43,4 +43,3 @@ public function showPrint() {
 		return $this->printCode;
 	}
 }
-?>

classes/bloodPool.class.php

@@ -60,4 +60,3 @@ public function showPrint() {
 		return $this->printCode;
 	}
 }
-?>

classes/dot.class.php

@@ -46,4 +46,3 @@ public function showPrint() {
 		return $this->printCode;
 	}
 }
-?>

classes/navbar.class.php

@@ -95,4 +95,3 @@ public function showBackgrounds() {
 			return $this->backgroundCode;
 		}
 	}
-?>

classes/parser.class.php

@@ -48,4 +48,3 @@ public function stringToArray($string) {
 			return $output;
 		}
 	}
-?>

classes/printable.class.php

@@ -27,7 +27,7 @@ private function buildCode() {
 
 								'<div id="plainText" class="section">' . "\n";
 
-					$this->code .= '<div id="text1" class="lefty">' . "\n" .
+			$this->code .=		'<div id="text1" class="lefty">' . "\n" .
 										'Character\'s Name:' . "\n" .
 										'<span class="plain">' . $this->data['fluff']['character'] . '</span>' . "\n" .
 										'<br />' . "\n" .
@@ -139,14 +139,12 @@ private function buildCode() {
 								break;
 						}
 					}
-			$this->code .= 	'</div>' . "\n";
+				$this->code .= 	'</div>' . "\n";
+				}
 			}
 		}
-		}
 
 		public function showCode() {
 			return $this->code;
 		}
 	}
-
-?>

main.js

@@ -12,23 +12,11 @@ function disableDotsInGroup(groupName) /* str, dex, etc */ {
 		};
 
 	} else if (groupName == 'bloodPool') {
-<<<<<<< HEAD
-		
 		var blood = document.getElementsByClassName('blood');
 
 		for (var i=0;i<blood.length;i++) {
 			blood[i].disabled = true;
 		}
-		
-=======
-		
-		var blood = document.getElementsByClassName('blood');
-		
-		for (var i=0;i<blood.length;i++) {
-			blood[i].disabled = true;
-		}
-		
->>>>>>> origin/PHP-ify
 	} else {
 
 		var dots = [];

printme.php

@@ -221,5 +221,4 @@
 			'checked' => 1
 		],
 		'blood' =>  10
-	];
-	?>
+	];

sheet.css

@@ -281,6 +281,8 @@ input[type=checkbox] {
 	/* Internet Explorer */
 	filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
 
+	/* Everything else */
+	transform: rotate(-90deg);
 }
 
 #phasesBody {
@@ -346,7 +348,8 @@ li {
 
 /* Print styles */
 .plain {
-font-weight: normal;
-text-align: right;
-position: absolute;
-right: 10;
+	font-weight: normal;
+	text-align: right;
+	position: absolute;
+	right: 10;
+}