Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert

.bowerrc

@@ -1,8 +1,8 @@
 {
-  "directory": "public/bower_components",
+  "directory": "common/public/bower_components",
   "storage" : {
     "packages" : ".bower-cache",
     "registry" : ".bower-registry"
   },
   "tmp" : ".bower-tmp"
-}
+}

.gitignore

@@ -1,12 +1,13 @@
 .DS_Store
-public/gen
+common/public/gen
 node_modules
 *.swp
 .idea*
 config.json
 npm-debug.log
 lib
-public/bower_components
+common/public/bower_components
+common/public/sprites
 build
 newrelic_agent.log
 .bower-tmp
@@ -19,6 +20,6 @@ src/*/*.map
 src/*/*/*.map
 test/*.js
 test/*.map
-public/docs
+common/public/docs
 *.sublime-workspace
 coverage.html

Gruntfile.js

@@ -58,7 +58,7 @@ module.exports = function(grunt) {
       build: {
         files: [
           {expand: true, cwd: 'public/', src: 'favicon.ico', dest: 'build/'},
-          {expand: true, cwd: 'public/', src: 'bower_components/habitrpg-shared/dist/spritesmith.png', dest: 'build/'},
+          {expand: true, cwd: 'public/', src: 'bower_components/habitrpg-shared/dist/spritesmith*.png', dest: 'build/'},
           {expand: true, cwd: 'public/', src: 'bower_components/habitrpg-shared/img/sprites/backer-only/*.gif', dest: 'build/'},
           {expand: true, cwd: 'public/', src: 'bower_components/habitrpg-shared/img/sprites/npc_ian.gif', dest: 'build/'},
           {expand: true, cwd: 'public/', src: 'bower_components/bootstrap/dist/fonts/*', dest: 'build/'}

common/public/css/game-pane.styl

@@ -1,6 +1,9 @@
 .border-right
     border-right 1px solid #ddd
 
+.border-left
+    border-left 1px solid #ddd
+
 .tab-notification
     color #fff
     background-color #51a351

common/public/css/shared.styl

@@ -38,6 +38,10 @@ a.hint:hover
 .vertical-20
   vertical-align: 20%
 
+.popover
+  hr
+    margin: 10px 0
+
 @media (max-width: 768px)
   .container-fluid
     padding-right: 5px

common/public/css/tasks.styl

@@ -491,29 +491,38 @@ form
 // Habits – task button styles (+ -)
 .habits
   .task-actions
-    display: inline-block
     width: 3em
     height: 100%
+    
     a
-      display: table;
+      display: block
       width: 100%
       height: 100%
+      position: relative
       font-size: 0.8em
+      
       span
-        display: table-cell
-        text-align: center
-        vertical-align: middle
-        width: 100%
-        height: 100%
+        position: absolute
+        margin: auto
+        display: block
+        height: 1em
+        width: 1em
+        top: 0
+        left: 0
+        bottom: 0
+        right: 0
+        
       &:hover, &:focus
         color: #222
         text-decoration: none
+
   .habit-wide
     // When there are two buttons...
     min-height: 4.5em
     .task-actions
       a
         height: 50%
+
   .habit-narrow
     // When there are no buttons...
     .task-actions
@@ -604,4 +613,4 @@ form
         margin: auto
     .shop_gold + .reward-cost
       line-height: 1
-      top: -0.1em       
+      top: -0.1em