chore: auto-merge develop → main

Triggered by: 30aa2db branding: add EverShelf logo to kiosk splash + web header/preloader
This commit is contained in:
github-actions[bot]
2026-05-05 16:40:03 +00:00
11 changed files with 23 additions and 15 deletions
+15
View File
@@ -103,6 +103,21 @@ body {
font-weight: 600;
letter-spacing: 0.5px;
}
.app-preloader-logo {
height: 120px;
width: auto;
object-fit: contain;
filter: drop-shadow(0 2px 8px rgba(0,0,0,0.4));
}
.header-logo-icon {
height: 28px;
width: auto;
object-fit: contain;
display: inline-block;
vertical-align: middle;
margin-right: 4px;
filter: drop-shadow(0 1px 3px rgba(0,0,0,0.3));
}
.header-content {
display: flex;
Binary file not shown.

After

Width:  |  Height:  |  Size: 315 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 259 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 211 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 310 KiB

@@ -14,20 +14,13 @@
android:visibility="visible">
<ImageView
android:layout_width="120dp"
android:layout_height="120dp"
android:src="@drawable/ic_launcher_foreground"
android:layout_marginBottom="24dp"
android:contentDescription="EverShelf" />
<TextView
android:layout_width="wrap_content"
android:layout_width="260dp"
android:layout_height="wrap_content"
android:text="EverShelf"
android:textColor="#f1f5f9"
android:textSize="32sp"
android:textStyle="bold"
android:layout_marginBottom="8dp" />
android:src="@drawable/ic_logo"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:layout_marginBottom="16dp"
android:contentDescription="EverShelf" />
<TextView
android:layout_width="wrap_content"
+2 -2
View File
@@ -54,7 +54,7 @@
<div id="app-preloader" aria-hidden="true">
<div class="app-preloader-inner">
<div class="app-preloader-spinner"></div>
<span class="app-preloader-label">🏠 EverShelf</span>
<img src="assets/img/logo/logo.png" alt="EverShelf" class="app-preloader-logo" />
</div>
</div>
@@ -67,7 +67,7 @@
<!-- Title — left-aligned; grows to fill space -->
<div class="header-title-wrap">
<h1 class="header-title" onclick="showPage('dashboard')">
<span data-i18n="nav.title">🏠 EverShelf</span><span class="header-version">v1.7.1</span>
<img src="assets/img/logo/logo_icon.png" alt="" class="header-logo-icon" aria-hidden="true" /><span data-i18n="nav.title">EverShelf</span><span class="header-version">v1.7.1</span>
</h1>
<!-- Update badge — shown alongside title, never replaces it -->
<span class="header-update-badge" id="header-update-badge" style="display:none"></span>