apps/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-09-26 21:01:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into arch/armv7

Browse Source
This commit is contained in:
Michael Mayer
2025-04-14 17:43:22 +02:00
parent c83b7d05ec 0b390f356f
commit d0e89abb13
3 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/templates/app.gohtml
View File

@@ -28,8 +28,8 @@
<div class="splash-logo">
{{template "logo.gohtml" .}}
</div>
<progress id="progress" class="html-progress" max="100"></progress>
<progress id="progress" class="html-progress" role="progressbar" max="100"></progress>
</div>
</div>
</div>
<div id="busy-overlay"><div class="splash-center"><progress id="busy-progress" class="html-progress" max="100"></progress></div></div>
<div id="busy-overlay"><div class="splash-center"><progress id="busy-progress" class="html-progress" role="progressbar" max="100"></progress></div></div>

22
frontend/src/component/notify.vue
View File

@@ -1,17 +1,17 @@
<template>
<teleport to="body">
<div id="notify">
<transition name="fade-transition">
<div v-if="visible" id="p-notify" tabindex="-1">
<div
v-if="visible"
:class="'p-notify--' + message.color"
class="v-snackbar v-snackbar--bottom v-snackbar--center p-notify"
class="p-notify v-snackbar"
role="alert"
tabindex="-1"
@click.stop.prevent="showNext"
>
<div class="v-snackbar__wrapper v-snackbar--variant-flat">
<div class="v-snackbar__wrapper">
<span class="v-snackbar__underlay"></span>
<div tabindex="-1" class="v-snackbar__content">
<div class="v-snackbar__content">
<i
v-if="message.icon"
:class="['text-' + message.color, 'mdi-' + message.icon]"
@@ -29,8 +29,8 @@
</div>
</div>
</div>
</div>
</transition>
</div>
</teleport>
</template>
<script>
@@ -53,7 +53,7 @@ export default {
defaultColor: "info",
defaultDelay: 2000,
warningDelay: 3000,
errorDelay: 8000,
errorDelay: 6000,
};
},
created() {
@@ -142,14 +142,6 @@ export default {
this.showNext();
}
},
onSnackbar(show) {
if (show) {
this.snackbar = true;
} else {
this.snackbar = false;
this.showNext();
}
},
showNext() {
const message = this.messages.shift();

16
frontend/src/css/notify.css
View File

@@ -1,6 +1,6 @@
/* Notifications */
#p-notify {
#notify {
position: fixed;
z-index: 2500;
top: auto;
@@ -24,7 +24,7 @@
pointer-events: none;
}
#p-notify .v-snackbar {
#notify .v-snackbar {
margin-left: auto;
margin-right: auto;
width: auto;
@@ -33,7 +33,7 @@
margin-bottom: 24px;
}
#p-notify .v-snackbar .v-snackbar__wrapper {
#notify .v-snackbar .v-snackbar__wrapper {
cursor: pointer;
color: rgba(var(--v-theme-on-surface), 1);
background-color: rgba(var(--v-theme-surface), 0.32);
@@ -44,7 +44,7 @@
border-radius: 9999px;
}
#p-notify .v-snackbar__wrapper .v-snackbar__content {
#notify .v-snackbar__wrapper .v-snackbar__content {
z-index: 2;
display: flex;
gap: 4px;
@@ -58,7 +58,7 @@
margin: 0;
}
#p-notify .v-snackbar__wrapper .v-snackbar__content .p-notify__icon {
#notify .v-snackbar__wrapper .v-snackbar__content .p-notify__icon {
margin: 0;
align-self: center;
font-size: 22px;
@@ -66,7 +66,7 @@
width: 22px;
}
#p-notify .v-snackbar__wrapper .v-snackbar__content .p-notify__text {
#notify .v-snackbar__wrapper .v-snackbar__content .p-notify__text {
flex-grow: 1;
margin: 2px 8px;
padding: 0;
@@ -74,7 +74,7 @@
align-self: center;
}
#p-notify .v-snackbar__wrapper .v-snackbar__content .p-notify__close {
#notify .v-snackbar__wrapper .v-snackbar__content .p-notify__close {
opacity: 0.78;
font-size: 24px;
height: 24px;
@@ -115,7 +115,7 @@
}
@media only screen and (min-width: 600px) {
#p-notify .v-snackbar {
#notify .v-snackbar {
min-width: 280px;
margin-bottom: 16px;
}