Aligns chatbox with chatarea

Signed-off-by: Akash Manohar J <akash@akash.im>
kandanapp · Mar 28, 2012 · 2927623 · 2927623
1 parent cdb8154
commit 2927623
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,7 +14,6 @@
 //= require jquery-ui
 //= require jquery_ujs
 //= require lib/jquery.filedrop
-//= require jquery.remotipart
 //= require lib/underscore
 //= require lib/backbone
 //= require backbone/kandan

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -38,6 +38,7 @@ body {
   height: 90%;
   min-height: 90%;
   font-size: 13px;
+  font-family: 'PT Sans', sans-serif;
 }
 
 
@@ -128,6 +129,7 @@ body {
         clear: both;
         background: #F3F8F9;
         padding-left: 10px;
+        font-size: 13px;
       }
 
       .action_bar {
@@ -153,11 +155,11 @@ body {
   @include background-image(linear-gradient($widget-title-bg-1, $widget-title-bg-2));
   @include box-shadow(5px 0px 5px -3px #CCC, -5px 0px 5px -3px #CCC, 0px 5px 5px 0px #CCC);
   border-top: 1px solid #EBEFF1;
-  margin: 0px 20px 0px 20px;
   padding: 10px 0px 10px 10px;
-  position: fixed;
+  position: relative;
   bottom: 20px;
-  width: $main-area-width - 3.2%;
+  margin-left: 20px;
+  margin-right: 21px;
 
   textarea {
     @include border-top-left-radius(4px);
@@ -205,6 +207,8 @@ body {
 
   .ui-tabs-nav {
     border-right: 1px solid #404A4D;
+    position: fixed;
+    width: 100%
   }
 
   .ui-tabs-panel {
@@ -217,10 +221,10 @@ body {
   }
 
   .ui-widget-content {
-    height: 93%;
-    min-height: 93%;
-    margin-bottom: 200px;
+    // position: relative;
     overflow-y: scroll;
+    margin-top: 20px;
+    bottom: 80px;
   }
 
   .ui-tabs-nav
@@ -330,7 +334,6 @@ body {
 //
 
 .user_list {
-  font-size: 13px;
   padding-bottom: 10px;
   float: left;
 
@@ -377,7 +380,6 @@ body {
     line-height: 25px;
     color: #585D5F;
     a {
-      font-size: 12px;
       text-decoration: none;
       font-weight: bold;
       color: #585D5F;

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -3,6 +3,7 @@
 <head>
   <title>Kandan</title>
   <%= stylesheet_link_tag  "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/ui-lightness/jquery-ui.css" %>
+  <%= stylesheet_link_tag "http://fonts.googleapis.com/css?family=PT+Sans:400,700" %>
   <%= stylesheet_link_tag  "application", :media => "all" %>
 
   <%- Kandan::Config.broadcaster.assets.each do |asset| %>