From d6b3279e5c64f52822b695626140a2cf56684ef3 Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Thu, 6 Feb 2014 18:35:12 +0100
Subject: [PATCH] refactor(bs3): misc fixes

---
 public/css/footer.styl              |  1 +
 public/css/index.styl               | 28 ++--------------------------
 public/css/tasks.styl               |  4 +---
 public/js/controllers/groupsCtrl.js |  4 ++--
 4 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/public/css/footer.styl b/public/css/footer.styl
index 31cddc1e2e..ad03be3f23 100644
--- a/public/css/footer.styl
+++ b/public/css/footer.styl
@@ -4,5 +4,6 @@
 .footer
     padding-top: 20px
     margin-top: 40px
+    padding-bottom: 20px
     border-top: 1px solid #e5e5e5
     background-color: #f5f5f5
\ No newline at end of file
diff --git a/public/css/index.styl b/public/css/index.styl
index 89f7b90743..edfc5ed750 100644
--- a/public/css/index.styl
+++ b/public/css/index.styl
@@ -25,10 +25,7 @@
 @import "./classes.styl"
 @import "./quests.styl"
 @import "./shared.styl"
-
-// fix exploding to very wide for some reason
-.datepicker
-  width: 210px
+@import "./footer.styl"
 
 html,body,p,h1,ul,li,table,tr,th,td
   margin: 0
@@ -45,29 +42,8 @@ hr
   border-bottom: 1px solid #ddd
   border-color: rgba(0,0,0,0.1)
 
-
-/* Footer
--------------------------------------------------- */
-
-/* Bootstrap website boilerplate */
-.footer 
-  padding: 70px 0
-  border-top: 1px solid #e5e5e5
-  background-color: #f5f5f5
-
-.footer p 
-  margin-bottom: 0
-  color: #777
-
-.footer-links 
-  margin: 10px 0
-
-.footer-links li
-  display: inline
-  margin-right: 10px
-
 /* Customizations to make footer sticky */
-/*html, body {height: 100%;}*/
+
 #wrap
   z-index:-1
   padding: 0 15px // Required by Bootstrap 3 when using .container-fluid
diff --git a/public/css/tasks.styl b/public/css/tasks.styl
index 5175732a56..ed44a187ad 100644
--- a/public/css/tasks.styl
+++ b/public/css/tasks.styl
@@ -147,11 +147,10 @@ for $stage in $stages
   padding-left: 7em
 
 // when a task is being dragged
-.task.ui-sortable-helper {
+.task.ui-sortable-helper
   box-shadow: 0 0 3px rgba(0,0,0,0.15), 0 0 5px rgba(0,0,0,0.1)
   transform: scale(1.05)
   outline: 1px solid rgba(0,0,0,0.2)
-}
 
 // primary task commands
 // ----------------------
@@ -310,7 +309,6 @@ form
 [class$="-options"]
   padding: 1em 1em 0
   color: #333
-  z-index: 0
   position: relative
   //background-color:
 
diff --git a/public/js/controllers/groupsCtrl.js b/public/js/controllers/groupsCtrl.js
index 3b259c3019..9a97d9b1c3 100644
--- a/public/js/controllers/groupsCtrl.js
+++ b/public/js/controllers/groupsCtrl.js
@@ -99,8 +99,8 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
     $scope.$watch('group.chat',$scope.chatChanged);
     
     $scope.caretChanged = function(newCaretPos) {
-      var relativeelement = $('.-options');
-      var textarea = $('.chat-textarea');
+      var relativeelement = $('.chat-form div:first');
+      var textarea = $('.chat-form textarea');
       var userlist = $('.list-at-user');
       var offset = {
         x: textarea.offset().left - relativeelement.offset().left,