summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-01-21 20:05:58 +0100
committerMorris Jobke <hey@morrisjobke.de>2017-01-22 11:45:08 -0600
commit961fcfa1fb7d3c230a87cd4a92f69fada5d325b2 (patch)
treec2a76abf2892387a79b5527c37b4fd59d5453709 /apps/files
parent418ebfbdf4c5b73fb29007c70dfde576ca799943 (diff)
downloadnextcloud-server-961fcfa1fb7d3c230a87cd4a92f69fada5d325b2.tar.gz
nextcloud-server-961fcfa1fb7d3c230a87cd4a92f69fada5d325b2.zip
Popover positionning and classes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/css/files.css4
-rw-r--r--apps/files/js/filelist.js2
-rw-r--r--apps/files/js/newfilemenu.js2
3 files changed, 6 insertions, 2 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index ada53abdc72..31e613c71cf 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -771,6 +771,10 @@ html.ie8 #controls .button.new {
font-weight: 300;
top: 100%;
margin-top: 4px;
+ width: 120px;
+ margin-left: 7px;
+ margin-top: 38px;
+ z-index: 1001;
}
.newFileMenu .filenameform {
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index f0e794cdc1e..bcada9acfe5 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -2951,7 +2951,7 @@
this._newFileMenu = new OCA.Files.NewFileMenu({
fileList: this
});
- this._newButton.append(this._newFileMenu.$el);
+ $('.actions').append(this._newFileMenu.$el);
}
this._newFileMenu.showAt($target);
diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js
index 91cf63c9508..e4023c62342 100644
--- a/apps/files/js/newfilemenu.js
+++ b/apps/files/js/newfilemenu.js
@@ -39,7 +39,7 @@
var NewFileMenu = OC.Backbone.View.extend({
tagName: 'div',
// Menu is opened by default because it's rendered on "add-button" click
- className: 'newFileMenu popovermenu bubble menu open menu-center',
+ className: 'newFileMenu popovermenu bubble menu open menu-left',
events: {
'click .menuitem': '_onClickAction'