Skip to content

Commit 4a2abde

Browse files
committed
Merge branch 'master' into guestupload
2 parents f3905e3 + c1d2bf9 commit 4a2abde

File tree

4 files changed

+27
-4
lines changed

4 files changed

+27
-4
lines changed

internal/webserver/web/static/css/cover.css

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,12 +231,10 @@ a:hover {
231231

232232
.perm-granted:not(.perm-nochange):hover {
233233
color: #ff4d4d;
234-
transform: scale(1.15);
235234
}
236235

237236
.perm-notgranted:not(.perm-nochange):hover {
238237
color: #4dff4d;
239-
transform: scale(1.15);
240238
}
241239

242240
.perm-granted:not(.perm-nochange),
@@ -254,6 +252,25 @@ a:hover {
254252
transform: none;
255253
}
256254

255+
.perm-nowgranted {
256+
animation: perm-nowgranted-pulse 0.5s ease forwards;
257+
}
258+
259+
@keyframes perm-nowgranted-pulse {
260+
0% { transform: scale(1.15); color: #4dff4d; }
261+
50% { transform: scale(1.3); color: #008800; }
262+
100% { transform: scale(1.15); color: #0edf00; }
263+
}
264+
265+
.perm-nownotgranted {
266+
animation: perm-nownotgranted-pulse 0.5s ease forwards;
267+
}
268+
269+
@keyframes perm-nownotgranted-pulse {
270+
0% { transform: scale(1.15); color: #ff4d4d; }
271+
50% { transform: scale(1.3); color: #ff0000; }
272+
100% { transform: scale(1.15); color: ##9f9999; }
273+
}
257274

258275
.prevent-select {
259276
-webkit-user-select: none; /* Safari */

internal/webserver/web/static/css/min/gokapi.min.5.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/webserver/web/static/js/admin_ui_api.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,16 @@ function changeApiPermission(userId, permission, buttonId) {
2424
.then(data => {
2525
if (wasGranted) {
2626
indicator.classList.add("perm-notgranted");
27+
indicator.classList.add("perm-nownotgranted");
2728
} else {
2829
indicator.classList.add("perm-granted");
30+
indicator.classList.add("perm-nowgranted");
2931
}
3032
indicator.classList.remove("perm-processing");
33+
setTimeout(() => {
34+
indicator.classList.remove("perm-nowgranted");
35+
indicator.classList.remove("perm-nownotgranted");
36+
}, 1000);
3137
})
3238
.catch(error => {
3339
if (wasGranted) {

0 commit comments

Comments
 (0)