Merge pull request #6524 from nextcloud/12-6506

[stable12] Fix sharer name overlap with filename
nextcloud · Sep 20, 2017 · 7d4fda5 · 7d4fda5
2 parents aa58633 + f987347
commit 7d4fda5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
@@ -350,6 +350,10 @@ table td.filename .nametext {
 	max-width: 800px;
 	height: 100%;
 }
+/* ellipsis on file names */
+table td.filename .nametext .innernametext {
+	max-width: calc(100% - 100px) !important;
+}
 .has-favorites #fileList td.filename a.name {
 	left: 50px;
 	margin-right: 50px;
@@ -617,6 +621,16 @@ a.action > img {
 	opacity: .7;
 }
 
+// Ellipsize long sharer names
+#fileList .action.action-share.permanent.shared-style span:not(.icon) {
+	display: inline-block;
+	max-width: 70px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	vertical-align: bottom;
+	padding-left: 6px;
+}
+
 #fileList .fileActionsMenu a.action:hover,
 #fileList .fileActionsMenu a.action:focus,
 /* show share action of shared items darker to distinguish from non-shared */

diff --git a/apps/files/css/mobile.scss b/apps/files/css/mobile.scss
@@ -47,8 +47,8 @@ table td.filename .nametext {
 	margin-right: 6px;
 }
 /* hide text of the share action on mobile */
-#fileList a.action-share span {
-	display: none;
+#fileList a.action-share span:not(.icon) {
+	display: none !important;
 }
 #fileList a.action.action-favorite {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
@@ -61,7 +61,7 @@ table td.filename .nametext {
 
 /* ellipsis on file names */
 table td.filename .nametext .innernametext {
-	max-width: calc(100% - 175px);
+	max-width: calc(100% - 175px) !important;
 }
 
 /* proper notification area for multi line messages */