diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2015-07-23 18:29:45 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2015-08-07 01:22:43 +0200 |
| commit | f508cf40da93eba05a17b4ffa834a125dbdb2bcb (patch) | |
| tree | de8272b93088bf8a8e57871405790e6185a7e35f /apps | |
| parent | 734c6b0b6f10cb8cb39773e1c93088c24c9f50af (diff) | |
| download | nextcloud-server-f508cf40da93eba05a17b4ffa834a125dbdb2bcb.tar.gz nextcloud-server-f508cf40da93eba05a17b4ffa834a125dbdb2bcb.zip | |
sidebar shall not overlap but shrink the contnet
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/css/detailsView.css | 13 | ||||
| -rw-r--r-- | apps/files/js/detailsview.js | 4 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 4 |
3 files changed, 15 insertions, 6 deletions
diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css index 51aaf393751..ec0d5ac2110 100644 --- a/apps/files/css/detailsView.css +++ b/apps/files/css/detailsView.css @@ -1,14 +1,18 @@ .app-files .detailsView.disappear { - margin-right: -359px; + visibility: hidden; +} + +.with-sidebar { + width: 80%; } .app-files .detailsView { - position: fixed; - width: 350px; + position: absolute; + width: 20%; top: 44px; /* main header's height */ - right: 9px; + right: 0; left: auto; bottom: 0; background-color: white; @@ -18,6 +22,7 @@ transition: margin-right 300ms; overflow-x: hidden; overflow-y: auto; + visibility: visible; } .app-files .detailsView { diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js index d4495cd8dab..0cf4ade0767 100644 --- a/apps/files/js/detailsview.js +++ b/apps/files/js/detailsview.js @@ -80,7 +80,9 @@ this._detailFileInfoViews = []; this.$el.on('click', 'a.close', function(event) { - self.$el.addClass('disappear'); + self.$el + .addClass('disappear') + .siblings('.with-sidebar').removeClass('with-sidebar'); event.preventDefault(); }); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index a03c4e1754f..7e94d5c3d4e 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -214,7 +214,7 @@ if (_.isUndefined(options.detailsViewEnabled) || options.detailsViewEnabled) { this._detailsView = new OCA.Files.DetailsView(); this._detailsView.addDetailView(new OCA.Files.MainFileInfoDetailView()); - this.$el.append(this._detailsView.$el); + this._detailsView.$el.insertAfter(this.$el); this._detailsView.$el.addClass('disappear'); } @@ -301,6 +301,7 @@ if (!fileInfo) { this._detailsView.$el.addClass('disappear'); + this.$el.removeClass('with-sidebar'); this._detailsView.setFileInfo(null); return; } @@ -312,6 +313,7 @@ this._detailsView.$el.scrollTop(0); _.defer(function() { self._detailsView.$el.removeClass('disappear hidden'); + self.$el.addClass('with-sidebar'); }); }, |