Merge branch 'master' of github.com:Bushido/Kandan

kandanapp · Apr 5, 2012 · b7be7d6 · b7be7d6
2 parents 3cda94b + 12cd906
commit b7be7d6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git 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
@@ -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
@@ -1,3 +1,3 @@
-<li class="ui-state-default ui-corner-top">
-    <span class="create_channel">+</span>
-</li>
+<li>
+   <a href="#" class="create_channel">+</a>
+</li>
diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
@@ -15,8 +15,6 @@
       <div class="user"></div>
     </a>
 
-
-
     <div class="search">
       <form method="get" action="/search" target="_blank">
 	<input type="text" class="query" name="query"/>
@@ -34,9 +32,8 @@
 
   <div id="mask">&nbsp;</div>
 
+</div>
   <div class="user_menu">
     <a href="<%= destroy_user_session_path %>">logout</a>
   </div>
 
-</div>
-