Merge pull request #13655 from Sugaroverdose/fix_#13632

Do not change color of 'new' button on hover and make new file menu more consistent with button

2 files changed, 11 insertions, 2 deletions

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index f04d6f8352a..1d6b4ad9e07 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -13,6 +13,11 @@
 }
 .actions.hidden { display: none; }
 
+.actions.creatable {
+	position: relative;
+	z-index: -30;
+}
+
 #new {
 	z-index: 1010;
 	float: left;
@@ -34,19 +39,21 @@
 	border-bottom-left-radius: 0;
 	border-bottom-right-radius: 0;
 	border-bottom: none;
+	background: #f8f8f8;
 }
 #new > ul {
 	display: none;
 	position: fixed;
 	min-width: 112px;
-	z-index: 10;
+	z-index: -10;
 	padding: 8px;
 	padding-bottom: 0;
-	margin-top: 14px;
+	margin-top: 13.5px;
 	margin-left: -1px;
 	text-align: left;
 	background: #f8f8f8;
 	border: 1px solid #ddd;
+	border: 1px solid rgba(190, 190, 190, 0.901961);
 	border-radius: 5px;
 	border-top-left-radius: 0;
 	box-shadow: 0 2px 7px rgba(170,170,170,.4);
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css
index adf1e9d13f8..bd60f831388 100644
--- a/apps/files/css/upload.css
+++ b/apps/files/css/upload.css
@@ -8,6 +8,8 @@
 	margin-left: 3px;
 	overflow: hidden;
 	vertical-align: top;
+	position: relative;
+	z-index: -20;
 }
 #upload .icon-upload {
 	position: relative;