ui tweaks to header

kandanapp · Apr 7, 2012 · 44a8e7f · 44a8e7f
1 parent a2a5ebc
commit 44a8e7f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/app/assets/javascripts/backbone/kandan.js.coffee b/app/assets/javascripts/backbone/kandan.js.coffee
@@ -96,7 +96,7 @@ window.Kandan =
 
   setCurrentUser: ()->
     template = _.template '''
-      <img src="http://gravatar.com/avatar/<%= gravatar_hash %>?s=25&d=http://bushi.do/images/profile.png"/> <%= name %>
+      <img src="http://gravatar.com/avatar/<%= gravatar_hash %>?s=25&d=http://bushi.do/images/profile.png"/><span><%= name %></span>
     '''
     currentUser = Kandan.Helpers.Users.currentUser()
     $(".header .user").html template({

diff --git a/app/assets/stylesheets/_base.sass b/app/assets/stylesheets/_base.sass
@@ -38,7 +38,7 @@
   float: right
   width: 0
   height: 0
-  margin-top: 11px
+  margin-top: 15px
 
 .user_menu
   background-color: $header-bg-1
@@ -94,4 +94,7 @@ body
   border-right: 1px solid #CDD1D4
   padding-bottom: 70px
   padding-top: 22px
+  height: 100%
 
+#channels
+  height: 100%
diff --git a/app/assets/stylesheets/_chat_area.sass b/app/assets/stylesheets/_chat_area.sass
@@ -80,10 +80,9 @@ html body .ui-tabs .ui-tabs-nav li
   +border-top-radius(4px)
   float: left
   width: 100%
-  min-height: 88%
-  height: 88%
   background: #FFF
   padding: 10px
+  min-height: 110%
   .pagination
     text-decoration: underline
     cursor: pointer

diff --git a/app/assets/stylesheets/_sidebar.sass b/app/assets/stylesheets/_sidebar.sass
@@ -88,7 +88,7 @@
     width: 100%
     color: $search-color
     border: 2px solid darken($search-bg, 10%)
-    padding: 3px 0
+    margin-top: 2px
     padding-right: 15%
 
 
@@ -97,9 +97,14 @@
   color: #CCC
   padding-left: 10px
   padding-right: 10px
-  padding-top: 4px
+  padding-top: 7px
   height: 20px
   line-height: 20px
+  span
+    position: relative
+    left: 5px
+    top: 2px
+    padding-left: 5px
   img
     vertical-align: middle
     width: 20px