diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-04-24 14:34:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 14:34:56 +0200 |
| commit | c5617f4e8a7c2a9005165fbfb1f260ca4266410d (patch) | |
| tree | 24ec4e3b2fbfca822151fc5d7d1c14fe563947ae | |
| parent | 97c27395aaddf974ad341f30e43b8554778c4ffe (diff) | |
| parent | 36f55b58671ce6584ed8f292567beb4babb3a190 (diff) | |
| download | nextcloud-server-c5617f4e8a7c2a9005165fbfb1f260ca4266410d.tar.gz nextcloud-server-c5617f4e8a7c2a9005165fbfb1f260ca4266410d.zip | |
Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password-save
Fix working icon placement on password save
| -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 |