From 36f55b58671ce6584ed8f292567beb4babb3a190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Mon, 24 Apr 2017 00:07:20 +0200 Subject: [PATCH] Fix working icon placement on password save MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before, the icon appeared below the text input for the password. Now, it appears inside the text input, to the right end. The CSS was adjusted based on other icons shown in that position for other text inputs in the Share tab view, like the information icon or the clipboard icon. Fixes #4135 Signed-off-by: Daniel Calviño Sánchez --- apps/files_sharing/css/sharetabview.scss | 5 +++-- core/js/sharedialoglinkshareview.js | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss index 82f0ffa582..cb2bb46335 100644 --- a/apps/files_sharing/css/sharetabview.scss +++ b/apps/files_sharing/css/sharetabview.scss @@ -14,7 +14,8 @@ } .shareTabView .shareWithRemoteInfo, -.shareTabView .clipboardButton { +.shareTabView .clipboardButton, +.shareTabView .linkPass .icon-loading-small { position: absolute; right: -7px; top: -4px; @@ -152,7 +153,7 @@ } .shareTabView .linkPass .icon-loading-small { - margin-top: 9px; + margin-right: 0px; } .shareTabView .icon { diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index 6017714b30..4904ed493c 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -60,14 +60,14 @@ '' + '' + ' {{/if}}' + - '
' + + '
' + ' ' + ' {{#if showPasswordCheckBox}}' + ' ' + ' {{else}}' + ' ' + ' {{/if}}' + - ' ' + + ' ' + '
' + '{{else}}' + // FIXME: this doesn't belong in this view