aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/css/files.css9
-rw-r--r--settings/js/users/users.js2
2 files changed, 5 insertions, 6 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 6422db55de3..287dedc23f2 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -230,10 +230,9 @@ table td.filename a.name {
}
table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
table td.filename input.filename {
- width: 80%;
- font-size: 14px;
- margin-top: 0;
- margin-left: 2px;
+ width: 70%;
+ margin-top: 1px;
+ margin-left: 48px;
cursor: text;
}
table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:3px 8px 8px 3px; }
@@ -326,6 +325,7 @@ table td.filename .uploadtext {
filter: alpha(opacity=0);
opacity: 0;
float: left;
+ top: 0;
margin: 32px 0 4px 32px; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/
}
/* Show checkbox when hovering, checked, or selected */
@@ -356,6 +356,7 @@ table td.filename .uploadtext {
}
#fileList tr td.filename>input[type="checkbox"] + label {
left: 0;
+ top: 0;
}
.select-all + label {
top: 0;
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index e7a9f249363..1c0f3eef840 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -282,7 +282,6 @@ var UserList = {
if (UserList.updating) {
return;
}
- $userList.css('display', 'none');
$userList.siblings('.loading').css('visibility', 'visible');
UserList.updating = true;
if(gid === undefined) {
@@ -311,7 +310,6 @@ var UserList = {
});
if (result.data.length > 0) {
UserList.doSort();
- $userList.css('display', 'block');
$userList.siblings('.loading').css('visibility', 'hidden');
}
else {