diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2017-04-24 00:07:20 +0200 |
|---|---|---|
| committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2017-04-24 11:50:06 +0200 |
| commit | 36f55b58671ce6584ed8f292567beb4babb3a190 (patch) | |
| tree | e64da752da938dba612b56403c4aa3dc7655a897 | |
| parent | 11c795388848807590cb56befb28cafec17be3bd (diff) | |
| download | nextcloud-server-36f55b58671ce6584ed8f292567beb4babb3a190.tar.gz nextcloud-server-36f55b58671ce6584ed8f292567beb4babb3a190.zip | |
Fix working icon placement on password save
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 <danxuliu@gmail.com>
| -rw-r--r-- | apps/files_sharing/css/sharetabview.scss | 5 | ||||
| -rw-r--r-- | 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 82f0ffa5822..cb2bb463352 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 6017714b305..4904ed493cc 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -60,14 +60,14 @@ '<input type="checkbox" name="showPassword" id="showPassword-{{cid}}" class="checkbox showPasswordCheckbox" {{#if isPasswordSet}}checked="checked"{{/if}} value="1" />' + '<label for="showPassword-{{cid}}">{{enablePasswordLabel}}</label>' + ' {{/if}}' + - '<div id="linkPass" class="linkPass {{#unless isPasswordSet}}hidden{{/unless}}">' + + '<div id="linkPass" class="oneline linkPass {{#unless isPasswordSet}}hidden{{/unless}}">' + ' <label for="linkPassText-{{cid}}" class="hidden-visually">{{passwordLabel}}</label>' + ' {{#if showPasswordCheckBox}}' + ' <input id="linkPassText-{{cid}}" class="linkPassText" type="password" placeholder="{{passwordPlaceholder}}" />' + ' {{else}}' + ' <input id="linkPassText-{{cid}}" class="linkPassText" type="password" placeholder="{{passwordPlaceholderInitial}}" />' + ' {{/if}}' + - ' <span class="icon-loading-small hidden"></span>' + + ' <span class="icon icon-loading-small hidden"></span>' + '</div>' + '{{else}}' + // FIXME: this doesn't belong in this view |