From 28abbb14855df0d5e15d4660c55ad84a6023aba4 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 7 Aug 2015 17:58:37 +0200
Subject: [PATCH] fix layout and design of actions dropdown

---
 apps/files/css/files.css  | 15 ++++++++++++++-
 apps/files/css/mobile.css | 29 +++++++++++++++++------------
 core/css/apps.css         |  2 +-
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index e608a029e2..d283a62b70 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -521,6 +521,20 @@ table td.filename .uploadtext {
 	visibility: hidden;
 }
 
+/* fix position of bubble pointer for Files app */
+.bubble,
+#app-navigation .app-navigation-entry-menu {
+	border-top-right-radius: 3px;
+}
+.bubble:after,
+#app-navigation .app-navigation-entry-menu:after {
+	right: 6px;
+}
+.bubble:before,
+#app-navigation .app-navigation-entry-menu:before {
+	right: 6px;
+}
+
 /* force show the loading icon, not only on hover */
 #fileList .icon-loading-small {
 	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
@@ -720,4 +734,3 @@ table.dragshadow td.size {
 .fileActionsMenu li:hover .action {
 	opacity: 1;
 }
-
diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index 4881f7c70e..3c51f15dc0 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -5,11 +5,6 @@
 	min-width: initial !important;
 }
 
-/* do not show Deleted Files on mobile, not optimized yet and button too long */
-#controls #trash {
-	display: none;
-}
-
 /* hide size and date columns */
 table th#headerSize,
 table td.filesize,
@@ -38,7 +33,8 @@ table td.filename .nametext {
 }
 
 /* always show actions on mobile, not only on hover */
-#fileList a.action {
+#fileList a.action,
+#fileList a.action.action-menu.permanent {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)" !important;
 	filter: alpha(opacity=20) !important;
 	opacity: .2 !important;
@@ -50,17 +46,26 @@ table td.filename .nametext {
 	filter: alpha(opacity=70) !important;
 	opacity: .7 !important;
 }
-/* do not show Rename or Versions on mobile */
-#fileList .action.action-rename,
-#fileList .action.action-versions {
-	display: none !important;
+#fileList a.action.action-menu img {
+	padding-left: 2px;
+}
+
+#fileList .fileActionsMenu {
+	margin-right: 5px;
 }
 /* some padding for better clickability */
 #fileList a.action img {
 	padding: 0 6px 0 12px;
 }
-/* hide text of the actions on mobile */
-#fileList a.action span {
+#fileList .fileActionsMenu a.action img {
+	padding: initial;
+}
+#fileList .fileActionsMenu a.action {
+	padding: 12px;
+	margin: -12px;
+}
+/* hide text of the share action on mobile */
+#fileList a.action-share span {
 	display: none;
 }
 
diff --git a/core/css/apps.css b/core/css/apps.css
index d4752cdde7..300b186bba 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -298,7 +298,7 @@
 	background-color: #eee;
 	color: #333;
 	border-radius: 3px;
-	border-top-right-radius: 0px;
+	border-top-right-radius: 0;
 	z-index: 110;
 	margin: -5px 14px 5px 10px;
 	right: 0;