keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #183 from simonlnu/master

Browse source 
final pull req for now. really fixed.
This commit is contained in:
Simon 2012-03-28 03:49:10 -07:00
commit 3db94d5212
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
view/theme/dispy-dark/theme.php
View file

@ -91,13 +91,13 @@ $(document).ready(function() {
$('.floaterflip').css({ $('.floaterflip').css({
backgroundPosition: '-210px -60px' backgroundPosition: '-210px -60px'
}); });
$('.search-box').slideDown('fast'); $('.search-box').slideUp('fast');
} else { } else {
$('#nav-floater').slideDown('fast'); $('#nav-floater').slideDown('fast');
$('.floaterflip').css({ $('.floaterflip').css({
backgroundPosition: '-190px -60px' backgroundPosition: '-190px -60px'
}); });
$('.search-box').slideUp('fast'); $('.search-box').slideDown('fast');
} }
}; };
// our trigger for the toolbar button // our trigger for the toolbar button
@ -156,10 +156,6 @@ function dispydark_community_info() {
$a->page['aside_bottom'] = replace_macros($tpl, $aside); $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 // aside on profile page
if ($a->argv[0] === "profile") { if ($a->argv[0] === "profile") {
dispydark_community_info(); dispydark_community_info();

8
view/theme/dispy/theme.php
View file

@ -91,13 +91,13 @@ $(document).ready(function() {
$('.floaterflip').css({ $('.floaterflip').css({
backgroundPosition: '-210px -60px' backgroundPosition: '-210px -60px'
}); });
$('.search-box').slideDown('fast'); $('.search-box').slideUp('fast');
} else { } else {
$('#nav-floater').slideDown('fast'); $('#nav-floater').slideDown('fast');
$('.floaterflip').css({ $('.floaterflip').css({
backgroundPosition: '-190px -60px' backgroundPosition: '-190px -60px'
}); });
$('.search-box').slideUp('fast'); $('.search-box').slideDown('fast');
} }
}; };
// our trigger for the toolbar button // our trigger for the toolbar button
@ -156,10 +156,6 @@ function dispy_community_info() {
$a->page['aside_bottom'] = replace_macros($tpl, $aside); $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 // aside on profile page
if ($a->argv[0] === "profile") { if ($a->argv[0] === "profile") {
dispy_community_info(); dispy_community_info();