diff options
| author | Andrew Manning <tamanning@zoho.com> | 2017-01-01 07:41:36 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2017-01-01 07:41:36 -0500 |
| commit | ce87a0c1d331a9e1a1975807ab6f077a84f4a7aa (patch) | |
| tree | 6d8db4c43a7bbe084968c8b377dde336266e7830 /view | |
| parent | 2ba23ebb136b222b59bd0d59e9f606b3b5e4572c (diff) | |
| parent | e2eb0b2eac6f32a0e4781eabbb147f0bee0736fb (diff) | |
| download | volse-hubzilla-ce87a0c1d331a9e1a1975807ab6f077a84f4a7aa.tar.gz volse-hubzilla-ce87a0c1d331a9e1a1975807ab6f077a84f4a7aa.tar.bz2 volse-hubzilla-ce87a0c1d331a9e1a1975807ab6f077a84f4a7aa.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 2 | ||||
| -rwxr-xr-x | view/tpl/peoplefind.tpl | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/view/js/main.js b/view/js/main.js index 5f961f6e9..c67f1c167 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -434,12 +434,12 @@ function contextualHelp() { if(container.hasClass('contextual-help-content-open')) { container.removeClass('contextual-help-content-open'); - $('main').css('top', '') + $('main').css('margin-top', '') } else { container.addClass('contextual-help-content-open'); var mainTop = container.outerHeight(true); - $('main').css('top', mainTop + 'px'); + $('main').css('margin-top', mainTop + 'px'); } } diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index b7993ce90..395385411 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -30,7 +30,7 @@ $(document).ready(function() { } }); - if($('aside').length && $('aside').html().length === 0) { + if($('#left_aside_wrapper').length && $('#left_aside_wrapper').html().length === 0) { $('#expand-aside').hide(); } diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 0b7f792a6..ae0b7f1ea 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,7 +1,6 @@ <div id="peoplefind-sidebar" class="widget"> <h3>{{$findpeople}}</h3> <form action="directory" method="post" /> - <input type="hidden" name="navsearch" value="1" /> <div class="form-group"> <div class="input-group"> <input class="widget-input" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" /> |