From ed2bbb2b608a8005bf09b74059431b13b2096864 Mon Sep 17 00:00:00 2001 From: Kev Zettler Date: Mon, 2 Apr 2012 13:35:12 -0700 Subject: [PATCH] tab styling --- app/assets/javascripts/backbone/kandan.js.coffee | 2 +- app/assets/stylesheets/_chat_area.sass | 16 ++++++++++++++-- app/assets/templates/chatarea.jst.eco | 7 +++++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/backbone/kandan.js.coffee b/app/assets/javascripts/backbone/kandan.js.coffee index a856d1a0..e5b4257d 100644 --- a/app/assets/javascripts/backbone/kandan.js.coffee +++ b/app/assets/javascripts/backbone/kandan.js.coffee @@ -47,7 +47,7 @@ window.Kandan = $("#channels").tabs 'option', 'tabTemplate', '''
  • #{label} - x + x
  • ''' diff --git a/app/assets/stylesheets/_chat_area.sass b/app/assets/stylesheets/_chat_area.sass index 30a4efa5..39e541fa 100644 --- a/app/assets/stylesheets/_chat_area.sass +++ b/app/assets/stylesheets/_chat_area.sass @@ -9,7 +9,19 @@ background: $active-tab-bg border: none a - color: $active-tab-color + color: $active-tab-color !important + +html body .ui-tabs .ui-tabs-nav li + top: 3px !important + margin-right: 5px + +a.ui-icon-close + margin-top: 4px + color: $header-bg-1 + cursor: hover + +.create_channel + cursor: hover .ui-tabs +border-radius(0px) @@ -18,7 +30,7 @@ border: none .ui-tabs-nav position: fixed - top: 2px + top: 0px left: 90px z-index: 20 li a diff --git a/app/assets/templates/chatarea.jst.eco b/app/assets/templates/chatarea.jst.eco index 6f0d847d..34dd5db6 100644 --- a/app/assets/templates/chatarea.jst.eco +++ b/app/assets/templates/chatarea.jst.eco @@ -1,9 +1,12 @@