Merge pull request #66 from SpencerCooley/master

Fixed the global scroll issue

Gemfile

@@ -21,7 +21,7 @@ gem 'aws-sdk'
 gem 'paperclip'
 gem 'remotipart'
 gem 'jquery-rails'
-
+gem 'rb-readline'
 # Making the world a better, more stable place
 gem 'airbrake'
 

Gemfile.lock

@@ -190,6 +190,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
+    rb-readline (0.4.2)
     rdoc (3.12)
       json (~> 1.4)
     remotipart (1.0.2)
@@ -286,6 +287,7 @@ DEPENDENCIES
   pry-rails
   quiet_assets
   rails (= 3.2.11)
+  rb-readline
   remotipart
   rspec-rails
   sass-rails

app/assets/javascripts/backbone/views/channel_pane.js.coffee

@@ -11,6 +11,7 @@ class Kandan.Views.ChannelPane extends Backbone.View
 
   setIdAndData: (container)->
     $(container).attr "id", "channels-#{@options.channel.get("id")}"
+    $(container).attr "class", "channels-pane"
     $(container).data "channel-id", @options.channel.get('id')
 
   paginatedActivitiesView: ()->

app/assets/stylesheets/_chat_area.sass

@@ -1,5 +1,7 @@
 #channels
-  margin-top: 0px
+  margin-top: 12px
+  overflow: hidden
+  height: 105%
 
 .ui-widget-header
   background: transparent !important
@@ -109,7 +111,7 @@ html body .ui-tabs .ui-tabs-nav li
   background: #FFF
   padding: 10px
   min-height: 110%
-  padding-bottom: 70px
+  padding-bottom: 0px
   .pagination
     text-decoration: underline
     cursor: pointer
@@ -120,7 +122,8 @@ html body .ui-tabs .ui-tabs-nav li
   padding: 0px
   padding-right: 20px
   padding-left: 20px
-
+
+
 #mask_container
   position: fixed
   top: 0px
@@ -143,8 +146,8 @@ html body .ui-tabs .ui-tabs-panel, html body #app_body .main-area #mask_containe
 html body #app_body .main-area #head-mask
   min-height: 0 !important
   padding-bottom: 0px !important
-  height: 20px
-  +box-shadow(0px 10px 5px -3px #FFFFFF, 0px 7px 4px -3px #FFFFFF, 6px 3px 3px -3px #cccccc, -5px 3px 5px -2px #cccccc)
+  height: 35px
+  +box-shadow(0px 5px 0px 0px #FFFFFF, 0px 5px 0px 0px #FFFFFF, 6px 3px 3px -3px #cccccc, -5px 3px 5px -2px #cccccc)
 
 /* html body .ui-tabs .ui-tabs-panel
 /*   padding: 0px !important
@@ -193,3 +196,12 @@ html body #app_body .main-area #head-mask
   margin-left: -16px
   width: 81%
   background: #E6EBEE url("/assets/page_bg.png") repeat
+
+.channels-pane
+  overflow-y: auto
+  margin-right: -15px
+  margin-top: -13px
+
+
+
+

app/views/main/index.html.erb

@@ -6,6 +6,7 @@
 
 
 
+
 <div id="kandan">
   <div class="header">
     <%= image_tag "logo.png", :class=>"logo" %>