Merge branch 'develop' into paglias/bs3

2014-02-04 20:16:00 +01:00
parent 3f4d266b00 07a47d353d
commit 685b7a3cd2
2 changed files with 11 additions and 6 deletions
@@ -15,6 +15,10 @@
 .modal-header .gem-wallet
  padding-top: 0px

+.equipment-title
+  display: inline-block
+  vertical-align: middle
+

 // pets (this will all change when pet system is overhauled)
 .pet-grid