diff options
| author | VicDeo <dubiniuk@owncloud.com> | 2015-06-22 17:55:56 +0300 |
|---|---|---|
| committer | VicDeo <dubiniuk@owncloud.com> | 2015-06-22 17:55:56 +0300 |
| commit | 5cfcda3e95d0541f7f281e31067fde668f64ec44 (patch) | |
| tree | b54b37db90ada9df51a2396b41521425d494d1a4 | |
| parent | a88b370dc84c4dfdcab7a128900829fbe8204ca7 (diff) | |
| parent | 9dde4823154334645ca89dde14561a0c29e2775e (diff) | |
| download | nextcloud-server-5cfcda3e95d0541f7f281e31067fde668f64ec44.tar.gz nextcloud-server-5cfcda3e95d0541f7f281e31067fde668f64ec44.zip | |
Merge pull request #17068 from owncloud/fix_16878
fix search for results only from subfolder
| -rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
| -rw-r--r-- | core/search/css/results.css | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index b6f464bfd29..ed83c2be9df 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1708,11 +1708,13 @@ if (this._filter && this.fileSummary.summary.totalDirs + this.fileSummary.summary.totalFiles === 0) { this.$el.find('#filestable thead th').addClass('hidden'); this.$el.find('#emptycontent').addClass('hidden'); + $('#searchresults').addClass('filter-empty'); if ( $('#searchresults').length === 0 || $('#searchresults').hasClass('hidden') ) { this.$el.find('.nofilterresults').removeClass('hidden'). find('p').text(t('files', "No entries in this folder match '{filter}'", {filter:this._filter}, null, {'escape': false})); } } else { + $('#searchresults').removeClass('filter-empty'); this.$el.find('#filestable thead th').toggleClass('hidden', this.isEmpty); if (!this.$el.find('.mask').exists()) { this.$el.find('#emptycontent').toggleClass('hidden', !this.isEmpty); diff --git a/core/search/css/results.css b/core/search/css/results.css index 36a2ccc13c3..fd07561d133 100644 --- a/core/search/css/results.css +++ b/core/search/css/results.css @@ -12,6 +12,10 @@ /* account for margin-bottom in files list */ margin-top: -250px; } +#searchresults.filter-empty { + /* remove whitespace on bottom when no search results, to fix layout */ + margin-top: 0 !important; +} #searchresults.hidden { display: none; |