Merge branch 'develop' into Sinble-bug/slow_chat

website/client/css/filters.styl

@@ -28,6 +28,8 @@
         margin-right: 0.382em
       form
         display: none
+    .habitica-emoji
+      margin-top: -.5em
   markdown
     display: inline-block
   .hrpg-input-group   

website/client/css/index.styl

@@ -5,7 +5,6 @@
 // Import only styles that do not have urls to images! Include them directly in the page!
 @import "../bower_components/bootstrap-tour/build/css/bootstrap-tour.min.css"
 @import "../bower_components/angular-loading-bar/build/loading-bar.css"
-@import "../bower_components/js-emoji/emoji.css"
 @import "../bower_components/select2/select2.css"
 
 // Custom includes
@@ -201,5 +200,5 @@ a.label
 *
   image-rendering: pixelated
 
-.img-rendering-auto, .img-rendering-auto *, .emoji
+.img-rendering-auto, .img-rendering-auto *, .habitica-emoji
   image-rendering: auto

website/client/css/tasks.styl

@@ -67,6 +67,9 @@ for $stage in $stages
   color: darken($completed,30%)
   background-color: $completed
   border: 1px solid shade($completed,10%)
+  .task-text
+    color: #333
+    opacity: .39
   .priority-multiplier, .task-attributes, .repeat-days, .repeat-frequency
     li
       hrpg-button-color-mixin($completed)
@@ -234,12 +237,6 @@ for $stage in $stages
   markdown > ul > li // Otherwise, + gets turned into a bullet and gets masked by buttons
     margin-left:20px
 
-  span.emoji
-    width:1.5em
-    height:1.5em
-    background-size:1.5em
-    vertical-align: middle
-
 // when a task is being dragged
 .task.ui-sortable-helper
   box-shadow: 0 0 3px rgba(0,0,0,0.15), 0 0 5px rgba(0,0,0,0.1)