summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-10-16 17:17:01 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-16 17:17:01 +0200
commit9d910deef01657bfcc6bcdf61ef72c12961fc52a (patch)
tree9db7a767df02c0b6ff3d9f9e6c8626bb4ba6c205
parent7e9714340e28e83db9a68c10fabd63fb4400513b (diff)
parent90e34e26bd94527f55a7e941519b07396e5052d1 (diff)
downloadnextcloud-server-9d910deef01657bfcc6bcdf61ef72c12961fc52a.tar.gz
nextcloud-server-9d910deef01657bfcc6bcdf61ef72c12961fc52a.zip
Merge pull request #19836 from owncloud/share-fix-spinner-position
Fix spinner positions in share tab
-rw-r--r--apps/files_sharing/css/sharetabview.css14
-rw-r--r--core/js/sharedialoglinkshareview.js1
2 files changed, 12 insertions, 3 deletions
diff --git a/apps/files_sharing/css/sharetabview.css b/apps/files_sharing/css/sharetabview.css
index 1745eba5846..7597004e684 100644
--- a/apps/files_sharing/css/sharetabview.css
+++ b/apps/files_sharing/css/sharetabview.css
@@ -6,7 +6,6 @@
.shareTabView .shareWithLoading {
padding-left: 10px;
- position: relative;
right: 30px;
top: 2px;
}
@@ -73,9 +72,18 @@
}
.shareTabView .icon-loading-small {
- position: absolute;
display: inline-block;
z-index: 1;
background-color: white;
- padding: 2px;
+ padding: 2px 0;
+}
+
+.shareTabView .shareWithList .icon-loading-small,
+.shareTabView .linkShareView .icon-loading-small {
+ position: absolute;
+}
+
+.shareTabView .linkPass .icon-loading-small {
+ margin-top: 9px;
}
+
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index dfd9bdc2f45..beb8b01c8a8 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -141,6 +141,7 @@
this.$el.find('.linkPassText').focus();
}
} else {
+ $loading.removeClass('hidden');
if (this.model.get('linkShare').isLinkShare) {
this.model.removeLinkShare();
} else {