diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-09-15 16:49:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 16:49:37 +0200 |
| commit | 4eb2ce5b32594fd9ac3be88298c0a3e1f4181587 (patch) | |
| tree | 958a4054f0c5c502c6cb616cb4d2a8a8366cf013 /apps | |
| parent | bb9493e9ad7f204ea97db2341bcc9c82a719f0d5 (diff) | |
| parent | 42ac9cde087d49e34ead0e2a448587caa7ecc377 (diff) | |
| download | nextcloud-server-4eb2ce5b32594fd9ac3be88298c0a3e1f4181587.tar.gz nextcloud-server-4eb2ce5b32594fd9ac3be88298c0a3e1f4181587.zip | |
Merge pull request #6506 from nextcloud/sharename-overlap
Fix sharer name overlap with filename
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/css/files.scss | 14 | ||||
| -rw-r--r-- | apps/files/css/mobile.scss | 6 |
2 files changed, 17 insertions, 3 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 55ce58111c1..741ea329c84 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; @@ -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 .action.action-favorite.permanent { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter: alpha(opacity=100); diff --git a/apps/files/css/mobile.scss b/apps/files/css/mobile.scss index 4a5abd2b73c..9e1c8a01d89 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; @@ -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 */ |