From f508cf40da93eba05a17b4ffa834a125dbdb2bcb Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 23 Jul 2015 18:29:45 +0200
Subject: [PATCH] sidebar shall not overlap but shrink the contnet
---
apps/files/css/detailsView.css | 13 +++++++++----
apps/files/js/detailsview.js | 4 +++-
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 51aaf39375..ec0d5ac211 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 d4495cd8da..0cf4ade076 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 a03c4e1754..7e94d5c3d4 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');
});
},
--
GitLab