Merge branch 'develop' of github.com:lefnire/habitrpg into develop

styles/app/challenges.styl

@@ -0,0 +1,7 @@
+ul.challenge-accordion-header-specs
+    list-style:none
+
+    li
+        background-color: darken($neutral, 10%)
+        margin: 2px 5px
+        float:left

styles/app/game-pane.styl

@@ -36,4 +36,7 @@
     height: 40px
 
 .buttonList li
-    margin: 5px;
+    margin: 5px;
+    
+.option-group .option-time
+    padding: 0px 5px

styles/app/index.styl

@@ -26,6 +26,7 @@
 @import "./game-pane.styl";
 @import "./backer.styl";
 @import "./npcs.styl";
+@import "./challenges.styl";
 
 // fix exploding to very wide for some reason
 .datepicker
@@ -165,4 +166,5 @@ hr
     background-color #dfe9ea
     padding 1px 3px 1px 3px
 
-
+.nav li > a
+    cursor: pointer

styles/app/inventory.styl

@@ -42,6 +42,14 @@
     width:34px
     height:34px
 
+.Pet_Currency_Gem, .Pet_Currency_Gem2x, .Pet_Currency_Gem1x
+    background: url("/img/sprites/Egg_Sprite_Sheet.png") no-repeat
+    display:block
+
+.Pet_Currency_Gem {background-position: 0px -510px; width: 51px; height: 45px} /* Not an egg or potion so has a different size */
+.Pet_Currency_Gem2x {background-position: -55px -513px; width: 34px; height: 30px}
+.Pet_Currency_Gem1x {background-position: -63px -542px; width: 19px; height: 17px}
+
 .inventory-list li
     clear:both
 .pets-menu > div