aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-28 05:16:25 -0700
committerfriendica <info@friendica.com>2012-03-28 05:16:25 -0700
commite894775a39920edc0e438364c818357ab809bace (patch)
tree4a6bb4ae76c0b294714f92c41bd42c9daac09323 /view/theme
parentb58dc431481d6afb7af9f571932d1d215a079d12 (diff)
parent3db94d5212791c788aba9d053e6d742b40a2e0c7 (diff)
downloadvolse-hubzilla-e894775a39920edc0e438364c818357ab809bace.tar.gz
volse-hubzilla-e894775a39920edc0e438364c818357ab809bace.tar.bz2
volse-hubzilla-e894775a39920edc0e438364c818357ab809bace.zip
Merge branch 'pull'
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/dispy-dark/theme.php7
-rw-r--r--view/theme/dispy/theme.php7
2 files changed, 4 insertions, 10 deletions
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index 372757752..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,9 +156,6 @@ function dispydark_community_info() {
$a->page['aside_bottom'] = replace_macros($tpl, $aside);
}
-// use our 'default.php' instead of the system-wide one
-$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 190872d01..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,9 +156,6 @@ function dispy_community_info() {
$a->page['aside_bottom'] = replace_macros($tpl, $aside);
}
-// use our 'default.php' instead of the system-wide one
-$a->page['template'] = "theme/dispy-dark/default";
-
// aside on profile page
if ($a->argv[0] === "profile") {
dispy_community_info();