From a984f4b43017c679a7298a3c163f5fd170664cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 29 Nov 2016 07:05:18 +0100 Subject: [PATCH 1/3] Fix #2384 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_sharing/css/sharetabview.css | 3 ++- core/css/share.css | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css index 6ac6dff0a6..35b2d2f337 100644 --- a/apps/files_sharing/css/sharetabview.css +++ b/apps/files_sharing/css/sharetabview.css @@ -56,6 +56,8 @@ padding-bottom: 5px; font-weight: bold; white-space: normal; + display: inline-flex; + align-items: center; } #shareWithList .unshare img, #shareWithList .showCruds img { @@ -89,7 +91,6 @@ padding-right: 8px; white-space: nowrap; text-overflow: ellipsis; - max-width: 110px; display: inline-block; overflow: hidden; vertical-align: middle; diff --git a/core/css/share.css b/core/css/share.css index 9a98491276..3528402d04 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -74,16 +74,18 @@ font-weight: bold; line-height: 21px; white-space: normal; + max-width: 100%; } #shareWithList .sharingOptionsGroup { - position: absolute; - right: 15px; + flex-shrink: 0; + position: relative; } #shareWithList .sharingOptionsGroup .popovermenu { - right: -14px; + right: -6px; top: 40px; + padding: 3px 6px; } #shareWithList .shareOption { @@ -103,7 +105,6 @@ padding-right: 8px; white-space: nowrap; text-overflow: ellipsis; - max-width: 254px; display: inline-block; overflow: hidden; vertical-align: middle; From ab751277a1eadddc0e1f632c89b1e4c9a20e04a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 29 Nov 2016 10:51:35 +0100 Subject: [PATCH 2/3] Fix username width MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/share.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/css/share.css b/core/css/share.css index 3528402d04..05b6ca3912 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -74,7 +74,7 @@ font-weight: bold; line-height: 21px; white-space: normal; - max-width: 100%; + width: 100%; } #shareWithList .sharingOptionsGroup { @@ -108,6 +108,7 @@ display: inline-block; overflow: hidden; vertical-align: middle; + flex-grow: 5; } #shareWithList li label{ margin-right: 8px; From bd18349f46bdcd1b683ce3440db3d2815a796d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 29 Nov 2016 13:47:37 +0100 Subject: [PATCH 3/3] Fix mobile view MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files/css/mobile.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css index c465f890dd..2de9968983 100644 --- a/apps/files/css/mobile.css +++ b/apps/files/css/mobile.css @@ -61,11 +61,6 @@ table td.filename .nametext .innernametext { max-width: 50%; } -/* ellipsis on user names in share sidebar, less on mobile */ -#shareWithList .username { - max-width: 80px !important; -} - /* proper notification area for multi line messages */ #notification-container { display: -webkit-box;