From 361aaf0c95ef17dfdf79c5e1f11efc005e2babcf Mon Sep 17 00:00:00 2001
From: Abijeet <abijeetpatro@gmail.com>
Date: Sat, 30 Dec 2017 12:21:50 +0530
Subject: [PATCH] Fixes the delete icon not appearing on certain resolutions.

Fixes #7539

Also fixes overlap of text on mobile devices by resorting to just icons on lower resolutions.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
---
 apps/files/css/files.scss               |  4 ++++
 apps/files/css/mobile.scss              | 12 +++++++++++-
 apps/files/templates/list.php           |  4 ++++
 apps/files_trashbin/templates/index.php |  4 ++++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 8e81bf84b4..dce5008ad1 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -542,6 +542,10 @@ a.action > img {
 	vertical-align: text-bottom;
 	margin-bottom: -1px;
 }
+/* hide the delete icon in name column normal resolutions */
+table th#headerName .selectedActions .delete-selected {
+	display: none;
+}
 
 #fileList td a {
 	a.action {
diff --git a/apps/files/css/mobile.scss b/apps/files/css/mobile.scss
index 10fa29e7a3..5653d5841b 100644
--- a/apps/files/css/mobile.scss
+++ b/apps/files/css/mobile.scss
@@ -12,7 +12,6 @@
 	min-width: initial !important;
 }
 
-/* hide size and date columns */
 table th#headerSize,
 table td.filesize,
 table th#headerDate,
@@ -52,6 +51,11 @@ table td.filename .nametext .innernametext {
 	max-width: calc(100% - 175px) !important;
 }
 
+/* show the delete icon in name column in lower resolutions */
+table th#headerName .selectedActions .delete-selected {
+	display: inline;
+}
+
 /* proper notification area for multi line messages */
 #notification-container {
 	display: flex;
@@ -75,3 +79,9 @@ table.dragshadow {
 }
 
 }
+@media only screen and (max-width: 480px)  {
+	/* Only show icons */
+	table th .selectedActions a span:not(.icon) {
+		display: none;
+	}
+}
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index 92f64a52a2..fd5423c334 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -59,6 +59,10 @@
 							<span class="icon icon-download"></span>
 							<span><?php p($l->t('Download'))?></span>
 						</a>
+						<a href="" class="delete-selected">
+							<span class="icon icon-delete"></span>
+							<span><?php p($l->t('Delete'))?></span>
+						</a>
 					</span>
 				</div>
 			</th>
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index b3ebca2867..a4459947d0 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -35,6 +35,10 @@
 							<span class="icon icon-history"></span>
 							<span><?php p($l->t('Restore'))?></span>
 						</a>
+						<a href="" class="delete-selected">
+							<span class="icon icon-delete"></span>
+							<span><?php p($l->t('Delete'))?></span>
+						</a>
 					</span>
 				</div>
 			</th>