diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-06-22 15:30:29 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-06-22 15:30:29 +0200 |
| commit | 9dde4823154334645ca89dde14561a0c29e2775e (patch) | |
| tree | 1ae0a5b4383dea41177aa8efe337a430e2562aab | |
| parent | 8eda9ae83cb8fe1c1333531e06bdd9fbdbb0b8f8 (diff) | |
| download | nextcloud-server-9dde4823154334645ca89dde14561a0c29e2775e.tar.gz nextcloud-server-9dde4823154334645ca89dde14561a0c29e2775e.zip | |
remove whitespace on bottom when no search results, fix laylout, fix #16878
| -rw-r--r-- | apps/files/js/filelist.js | 4 | ||||
| -rw-r--r-- | core/search/css/results.css | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 400b1729dd9..ed83c2be9df 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1708,13 +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'); - $('#app-content-files').addClass('filter-empty'); + $('#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 { - $('#app-content-files').removeClass('filter-empty'); + $('#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; |