Fix #197

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

css/upload.css

@@ -37,9 +37,11 @@
 }
 
 .newFileMenu {
-	width: 140px;
-	margin-left: -56px;
-	margin-top: 25px;
+	font-weight: 300;
+	top: 100%;
+	margin-top: 4px;
+	min-width: 100px;
+	margin-left: 7px;
 	z-index: 1001;
 }
 
@@ -51,39 +53,16 @@
 	box-shadow: 0 0 6px #f8b9b7;
 }
 
-.newFileMenu .menuitem {
-	white-space: nowrap;
-	overflow: hidden;
-}
 .newFileMenu.popovermenu .menuitem .icon {
 	margin-bottom: -2px;
 }
-.newFileMenu.popovermenu a.menuitem,
-.newFileMenu.popovermenu label.menuitem,
-.newFileMenu.popovermenu .menuitem {
-	padding: 0;
-	margin: 0;
-}
-
-.newFileMenu.popovermenu a.menuitem.active {
-	opacity: 1;
-}
-
-.newFileMenu.bubble:after {
-	left: 75px;
-	right: auto;
-}
-.newFileMenu.bubble:before {
-	left: 75px;
-	right: auto;
-}
 
 .newFileMenu .filenameform {
 	display: inline-block;
 }
 
 .newFileMenu .filenameform input {
-	width: 100px;
+	margin: 2px 0;
 }
 
 #fileList .popovermenu .action {

js/galleryview.js

@@ -569,7 +569,7 @@
 			}
 			if (!this._newFileMenu) {
 				this._newFileMenu = new Gallery.NewFileMenu();
-				$('body').append(this._newFileMenu.$el);
+				$('.actions').append(this._newFileMenu.$el);
 			}
 			this._newFileMenu.showAt($target);
 

js/vendor/owncloud/newfilemenu.js

@@ -31,7 +31,8 @@
 	 */
 	var NewFileMenu = OC.Backbone.View.extend({
 		tagName: 'div',
-		className: 'newFileMenu popovermenu bubble hidden open menu',
+		// Menu is opened by default because it's rendered on "add-button" click
+		className: 'newFileMenu popovermenu bubble menu open menu-left',
 
 		events: {
 			'click .menuitem': '_onClickAction'
@@ -126,13 +127,6 @@
 		 */
 		showAt: function ($target) {
 			this.render();
-			var targetOffset = $target.offset();
-			this.$el.css({
-				left: targetOffset.left,
-				top: targetOffset.top + $target.height()
-			});
-			this.$el.removeClass('hidden');
-
 			OC.showMenu(null, this.$el);
 		}
 	});