From 64dd1f683350d30794e5f011e77a0cdf3eab07db Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 14 Sep 2017 16:38:31 +0200 Subject: [PATCH 1/2] Ellipsize sharer name, ref #6498 Signed-off-by: Jan-Christoph Borchardt --- apps/files/css/files.scss | 10 ++++++++++ apps/files/css/mobile.scss | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 5f32916650dea..1b6df3cd8ad52 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -617,6 +617,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 index 4a5abd2b73c29..28225b82fefbd 100644 --- 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; From f987347b83f030c6b9b4f63ff6d1ced1d784d8a1 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 14 Sep 2017 16:40:24 +0200 Subject: [PATCH 2/2] Correctly ellipsize file names, fix #6498 Signed-off-by: Jan-Christoph Borchardt --- apps/files/css/files.scss | 4 ++++ apps/files/css/mobile.scss | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 1b6df3cd8ad52..48520cbd710d3 100644 --- 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; diff --git a/apps/files/css/mobile.scss b/apps/files/css/mobile.scss index 28225b82fefbd..9e1c8a01d89c6 100644 --- a/apps/files/css/mobile.scss +++ b/apps/files/css/mobile.scss @@ -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 */