From 12cd90613ca3f888c57685eb5a626f0d3ae6b1cb Mon Sep 17 00:00:00 2001 From: Kev Zettler Date: Thu, 5 Apr 2012 14:57:45 -0700 Subject: [PATCH] fixes create tab. fixes logout menu scrolling bug --- app/assets/javascripts/application.js | 6 ++++-- app/assets/stylesheets/_base.sass | 10 ++++++++-- app/assets/templates/create_channel.jst.eco | 6 +++--- app/views/main/index.html.erb | 5 +---- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 01d96e42..4f5e617c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -20,7 +20,9 @@ //= require_tree . $(function(){ - $('.user_menu_link').click(function(){ - $('.user_menu').toggle(); + $('.user_menu_link').click(function(e){ + e.preventDefault(); + $('.user_menu').toggle(); + return false; }); }); diff --git a/app/assets/stylesheets/_base.sass b/app/assets/stylesheets/_base.sass index 2af443a4..411063cd 100644 --- a/app/assets/stylesheets/_base.sass +++ b/app/assets/stylesheets/_base.sass @@ -46,18 +46,24 @@ +border-radius(4px) position: fixed right: 0px - top: 0px + display: none + top: 0px z-index: 9000 height: 32px width: 100px padding: 5px - display: none bottom: -24px margin-top: 31px a color: #FFF +.ui-state-disabled + display: block + cursor: pointer !important + * + cursor: pointer !important + /* gotta bump stuff in the header .logo, .ui-tabs-nav padding-top: 7px !important diff --git a/app/assets/templates/create_channel.jst.eco b/app/assets/templates/create_channel.jst.eco index 6475cdf8..9c538663 100644 --- a/app/assets/templates/create_channel.jst.eco +++ b/app/assets/templates/create_channel.jst.eco @@ -1,3 +1,3 @@ -
  • - + -
  • \ No newline at end of file +
  • + + +
  • diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index dd58e959..8eac150e 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -15,8 +15,6 @@
    - -
    logout
    - -