From 64be76008a8f982b72082b31bea13b3c6017e461 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 15 Nov 2016 12:51:59 +0100 Subject: [PATCH 1/6] remove Unshare icon in list Signed-off-by: Jan-Christoph Borchardt --- core/js/sharedialogshareelistview.js | 1 - 1 file changed, 1 deletion(-) diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js index 3a72ab7266d78..96bbf94fa1cb1 100644 --- a/core/js/sharedialogshareelistview.js +++ b/core/js/sharedialogshareelistview.js @@ -78,7 +78,6 @@ '' + '' + '{{/unless}}' + - '{{unshareLabel}}' + '' + '' + '{{/each}}' + From 5eab1cdece0b263a64b20df70bfd1473213871a8 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 15 Nov 2016 12:52:22 +0100 Subject: [PATCH 2/6] fix layout of sharing list Signed-off-by: Jan-Christoph Borchardt --- apps/files/css/mobile.css | 4 ++-- apps/files_sharing/css/sharetabview.css | 25 ++++++++++++++++--------- core/css/share.css | 4 ++-- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css index 8e2ef23221d4f..c465f890ddac0 100644 --- a/apps/files/css/mobile.css +++ b/apps/files/css/mobile.css @@ -61,9 +61,9 @@ table td.filename .nametext .innernametext { max-width: 50%; } -/* ellipsis on user names in share sidebar */ +/* ellipsis on user names in share sidebar, less on mobile */ #shareWithList .username { - max-width: 80px !important; + max-width: 80px !important; } /* proper notification area for multi line messages */ diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css index 1de0cc7c75d9c..911ad1b4b9957 100644 --- a/apps/files_sharing/css/sharetabview.css +++ b/apps/files_sharing/css/sharetabview.css @@ -54,16 +54,21 @@ } #shareWithList .unshare img, #shareWithList .showCruds img { - vertical-align:text-bottom; /* properly align icons */ + vertical-align: text-bottom; /* properly align icons */ } -#shareWithList .sharingOptionsGroup .icon-more, -#shareWithList .unshare .icon-delete { - vertical-align: sub; +#shareWithList .sharingOptionsGroup .icon-more { + padding: 7px; + vertical-align: middle; + opacity: .5; } #shareWithList .unshare { - padding: 0; + padding: 4px; + vertical-align: text-bottom; +} +#shareWithList .unshare .icon { + vertical-align: text-top; } #shareWithList .unshare .icon-delete { @@ -71,21 +76,23 @@ background-position-x: 0; } -#shareWithList label input[type=checkbox]{ +#shareWithList label input[type=checkbox] { margin-left: 0; position: relative; } -#shareWithList .username{ +#shareWithList .username { padding-right: 8px; white-space: nowrap; text-overflow: ellipsis; - max-width: 254px; + max-width: 110px; display: inline-block; overflow: hidden; vertical-align: middle; } -#shareWithList li label{ +#shareWithList li label { + padding: 6px; margin-right: 8px; + vertical-align: text-top; } .shareTabView .icon-loading-small { diff --git a/core/css/share.css b/core/css/share.css index b2c47608933d9..bbd1ce7009174 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -82,8 +82,8 @@ } #shareWithList .sharingOptionsGroup .popovermenu { - right: -22px; - top: 30px; + right: -14px; + top: 40px; } #shareWithList .shareOption { From 88865e9728bee9285f4e91559108aac9f0e8438f Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 17 Nov 2016 19:11:49 +0100 Subject: [PATCH 3/6] properly align input box items in share tab view Signed-off-by: Jan-Christoph Borchardt --- apps/files_sharing/css/sharetabview.css | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css index 911ad1b4b9957..13152d5f7b5c0 100644 --- a/apps/files_sharing/css/sharetabview.css +++ b/apps/files_sharing/css/sharetabview.css @@ -2,7 +2,10 @@ min-height: 100px; } -.shareTabView .oneline { white-space: nowrap; } +.shareTabView .oneline { + white-space: nowrap; + position: relative; +} .shareTabView .shareWithLoading { padding-left: 10px; @@ -12,7 +15,10 @@ .shareTabView .shareWithRemoteInfo, .shareTabView .clipboardButton { - padding-left: 10px; + position: absolute; + right: -7px; + top: -3px; + padding: 14px; } .shareTabView label { @@ -24,15 +30,14 @@ vertical-align: middle; } -.shareTabView input[type="text"], -.shareTabView input[type="password"] { - width: 94%; - margin-left: 0; -} .shareTabView input[type="text"].shareWithField, .shareTabView input[type="text"].emailField, -.shareTabView input[type="text"].linkText { - width: 80%; +.shareTabView input[type="text"].linkText, +.shareTabView input[type="password"] { + width: 100%; + box-sizing: border-box; + padding-right: 32px; + text-overflow: ellipsis; } .shareTabView form { From cf78942253c546514733e4847f7f11c1d5fcc36f Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 17 Nov 2016 21:39:11 +0100 Subject: [PATCH 4/6] fix spacing in sidebar tabs Signed-off-by: Jan-Christoph Borchardt --- core/css/apps.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/apps.css b/core/css/apps.css index 440b188dc19f1..e7aad0676cdb1 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -632,7 +632,7 @@ em { clear: left; } .tabsContainer .tab { - padding: 15px; + padding: 0 15px 15px; } /* popover menu styles (use together with "bubble" class) */ From 9f5d019df9ec8f867cc2fa536da6d7b9915df84c Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 17 Nov 2016 21:39:31 +0100 Subject: [PATCH 5/6] resize and pixel-perfectly align copy icon Signed-off-by: Jan-Christoph Borchardt --- core/css/icons.css | 8 ++++---- core/img/actions/clippy.svg | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/css/icons.css b/core/css/icons.css index 5e5f968a5bb05..7618491cf905f 100644 --- a/core/css/icons.css +++ b/core/css/icons.css @@ -144,6 +144,10 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- background-image: url('../img/actions/checkmark-color.svg?v=1'); } +.icon-clippy { + background-image: url('../img/actions/clippy.svg?v=2'); +} + .icon-close { background-image: url('../img/actions/close.svg?v=1'); } @@ -422,7 +426,3 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- .icon-picture { background-image: url('../img/places/picture.svg?v=1'); } - -.icon-clippy { - background-image: url('../img/actions/clippy.svg?v=1'); -} diff --git a/core/img/actions/clippy.svg b/core/img/actions/clippy.svg index 4a978a1beb28d..af496f39386c3 100644 --- a/core/img/actions/clippy.svg +++ b/core/img/actions/clippy.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + From a32c7813263414c703b6652cc13993eaf564bf6e Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 17 Nov 2016 21:46:07 +0100 Subject: [PATCH 6/6] use copy icon for local link rather than link icon to prevent confusion with sharing Signed-off-by: Jan-Christoph Borchardt --- apps/files/css/detailsView.css | 4 ++-- apps/files/js/mainfileinfodetailview.js | 4 ++-- apps/files_sharing/css/sharetabview.css | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css index 2ec16993ef53a..ec08a5d5a6f39 100644 --- a/apps/files/css/detailsView.css +++ b/apps/files/css/detailsView.css @@ -19,8 +19,8 @@ } #app-sidebar .mainFileInfoView .permalink { - margin-left: 10px; - opacity: .5; + padding: 6px 10px; + vertical-align: text-top; } #app-sidebar .mainFileInfoView .permalink-field>input { clear: both; diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js index 20cedcf4e82f1..e9259f75ba1b5 100644 --- a/apps/files/js/mainfileinfodetailview.js +++ b/apps/files/js/mainfileinfodetailview.js @@ -15,7 +15,7 @@ '
' + '

{{name}}

' + '' + '
' + @@ -157,7 +157,7 @@ starAltText: isFavorite ? t('files', 'Favorited') : t('files', 'Favorite'), starIcon: OC.imagePath('core', isFavorite ? 'actions/starred' : 'actions/star'), permalink: this._makePermalink(this.model.get('id')), - permalinkTitle: t('files', 'Local link') + permalinkTitle: t('files', 'Copy local link') })); // TODO: we really need OC.Previews diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css index 13152d5f7b5c0..6ac6dff0a6634 100644 --- a/apps/files_sharing/css/sharetabview.css +++ b/apps/files_sharing/css/sharetabview.css @@ -17,7 +17,7 @@ .shareTabView .clipboardButton { position: absolute; right: -7px; - top: -3px; + top: -4px; padding: 14px; }