From 20932331b3b741e3abce3c38c6ad472baab3af7f Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Wed, 8 May 2024 21:25:03 +0300 Subject: [PATCH 1/3] Fix: Monitor status color bars in Inside position for light theme (skin.css) --- web/skins/classic/css/base/skin.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css index 344bcf63d..51a7914ec 100644 --- a/web/skins/classic/css/base/skin.css +++ b/web/skins/classic/css/base/skin.css @@ -936,6 +936,10 @@ a.flip { clear: both; } +.monitor .monitorStatus.bottom{ + color: #dddddd; +} + .monitor.idle img { border: 2px solid #ffffff; } From c93a103882fcbe50305873e0c6b3bafe84f6447a Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Wed, 8 May 2024 21:27:02 +0300 Subject: [PATCH 2/3] Chore: Add space (skin.css) --- web/skins/classic/css/base/skin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css index 51a7914ec..fee4c0052 100644 --- a/web/skins/classic/css/base/skin.css +++ b/web/skins/classic/css/base/skin.css @@ -936,7 +936,7 @@ a.flip { clear: both; } -.monitor .monitorStatus.bottom{ +.monitor .monitorStatus.bottom { color: #dddddd; } From 399bc7e6e07e24554fc6605c17b3cf3226aa41a9 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 8 May 2024 14:30:58 -0400 Subject: [PATCH 3/3] Only look for version.txt in the root --- utils/do_debian_package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh index 2e44a8757..86791c1fd 100755 --- a/utils/do_debian_package.sh +++ b/utils/do_debian_package.sh @@ -142,7 +142,7 @@ if [ "$SNAPSHOT" == "stable" ]; then BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`; if [ -z "$BRANCH" ]; then # This should only happen in CI environments where tag info isn't available - BRANCH=$(cat "$(find . -name 'version' -o -name 'version.txt')") + BRANCH=$(cat "$(find . -maxdepth 1 -name 'version' -o -name 'version.txt')") echo "Building branch $BRANCH" fi if [ "$BRANCH" == "" ]; then @@ -180,7 +180,7 @@ fi; echo "git pull..." git pull # Grab the ZoneMinder version from the contents of the version file -VERSION=$(cat "$(find . -name 'version' -o -name 'version.txt')") +VERSION=$(cat "$(find . -maxdepth 1 -name 'version' -o -name 'version.txt')") if [ -z "$VERSION" ]; then exit 1; fi;