From 50348166196598f2dcbbc0fec6905d141e3a368e Mon Sep 17 00:00:00 2001 From: Joe Milazzo Date: Fri, 17 Oct 2025 08:23:26 -0500 Subject: [PATCH] Last polish (#4102) Co-authored-by: Amelia <77553571+Fesaa@users.noreply.github.com> --- API.Tests/API.Tests.csproj | 2 +- API/API.csproj | 12 ++--- API/Services/AnnotationService.cs | 2 +- Kavita.Common/Kavita.Common.csproj | 4 +- .../circular-loader.component.html | 48 +++++++++---------- .../circular-loader.component.scss | 9 ++-- 6 files changed, 39 insertions(+), 38 deletions(-) diff --git a/API.Tests/API.Tests.csproj b/API.Tests/API.Tests.csproj index ccd26444a..32ce6748d 100644 --- a/API.Tests/API.Tests.csproj +++ b/API.Tests/API.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/API/API.csproj b/API/API.csproj index 11b532bdb..7337f76f6 100644 --- a/API/API.csproj +++ b/API/API.csproj @@ -52,7 +52,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -70,11 +70,11 @@ - - - - - + + + + + diff --git a/API/Services/AnnotationService.cs b/API/Services/AnnotationService.cs index c79937e8a..587184717 100644 --- a/API/Services/AnnotationService.cs +++ b/API/Services/AnnotationService.cs @@ -178,7 +178,7 @@ public class AnnotationService( // Get settings for hostname var settings = await unitOfWork.SettingsRepository.GetSettingsDtoAsync(); - var hostname = !string.IsNullOrWhiteSpace(settings.HostName) ? settings.HostName : "http://localhost:5000"; + var hostname = !string.IsNullOrWhiteSpace(settings.HostName) ? settings.HostName : $"http://localhost:{Configuration.Port}"; // Group annotations by series, then by volume var exportData = annotations diff --git a/Kavita.Common/Kavita.Common.csproj b/Kavita.Common/Kavita.Common.csproj index 262cd4613..d771428b1 100644 --- a/Kavita.Common/Kavita.Common.csproj +++ b/Kavita.Common/Kavita.Common.csproj @@ -12,8 +12,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/UI/Web/src/app/shared/circular-loader/circular-loader.component.html b/UI/Web/src/app/shared/circular-loader/circular-loader.component.html index 246ce1e94..8a96c09e2 100644 --- a/UI/Web/src/app/shared/circular-loader/circular-loader.component.html +++ b/UI/Web/src/app/shared/circular-loader/circular-loader.component.html @@ -1,29 +1,29 @@ @if (currentValue > 0) { - @if (showIcon) { -
- -
- } -
+ @if (showIcon) { +
+ +
+ } + + [radius]="100" + [outerStrokeWidth]="15" + [innerStrokeWidth]="0" + [space] = "0" + [backgroundPadding]="0" + outerStrokeLinecap="butt" + [outerStrokeColor]="outerStrokeColor" + [innerStrokeColor]="innerStrokeColor" + titleFontSize= "24" + unitsFontSize= "24" + [showSubtitle] = "false" + [animation]="animation" + [animationDuration]="300" + [startFromZero]="false" + [responsive]="true" + [backgroundOpacity]="0.5" + [backgroundColor]="backgroundColor" + />
} diff --git a/UI/Web/src/app/shared/circular-loader/circular-loader.component.scss b/UI/Web/src/app/shared/circular-loader/circular-loader.component.scss index 98817f4f2..fd1e70de2 100644 --- a/UI/Web/src/app/shared/circular-loader/circular-loader.component.scss +++ b/UI/Web/src/app/shared/circular-loader/circular-loader.component.scss @@ -1,14 +1,15 @@ .number { position: absolute; - top: 50%; - left: 46%; + top: 75%; font-size: 18px; + width: 100%; + text-align: center; } .indicator { + position: relative; font-weight: 500; - margin-left: 2px; z-index: 10; color: var(--primary-color); animation: MoveUpDown 1s linear infinite; -} \ No newline at end of file +}