Merge pull request #183 from simonlnu/master

final pull req for now. really fixed.

2 files changed, 4 insertions, 12 deletions

diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index f06a97a5f..cebe9eb4f 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -91,13 +91,13 @@ $(document).ready(function() {
             $('.floaterflip').css({
                 backgroundPosition: '-210px -60px' 
             });
-			$('.search-box').slideDown('fast');
+			$('.search-box').slideUp('fast');
         } else {
             $('#nav-floater').slideDown('fast');
             $('.floaterflip').css({
                 backgroundPosition: '-190px -60px'
             });
-			$('.search-box').slideUp('fast');
+			$('.search-box').slideDown('fast');
         }
     };
 	// our trigger for the toolbar button
@@ -156,10 +156,6 @@ function dispydark_community_info() {
 	$a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
-// use our 'default.php' instead of the system-wide one
-$theme_name = 'dispy-dark';
-//$a->page['template'] = "theme/dispy-dark/default";
-
 // aside on profile page
 if ($a->argv[0] === "profile") {
 	dispydark_community_info();
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 15e54f7e2..9789fd0fa 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -91,13 +91,13 @@ $(document).ready(function() {
             $('.floaterflip').css({
                 backgroundPosition: '-210px -60px' 
             });
-			$('.search-box').slideDown('fast');
+			$('.search-box').slideUp('fast');
         } else {
             $('#nav-floater').slideDown('fast');
             $('.floaterflip').css({
                 backgroundPosition: '-190px -60px'
             });
-			$('.search-box').slideUp('fast');
+			$('.search-box').slideDown('fast');
         }
     };
 	// our trigger for the toolbar button
@@ -156,10 +156,6 @@ function dispy_community_info() {
 	$a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
-// use our 'default.php' instead of the system-wide one
-$theme_name = 'dispy';
-//$a->page['template'] = "theme/dispy/default";
-
 // aside on profile page
 if ($a->argv[0] === "profile") {
 	dispy_community_info();