From a36e3c7b5767b865b5fe138db5686d9c76302e1c Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 3 Sep 2025 03:22:41 -0700 Subject: [PATCH 1/7] Update static svg logo w/ animation keyframes --- app/img/raspAP-logo.php | 67 ++++++++++++++++++----------------------- includes/functions.php | 2 +- 2 files changed, 31 insertions(+), 38 deletions(-) diff --git a/app/img/raspAP-logo.php b/app/img/raspAP-logo.php index c8115634..c43b7689 100755 --- a/app/img/raspAP-logo.php +++ b/app/img/raspAP-logo.php @@ -10,42 +10,35 @@ $color = getColorOpt(); xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - viewBox="0 0 490.66666 487.11066" - height="487.11066" - width="490.66666" + viewBox="0 180 352 290" xml:space="preserve" id="svg2" - version="1.1">image/svg+xml + version="1.1"> + + + + + + + + + + + + + + diff --git a/includes/functions.php b/includes/functions.php index 8b388cf4..121dcd0a 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -915,7 +915,7 @@ function renderStatus($hostapd_led, $hostapd_status, $memused_led, $memused, $cp ?>
- +
Status
From a5a6747ced77b8ab593dd58148c53d6ecea98a3a Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 3 Sep 2025 03:43:17 -0700 Subject: [PATCH 2/7] Tweak logo size + position --- app/css/all.css | 4 ++-- app/img/raspAP-logo.php | 7 ++++--- includes/functions.php | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/css/all.css b/app/css/all.css index f6aec2cd..ccd2e956 100644 --- a/app/css/all.css +++ b/app/css/all.css @@ -48,8 +48,8 @@ th { } .navbar-logo { - margin-top: 0.5em; - margin-left: 0.5em; + margin-top: 0.2em; + margin-left: 0.7em; } .page-header { diff --git a/app/img/raspAP-logo.php b/app/img/raspAP-logo.php index c43b7689..e356fe1d 100755 --- a/app/img/raspAP-logo.php +++ b/app/img/raspAP-logo.php @@ -37,8 +37,9 @@ $color = getColorOpt(); - - - + + + + diff --git a/includes/functions.php b/includes/functions.php index 121dcd0a..717cdaed 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -915,7 +915,7 @@ function renderStatus($hostapd_led, $hostapd_status, $memused_led, $memused, $cp ?>
- +
Status
From a295dae059c49e154e836a3ff07095e7c135ca4c Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 3 Sep 2025 07:04:19 -0700 Subject: [PATCH 3/7] Add .login-logo class style --- app/css/all.css | 6 ++++++ templates/login.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/css/all.css b/app/css/all.css index ccd2e956..d34a7a52 100644 --- a/app/css/all.css +++ b/app/css/all.css @@ -52,6 +52,12 @@ th { margin-left: 0.7em; } +.login-logo { + width: 70px; + height: 70px; + margin-left: 1.2rem; +} + .page-header { font-size: 26pt; margin: 20px 0 20px; diff --git a/templates/login.php b/templates/login.php index 071876c7..990632ad 100755 --- a/templates/login.php +++ b/templates/login.php @@ -8,7 +8,7 @@
- +
From 931086aecbf1cd6bf1545108151aa67114b477e0 Mon Sep 17 00:00:00 2001 From: billz Date: Wed, 3 Sep 2025 07:04:58 -0700 Subject: [PATCH 4/7] Update w/ RASPI_UI_STATIC_LOGO user option --- app/img/raspAP-logo.php | 5 ++++- config/config.php | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/img/raspAP-logo.php b/app/img/raspAP-logo.php index e356fe1d..95de26d3 100755 --- a/app/img/raspAP-logo.php +++ b/app/img/raspAP-logo.php @@ -1,7 +1,9 @@ - + + diff --git a/config/config.php b/config/config.php index 2dd0223c..546441e6 100755 --- a/config/config.php +++ b/config/config.php @@ -69,6 +69,7 @@ define('RASPI_SYSTEM_ENABLED', true); define('RASPI_MONITOR_ENABLED', false); define('RASPI_RESTAPI_ENABLED', false); define('RASPI_PLUGINS_ENABLED', true); +define('RASPI_UI_STATIC_LOGO', false); // Locale settings define('LOCALE_ROOT', 'locale'); From 31303727a4b57228ab662ef3ca7f4d390ec58924 Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 4 Sep 2025 06:06:36 -0700 Subject: [PATCH 5/7] Update w/ static param --- app/img/raspAP-logo.php | 19 ++++++++++++------- includes/functions.php | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/img/raspAP-logo.php b/app/img/raspAP-logo.php index 95de26d3..2b02519a 100755 --- a/app/img/raspAP-logo.php +++ b/app/img/raspAP-logo.php @@ -3,7 +3,8 @@ require_once '../../includes/config.php'; require_once '../../includes/functions.php'; $color = getColorOpt(); -$static = defined('RASPI_UI_STATIC_LOGO') && RASPI_UI_STATIC_LOGO === true; +$static = (isset($_GET['static']) && $_GET['static'] == '1') || + (defined('RASPI_UI_STATIC_LOGO') && RASPI_UI_STATIC_LOGO === true); ?> + diff --git a/includes/functions.php b/includes/functions.php index 717cdaed..38e972eb 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -915,7 +915,7 @@ function renderStatus($hostapd_led, $hostapd_status, $memused_led, $memused, $cp ?>
- +
Status
From 159e82dbd3e4fcb9ed20aefd3682045f1dda880e Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 4 Sep 2025 06:07:14 -0700 Subject: [PATCH 6/7] Style tweak for login-logo --- app/css/all.css | 1 + 1 file changed, 1 insertion(+) diff --git a/app/css/all.css b/app/css/all.css index d34a7a52..e63272b5 100644 --- a/app/css/all.css +++ b/app/css/all.css @@ -56,6 +56,7 @@ th { width: 70px; height: 70px; margin-left: 1.2rem; + margin-bottom: -0.5rem; } .page-header { From f7058b048a27116e3c9209b837179e599fb8e9fa Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 5 Sep 2025 06:29:32 -0700 Subject: [PATCH 7/7] Fix: add cache-busting to theme CSS @import --- app/css/custom.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/css/custom.php b/app/css/custom.php index 9113ef39..da824ff1 100644 --- a/app/css/custom.php +++ b/app/css/custom.php @@ -2,6 +2,7 @@ /* Theme Name: RaspAP default @@ -11,7 +12,7 @@ Description: Default theme for RaspAP License: GNU General Public License v3.0 */ -@import url('all.css'); +@import url('?v='); :root { --raspap-theme-color: ;