Merge branch 'master' of github.com:Bushido/kandan

Author: sgrove

app/assets/javascripts/backbone/kandan.js.coffee

@@ -82,7 +82,7 @@ window.Kandan =
 
   initChatArea: (channels)->
     chatArea = new Kandan.Views.ChatArea({channels: channels})
-    $(".main-area").html(chatArea.render().el)
+    $(".main-area").append(chatArea.render().el)
     $(document).scrollTop($(document).height()+9000)
 
 

app/assets/stylesheets/_activity.sass

@@ -6,6 +6,7 @@
   border-bottom: 1px solid #DEE6E8
   background: #FFF
   position: relative
+  min-height: 50px
   .readable
     float: left
     width: 85%

app/assets/stylesheets/_base.sass

@@ -94,7 +94,6 @@ body
 .main-area
   width: $main-area-width
   float: left
-  border-right: 1px solid #CDD1D4
   padding-bottom: 70px
   padding-top: 22px
   height: 100%

app/assets/stylesheets/_chat_area.sass

@@ -85,12 +85,10 @@ html body .ui-tabs .ui-tabs-nav li
             text-decoration: underline
     .ui-state-active
       text-shadow: 0px 0px 2px #FFF
-  .ui-tabs-panel
-    padding: 0px
-    padding-right: 20px
-    padding-left: 20px
-  .ui-widget-content
-    height: 100%
+
+
+.ui-widget-content
+  height: 100%
 
 .ui-corner-all .ui-corner-bottom, .ui-corner-bottom, .ui-corner-left, .ui-corner-right, .ui-corner-bl, .ui-corner-br
   +border-radius(none)
@@ -103,7 +101,7 @@ html body .ui-tabs .ui-tabs-nav li
   background: $panel-bg url(image_path('page_bg.png')) repeat
   font-size: 13px
 
-.paginated-activities
+.paginated-activities, #head-mask
   +box-shadow(5px 0px 5px -3px #cccccc, -5px 0px 5px -3px #cccccc, 5px 10px 5px -3px #cccccc, -5px 10px 5px -3px #cccccc)
   +border-top-radius(4px)
   float: left
@@ -118,6 +116,39 @@ html body .ui-tabs .ui-tabs-nav li
   .channel-activities
     width: 100%
 
+.ui-tabs-panel, #mask_container
+  padding: 0px
+  padding-right: 20px
+  padding-left: 20px
+	
+#mask_container
+  position: fixed
+  top: 64px !important
+  background: #E6EBEE url("/assets/page_bg.png") repeat
+  z-index: 9002
+  padding-top: 25px
+  width: 80%
+
+.corner_cover
+  display: block
+  width: 15px
+  height: 15px
+  background: #FFF
+
+html body .ui-tabs .ui-tabs-panel, html body #app_body .main-area #mask_container
+  padding-left: 20px !important
+  padding-right: 20px !important
+
+
+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)
+
+/* html body .ui-tabs .ui-tabs-panel
+/*   padding: 0px !important
+
 .chatbox
   +border-bottom-radius(4px)
   +box-shadow(5px 0px 5px -3px #cccccc, -5px 0px 5px -3px #cccccc, 0px 5px 5px 0px #cccccc)

app/assets/stylesheets/_sidebar.sass

@@ -1,12 +1,17 @@
 .sidebar
-  padding-top: $header-height + 20
   position: fixed
   top: 0px
   right: 0px
   min-height: 100%
   height: 100%
   width: $sidebar-width
   float: right
+  border-left: 1px solid #CDD1D4
+
+.sidebar_filler
+  padding-top: $header-height + 20
+  height: 100%
+  width: 100%
   border-left: 1px solid #F2F4F6
 
 .widgets

app/views/main/index.html.erb

@@ -23,10 +23,19 @@
   </div>
 
   <div id="app_body">
-    <div class="main-area"> </div>
+    <div class="main-area">
+      <div id="mask_container">
+	<div id="head-mask">
+	  <div class="corner_cover" style="float:left;position:relative;left:-10px;"></div>
+	  <div class="corner_cover"  style="float:right;position:relative;right:-10px;"></div>
+	</div>
+      </div>
+    </div>
 
     <div class="sidebar">
-      <div class="widgets"></div>
+      <div class="sidebar_filler">
+	<div class="widgets"></div>
+      </div>
     </div>
   </div>