From cd38a080f30c084fad59dad73793c2cee3726b16 Mon Sep 17 00:00:00 2001 From: Akash Manohar J Date: Wed, 28 Mar 2012 19:53:39 +0530 Subject: [PATCH 1/3] Sets color for search input text Signed-off-by: Akash Manohar J --- app/assets/stylesheets/application.css.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index a03049a0..c624db2b 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -12,6 +12,7 @@ $header-height: 30px; $header-bg-1: #566569; $header-bg-2: #3F494B; $search-bg: #5D676B; +$search-color: #CCC; $widget-title-color: #7F8587; $widget-title-bg-1: #F3F8F9; @@ -73,6 +74,7 @@ body { @include border-radius(20px); width: 100%; background: $search-bg; + color: $search-color; border: 2px solid darken($search-bg, 10%); // @include box-shadow(inset -5px -5px -5px #505A5D); } From cdb8154fed536b4e59023d32117eafe47da218a8 Mon Sep 17 00:00:00 2001 From: Akash Manohar J Date: Wed, 28 Mar 2012 21:11:26 +0530 Subject: [PATCH 2/3] Adds bushido-faye Signed-off-by: Akash Manohar J --- Gemfile | 2 +- Gemfile.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 81d0d138..e5927d5d 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'bushido' # Server/transport gems gem 'thin' -gem 'faye' +gem 'bushido-faye' # Helper gems gem 'kaminari' diff --git a/Gemfile.lock b/Gemfile.lock index 2cc925d3..173b248b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,6 +56,13 @@ GEM json (>= 1.4.6) orm_adapter (~> 0.0.3) rest-client (>= 1.6.1) + bushido-faye (0.8.1) + cookiejar (>= 0.3.0) + em-http-request (>= 0.3.0) + eventmachine (>= 0.12.0) + faye-websocket (>= 0.4.0) + rack (>= 1.0.0) + yajl-ruby (>= 1.0.0) cocaine (0.2.1) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -93,13 +100,6 @@ GEM factory_girl_rails (1.7.0) factory_girl (~> 2.6.0) railties (>= 3.0.0) - faye (0.8.1) - cookiejar (>= 0.3.0) - em-http-request (>= 0.3.0) - eventmachine (>= 0.12.0) - faye-websocket (>= 0.4.0) - rack (>= 1.0.0) - yajl-ruby (>= 1.0.0) faye-websocket (0.4.4) eventmachine (>= 0.12.0) highline (1.6.11) @@ -213,13 +213,13 @@ DEPENDENCIES aws-sdk bourbon bushido + bushido-faye coffee-rails (~> 3.2.1) devise devise_bushido_authenticatable eco execjs factory_girl_rails - faye jquery-rails kaminari paperclip From 29276231624062c19f0f672897376392f4b2ab6d Mon Sep 17 00:00:00 2001 From: Akash Manohar J Date: Thu, 29 Mar 2012 00:02:17 +0530 Subject: [PATCH 3/3] Aligns chatbox with chatarea Signed-off-by: Akash Manohar J --- app/assets/javascripts/application.js | 1 - app/assets/stylesheets/application.css.scss | 18 ++++++++++-------- app/views/layouts/application.html.erb | 1 + 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 2e374206..45d037f3 100644 --- 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 index c624db2b..38b5c75c 100644 --- 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 index 722f4e02..92c855de 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -3,6 +3,7 @@ Kandan <%= 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| %>