sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4463 from danxuliu/fix-working-icon-placement-on-password-save 

Fix working icon placement on password save
pull/4468/head
Roeland Jago Douma 2017-04-24 14:34:56 +07:00 committed by GitHub
parent 97c27395aa 36f55b5867
commit c5617f4e8a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/files_sharing/css/sharetabview.scss
Unescape Escape View File

@ -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 {

4
core/js/sharedialoglinkshareview.js
Unescape Escape View File

@ -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