diff --git a/public/javascripts/rails.js b/public/javascripts/rails.js index 9c332e471..080fbac5b 100644 --- a/public/javascripts/rails.js +++ b/public/javascripts/rails.js @@ -126,4 +126,4 @@ jQuery(function ($) { .val(input.data('enable-with')); }); }); -}); \ No newline at end of file +}); diff --git a/public/javascripts/view.js b/public/javascripts/view.js index 6022cf1a8..88aeacaf6 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -14,13 +14,10 @@ $(document).ready(function(){ }); }); - - $("label").inFieldLabels(); $('#flash_notice, #flash_error, #flash_alert').delay(2500).slideUp(130); - $("#stream li").live('mouseover',function() { $(this).children(".destroy_link").fadeIn(0); }); @@ -49,15 +46,14 @@ $(document).ready(function(){ return $(':input',this).clearForm(); if (type == 'text' || type == 'password' || tag == 'textarea') this.value = ''; - else if (type == 'checkbox' || type == 'radio') - this.checked = false; + //else if (type == 'checkbox' || type == 'radio') + //this.checked = false; else if (tag == 'select') this.selectedIndex = -1; $(this).blur(); }); - }; - + $("div.image_cycle").cycle({ fx: 'fade', random: 1, diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 34cfe4904..7c113b58a 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -440,18 +440,17 @@ h1.big_text { font-size: 14px; } #group ul > li { display: inline; - margin-right: 1.5em; - padding: 0.3em 0.5em; } - #group ul > li:hover { + margin-right: 1.5em; } + #group ul > li:hover a { background-color: #333333; } #group ul > li a { - color: #999999; } - #group ul > li a:hover { - background: none; } - #group ul .selected { - background-color: white; } - #group ul .selected a { - color: black; } + color: #999999; + padding: 0.3em 0.5em; } + #group ul .selected a { + background-color: white; + color: black; } + #group ul .selected:hover a { + background-color: #eeeeee; } #friend_pictures img { height: 40px; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index c549fffae..cde309639 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -561,23 +561,25 @@ h1.big_text :margin :right 1.5em - :padding 0.3em 0.5em - &:hover - :background - :color #333 + a + :background + :color #333 a :color #999 + :padding 0.3em 0.5em - &:hover - :background none .selected - :background - :color #fff a + :background + :color #fff :color #000 + &:hover + a + :background + :color #eee #friend_pictures img