upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

sidebar shall not overlap but shrink the contnet

Browse source
This commit is contained in:
Arthur Schiwon 2015-07-23 18:29:45 +02:00
parent 734c6b0b6f
commit f508cf40da
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/files/css/detailsView.css
View file

@ -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 {

4
apps/files/js/detailsview.js
View file

@ -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();
});

4
apps/files/js/filelist.js
View file

@ -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');
});
},