Merge branch 'doin_shit_on_laptop'

Conflicts:
	includes/datas.php

also fixed some stuffs

1 files changed, 19 insertions, 17 deletions

diff --git a/css/challenge.css b/css/challenge.css
index 16c7357..143da08 100644
--- a/css/challenge.css
+++ b/css/challenge.css
@@ -40,21 +40,6 @@
 	display: none;
 }
 
-.challengelist_map {
-	float:left;
-	padding: 15px;
-	background-color:#333;
-	margin: 20px;
-	border-radius:10px;
-	cursor:pointer;
-}
-.challengelist_map:hover {
-	background-color:#444;
-}
-.challengelist_tier {
-	border-width: 0px 0px 1px 1px;
-}
-
 /** Challenge listing page **/
 #challengelist_wrapper #challengelist {}
 #challengelist_wrapper #challengelist .challengelist_tier {
@@ -69,12 +54,14 @@
 	width: 32px;
 	height: 32px;
 	background-image: url("../images/challenge_complete.png");
-	float: left;
 }
 .challengelist_incomplete {
 	width: 32px;
 	height: 32px;
 	background-image: url("../images/challenge_incomplete.png");
+}
+.challengelist_map .challengelist_complete,
+.challengelist_map .challengelist_incomplete {
 	float: left;
 }
 .challengelist_map {
@@ -87,4 +74,19 @@
 }
 .challengelist_map:hover {
 	background-color:#444;
-}
\ No newline at end of file
+}
+.challengelist_tier {
+	border-width: 0px 0px 1px 1px;
+}
+.challengelist_nexttier {
+	text-align: center;
+	margin-bottom: 10px; /*Must be same as .challengelist_nexttier .challengelist_complete top */
+}
+.challengelist_nexttier_requirement {
+
+}
+.challengelist_nexttier .challengelist_complete {
+	display: inline-block;
+	position: relative;
+	top: 10px;
+}