summaryrefslogtreecommitdiffstats
path: root/css/challenge.css
diff options
context:
space:
mode:
Diffstat (limited to 'css/challenge.css')
-rw-r--r--css/challenge.css18
1 files changed, 18 insertions, 0 deletions
diff --git a/css/challenge.css b/css/challenge.css
index 787679f..a7f7465 100644
--- a/css/challenge.css
+++ b/css/challenge.css
@@ -40,6 +40,24 @@
display: none;
}
+<<<<<<< HEAD
+.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;
+}
+
+=======
+>>>>>>> origin/HEAD
/** Challenge listing page **/
#challengelist_wrapper #challengelist {}
#challengelist_wrapper #challengelist .challengelist_tier {