Change javascript to work as chall suggested

lance · Mar 16, 2011 · 7598806 · 7598806
1 parent 936f15c
commit 7598806
Show file tree

Hide file tree

Showing 4 changed files with 124 additions and 126 deletions.
diff --git a/themes/magneticfield/javascripts/site.js b/themes/magneticfield/javascripts/site.js
@@ -11,6 +11,8 @@ $(document).ready(function($) {
 
   $('#filters .filter').bind('click', function() {
     $(this).toggleClass('active')
+    $(this).siblings().removeClass('active')
+    $('#events .event').hide()
     $('#events .event.'+$(this).attr('rel')).toggle()
   })
 

diff --git a/themes/magneticfield/sass/screen.scss b/themes/magneticfield/sass/screen.scss
@@ -251,33 +251,34 @@ body.bp p {
     font-size: 24px;
     text-align: center;
     margin-bottom: 10px;
+    background-color: #444;
     @include rounded_corners;
   }
+  .filter:hover { cursor: pointer; background-color: #222; }
 
-  .filter.theatre { color: $theatre_color - 50; }
-  .filter.comedy { color: $comedy_color - 50; }
-  .filter.music { color: $music_color - 50; }
-  .filter.other { color: $other_color - 50; }
-  .filter.theatre:hover { color: $theatre_color; }
-  .filter.comedy:hover { color: $comedy_color; }
-  .filter.music:hover { color: $music_color; }
-  .filter.other:hover { color: $other_color; }
+  .filter.theatre { color: $theatre_color; }
+  .filter.comedy { color: $comedy_color; }
+  .filter.music { color: $music_color; }
+  .filter.other { color: $other_color; }
 
-  .filter { background-color: #444; }
-  .filter:hover { cursor: pointer; background-color: #555; }
+  .filter.active:hover { background-color: #444; }
+  .filter.theatre:hover { color: $theatre_color - 50; }
+  .filter.comedy:hover { color: $comedy_color - 50; }
+  .filter.music:hover { color: $music_color - 50; }
+  .filter.other:hover { color: $other_color - 50; }
 
-  .filter.active.theatre { color: $theatre_color; }
-  .filter.active.comedy { color: $comedy_color; }
-  .filter.active.music { color: $music_color; }
-  .filter.active.other { color: $other_color; }
+  .filter.active { background-color: #222; }
 
-  .filter.active { background-color: #555; }
+  .filter.active.theatre { color: $theatre_color - 50; }
+  .filter.active.comedy { color: $comedy_color - 50; }
+  .filter.active.music { color: $music_color - 50; }
+  .filter.active.other { color: $other_color - 50; }
+
+  .filter.active.theatre:hover { color: $theatre_color; }
+  .filter.active.comedy:hover { color: $comedy_color; }
+  .filter.active.music:hover { color: $music_color; }
+  .filter.oactive.ther:hover { color: $other_color; }
 
-  .filter.active:hover { background-color: #444; cursor: pointer; }
-  .filter.active.theatre:hover { color: $theatre_color - 50; }
-  .filter.active.comedy:hover { color: $comedy_color - 50; }
-  .filter.active.music:hover { color: $music_color - 50; }
-  .filter.active.other:hover { color: $other_color - 50; }
 
 }
 
@@ -287,6 +288,7 @@ body.bp p {
 }
 
 #body_content.no_body_content_right #body_content_left {
+
   width: 870px;
 }