diff --git a/API.Tests/Parsing/MangaParsingTests.cs b/API.Tests/Parsing/MangaParsingTests.cs index 7efc34254..a975cc7ee 100644 --- a/API.Tests/Parsing/MangaParsingTests.cs +++ b/API.Tests/Parsing/MangaParsingTests.cs @@ -211,6 +211,7 @@ public class MangaParsingTests [InlineData("หนึ่งความคิด นิจนิรันดร์ เล่ม 2", "หนึ่งความคิด นิจนิรันดร์")] [InlineData("不安の種\uff0b - 01", "不安の種\uff0b")] [InlineData("Giant Ojou-sama - Ch. 33.5 - Volume 04 Bonus Chapter", "Giant Ojou-sama")] + [InlineData("[218565]-(C92) [BRIO (Puyocha)] Mika-nee no Tanryoku Shidou - Mika s Guide to Self-Confidence (THE IDOLM@STE", "")] public void ParseSeriesTest(string filename, string expected) { Assert.Equal(expected, API.Services.Tasks.Scanner.Parser.Parser.ParseSeries(filename, LibraryType.Manga)); diff --git a/API.Tests/Services/ScannerServiceTests.cs b/API.Tests/Services/ScannerServiceTests.cs index 58b1309fa..5fd8db860 100644 --- a/API.Tests/Services/ScannerServiceTests.cs +++ b/API.Tests/Services/ScannerServiceTests.cs @@ -130,6 +130,25 @@ public class ScannerServiceTests : AbstractDbTest Assert.NotNull(postLib.Series.First().Volumes.FirstOrDefault(v => v.Chapters.FirstOrDefault(c => c.IsSpecial) != null)); } + + [Fact] + public async Task ScanLibrary_SeriesWithUnbalancedParenthesis() + { + const string testcase = "Scan Library Parses as ( - Manga.json"; + + var library = await GenerateScannerData(testcase); + var scanner = CreateServices(); + await scanner.ScanLibrary(library.Id); + var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.NotNull(postLib); + Assert.Single(postLib.Series); + + var series = postLib.Series.First(); + + Assert.Equal("Mika-nee no Tanryoku Shidou - Mika s Guide to Self-Confidence (THE IDOLM@STE", series.Name); + } + /// /// This is testing that if the first file is named A and has a localized name of B if all other files are named B, it should still group and name the series A /// diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Scan Library Parses as ( - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Scan Library Parses as ( - Manga.json new file mode 100644 index 000000000..803f92586 --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Scan Library Parses as ( - Manga.json @@ -0,0 +1,4 @@ +[ + "[218565]-(C92) [BRIO (Puyocha)] Mika-nee no Tanryoku Shidou - Mika s Guide to Self-Confidence (THE IDOLM@STE/[218565]-(C92) [BRIO (Puyocha)] Mika-nee no Tanryoku Shidou - Mika s Guide to Self-Confidence (THE IDOLM@STE.zip", + "[218565]-(C92) [BRIO (Puyocha)] Mika-nee no Tanryoku Shidou - Mika s Guide to Self-Confidence (THE IDOLM@STE/[218565]-(C92) [BRIO (Puyocha)] Something Else (THE IDOLM@STE.zip" +] \ No newline at end of file diff --git a/API/Controllers/LibraryController.cs b/API/Controllers/LibraryController.cs index 8c1eeb0c0..dcb35298e 100644 --- a/API/Controllers/LibraryController.cs +++ b/API/Controllers/LibraryController.cs @@ -612,6 +612,7 @@ public class LibraryController : BaseApiController library.AllowScrobbling = false; } + _unitOfWork.LibraryRepository.Update(library); } diff --git a/API/Controllers/OPDSController.cs b/API/Controllers/OPDSController.cs index 3466b5587..e122ae9f9 100644 --- a/API/Controllers/OPDSController.cs +++ b/API/Controllers/OPDSController.cs @@ -946,9 +946,7 @@ public class OpdsController : BaseApiController var series = await _unitOfWork.SeriesRepository.GetSeriesDtoByIdAsync(seriesId, userId); var libraryType = await _unitOfWork.LibraryRepository.GetLibraryTypeAsync(series.LibraryId); var volume = await _unitOfWork.VolumeRepository.GetVolumeAsync(volumeId, VolumeIncludes.Chapters); - // var chapters = - // (await _unitOfWork.ChapterRepository.GetChaptersAsync(volumeId)) - // .OrderBy(x => x.MinNumber, _chapterSortComparerDefaultLast); + var feed = CreateFeed(series.Name + " - Volume " + volume!.Name + $" - {_seriesService.FormatChapterName(userId, libraryType)}s ", $"{apiKey}/series/{seriesId}/volume/{volumeId}", apiKey, prefix); SetFeedId(feed, $"series-{series.Id}-volume-{volume.Id}-{_seriesService.FormatChapterName(userId, libraryType)}s"); @@ -1094,15 +1092,6 @@ public class OpdsController : BaseApiController }; } - private static FeedAuthor CreateAuthor(PersonDto person) - { - return new FeedAuthor() - { - Name = person.Name, - Uri = "http://opds-spec.org/author/" + person.Id - }; - } - private static FeedEntry CreateSeries(SearchResultDto searchResultDto, string apiKey, string prefix, string baseUrl) { return new FeedEntry() @@ -1122,6 +1111,15 @@ public class OpdsController : BaseApiController }; } + private static FeedAuthor CreateAuthor(PersonDto person) + { + return new FeedAuthor() + { + Name = person.Name, + Uri = "http://opds-spec.org/author/" + person.Id + }; + } + private static FeedEntry CreateChapter(string apiKey, string title, string? summary, int chapterId, int volumeId, int seriesId, string prefix, string baseUrl) { return new FeedEntry() diff --git a/API/Data/ManualMigrations/ManualMigrateRemovePeople.cs b/API/Data/ManualMigrations/ManualMigrateRemovePeople.cs index bf7d5725a..6966c0264 100644 --- a/API/Data/ManualMigrations/ManualMigrateRemovePeople.cs +++ b/API/Data/ManualMigrations/ManualMigrateRemovePeople.cs @@ -28,7 +28,7 @@ public static class ManualMigrateRemovePeople logger.LogCritical("Running ManualMigrateRemovePeople migration - Please be patient, this may take some time. This is not an error"); - context.Person.RemoveRange(context.Person); + context.Person.RemoveRange(context.Person); if (context.ChangeTracker.HasChanges()) { diff --git a/API/Data/ManualMigrations/ManualMigrateUnscrobbleBookLibraries.cs b/API/Data/ManualMigrations/ManualMigrateUnscrobbleBookLibraries.cs new file mode 100644 index 000000000..02c4886cb --- /dev/null +++ b/API/Data/ManualMigrations/ManualMigrateUnscrobbleBookLibraries.cs @@ -0,0 +1,48 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using API.Entities; +using API.Entities.Enums; +using Kavita.Common.EnvironmentInfo; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace API.Data.ManualMigrations; + +/// +/// When I removed Scrobble support for Book libraries, I forgot to turn the setting off for said libraries. +/// +public static class ManualMigrateUnscrobbleBookLibraries +{ + public static async Task Migrate(DataContext context, ILogger logger) + { + if (await context.ManualMigrationHistory.AnyAsync(m => m.Name == "ManualMigrateUnscrobbleBookLibraries")) + { + return; + } + + logger.LogCritical("Running ManualMigrateUnscrobbleBookLibraries migration - Please be patient, this may take some time. This is not an error"); + + var libs = await context.Library.Where(l => l.Type == LibraryType.Book).ToListAsync(); + foreach (var lib in libs) + { + lib.AllowScrobbling = false; + context.Entry(lib).State = EntityState.Modified; + } + + if (context.ChangeTracker.HasChanges()) + { + await context.SaveChangesAsync(); + } + + await context.ManualMigrationHistory.AddAsync(new ManualMigrationHistory() + { + Name = "ManualMigrateUnscrobbleBookLibraries", + ProductVersion = BuildInfo.Version.ToString(), + RanAt = DateTime.UtcNow + }); + await context.SaveChangesAsync(); + + logger.LogCritical("Running ManualMigrateUnscrobbleBookLibraries migration - Completed. This is not an error"); + } +} diff --git a/API/Helpers/Builders/LibraryBuilder.cs b/API/Helpers/Builders/LibraryBuilder.cs index 1cfd529a1..5550cfd51 100644 --- a/API/Helpers/Builders/LibraryBuilder.cs +++ b/API/Helpers/Builders/LibraryBuilder.cs @@ -20,8 +20,26 @@ public class LibraryBuilder : IEntityBuilder Series = new List(), Folders = new List(), AppUsers = new List(), - AllowScrobbling = type is LibraryType.LightNovel or LibraryType.Manga + AllowScrobbling = type is LibraryType.LightNovel or LibraryType.Manga, + LibraryFileTypes = new List() }; + + _library.LibraryFileTypes.Add(new LibraryFileTypeGroup() + { + FileTypeGroup = FileTypeGroup.Archive + }); + _library.LibraryFileTypes.Add(new LibraryFileTypeGroup() + { + FileTypeGroup = FileTypeGroup.Epub + }); + _library.LibraryFileTypes.Add(new LibraryFileTypeGroup() + { + FileTypeGroup = FileTypeGroup.Images + }); + _library.LibraryFileTypes.Add(new LibraryFileTypeGroup() + { + FileTypeGroup = FileTypeGroup.Pdf + }); } public LibraryBuilder(Library library) diff --git a/API/Services/DirectoryService.cs b/API/Services/DirectoryService.cs index 1c56c65fc..696418c77 100644 --- a/API/Services/DirectoryService.cs +++ b/API/Services/DirectoryService.cs @@ -746,7 +746,6 @@ public class DirectoryService : IDirectoryService public IList ScanFiles(string folderPath, string fileTypes, GlobMatcher? matcher = null, SearchOption searchOption = SearchOption.AllDirectories) { - _logger.LogTrace("[ScanFiles] called on {Path}", folderPath); var files = new List(); if (!Exists(folderPath)) return files; diff --git a/API/Services/Tasks/Scanner/ParseScannedFiles.cs b/API/Services/Tasks/Scanner/ParseScannedFiles.cs index 9102eb6d5..994daee80 100644 --- a/API/Services/Tasks/Scanner/ParseScannedFiles.cs +++ b/API/Services/Tasks/Scanner/ParseScannedFiles.cs @@ -126,6 +126,13 @@ public class ParseScannedFiles IDictionary> seriesPaths, Library library, bool forceCheck = false) { var fileExtensions = string.Join("|", library.LibraryFileTypes.Select(l => l.FileTypeGroup.GetRegex())); + + // If there are no library file types, skip scanning entirely + if (string.IsNullOrWhiteSpace(fileExtensions)) + { + return ArraySegment.Empty; + } + var matcher = BuildMatcher(library); var result = new List(); @@ -459,7 +466,7 @@ public class ParseScannedFiles await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, MessageFactory.FileScanProgressEvent("File Scan Starting", library.Name, ProgressEventType.Started)); - _logger.LogDebug("[ScannerService] Library {LibraryName} Step 1.A: Process {FolderCount} folders", library.Name, folders.Count()); + _logger.LogDebug("[ScannerService] Library {LibraryName} Step 1.A: Process {FolderCount} folders", library.Name, folders.Count); var processedScannedSeries = new ConcurrentBag(); foreach (var folder in folders) diff --git a/API/Services/Tasks/Scanner/Parser/BasicParser.cs b/API/Services/Tasks/Scanner/Parser/BasicParser.cs index 7687b3040..039e3acd6 100644 --- a/API/Services/Tasks/Scanner/Parser/BasicParser.cs +++ b/API/Services/Tasks/Scanner/Parser/BasicParser.cs @@ -29,24 +29,12 @@ public class BasicParser(IDirectoryService directoryService, IDefaultParser imag Format = Parser.ParseFormat(filePath), Title = Parser.RemoveExtensionIfSupported(fileName)!, FullFilePath = Parser.NormalizePath(filePath), - Series = string.Empty, - ComicInfo = comicInfo + Series = Parser.ParseSeries(fileName, type), + ComicInfo = comicInfo, + Chapters = Parser.ParseChapter(fileName, type), + Volumes = Parser.ParseVolume(fileName, type), }; - // This will be called if the epub is already parsed once then we call and merge the information, if the - if (Parser.IsEpub(filePath)) - { - ret.Chapters = Parser.ParseChapter(fileName, type); - ret.Series = Parser.ParseSeries(fileName, type); - ret.Volumes = Parser.ParseVolume(fileName, type); - } - else - { - ret.Chapters = Parser.ParseChapter(fileName, type); - ret.Series = type == LibraryType.Comic ? Parser.ParseComicSeries(fileName) : Parser.ParseSeries(fileName, type); - ret.Volumes = type == LibraryType.Comic ? Parser.ParseComicVolume(fileName) : Parser.ParseVolume(fileName, type); - } - if (ret.Series == string.Empty || Parser.IsImage(filePath)) { // Try to parse information out of each folder all the way to rootPath diff --git a/API/Services/Tasks/Scanner/Parser/Parser.cs b/API/Services/Tasks/Scanner/Parser/Parser.cs index 1ce3bf9bf..1d24283d7 100644 --- a/API/Services/Tasks/Scanner/Parser/Parser.cs +++ b/API/Services/Tasks/Scanner/Parser/Parser.cs @@ -271,7 +271,7 @@ public static class Parser RegexTimeout), //Knights of Sidonia c000 (S2 LE BD Omake - BLAME!) [Habanero Scans] new Regex( - @"(?.*)(\bc\d+\b)", + @"(?.*?)(? @if (bulkSelectionService.selections$ | async; as selectionCount) { @if (selectionCount > 0) { -
-
+
+
diff --git a/UI/Web/src/app/cards/bulk-operations/bulk-operations.component.scss b/UI/Web/src/app/cards/bulk-operations/bulk-operations.component.scss index 4427c8dba..608b891e9 100644 --- a/UI/Web/src/app/cards/bulk-operations/bulk-operations.component.scss +++ b/UI/Web/src/app/cards/bulk-operations/bulk-operations.component.scss @@ -1,6 +1,7 @@ .bulk-select-container { - position: absolute; - width: 100%; + z-index: 1; + top: 0; + position: sticky; .bulk-select { background-color: var(--bulk-selection-bg-color); diff --git a/UI/Web/src/app/cards/bulk-operations/bulk-operations.component.ts b/UI/Web/src/app/cards/bulk-operations/bulk-operations.component.ts index f7b138d7a..9886cbadf 100644 --- a/UI/Web/src/app/cards/bulk-operations/bulk-operations.component.ts +++ b/UI/Web/src/app/cards/bulk-operations/bulk-operations.component.ts @@ -37,7 +37,14 @@ export class BulkOperationsComponent implements OnInit { * Modal mode means don't fix to the top */ @Input() modalMode = false; - @Input() topOffset: number = 75; + /** + * On Series Detail this should be 12 + */ + @Input() marginLeft: number = 0; + /** + * On Series Detail this should be 12 + */ + @Input() marginRight: number = 8; hasMarkAsRead: boolean = false; hasMarkAsUnread: boolean = false; actions: Array> = []; diff --git a/UI/Web/src/app/chapter-detail/chapter-detail.component.html b/UI/Web/src/app/chapter-detail/chapter-detail.component.html index 1b5b9d0ef..38baf9a61 100644 --- a/UI/Web/src/app/chapter-detail/chapter-detail.component.html +++ b/UI/Web/src/app/chapter-detail/chapter-detail.component.html @@ -65,7 +65,7 @@ @if (accountService.isAdmin$ | async) {
-
@@ -73,7 +73,7 @@
- +
diff --git a/UI/Web/src/app/chapter-detail/chapter-detail.component.scss b/UI/Web/src/app/chapter-detail/chapter-detail.component.scss index ca6c6d57c..9e56fa4cb 100644 --- a/UI/Web/src/app/chapter-detail/chapter-detail.component.scss +++ b/UI/Web/src/app/chapter-detail/chapter-detail.component.scss @@ -1 +1,5 @@ @use '../../series-detail-common'; + +:host ::ng-deep .card-actions .btn.btn-actions { + padding: 0.375rem 0.75rem; +} diff --git a/UI/Web/src/app/library-detail/library-detail.component.ts b/UI/Web/src/app/library-detail/library-detail.component.ts index ed0419173..12f71e2f1 100644 --- a/UI/Web/src/app/library-detail/library-detail.component.ts +++ b/UI/Web/src/app/library-detail/library-detail.component.ts @@ -265,6 +265,14 @@ export class LibraryDetailComponent implements OnInit { case(Action.GenerateColorScape): await this.actionService.refreshLibraryMetadata(library, undefined, false); break; + case (Action.Delete): + await this.actionService.deleteLibrary(library, () => { + this.loadPageSource.next(true); + }); + break; + case (Action.AnalyzeFiles): + await this.actionService.analyzeFiles(library); + break; case(Action.Edit): this.actionService.editLibrary(library); break; diff --git a/UI/Web/src/app/nav/_components/events-widget/events-widget.component.scss b/UI/Web/src/app/nav/_components/events-widget/events-widget.component.scss index 8ff9695e9..003cd4bd4 100644 --- a/UI/Web/src/app/nav/_components/events-widget/events-widget.component.scss +++ b/UI/Web/src/app/nav/_components/events-widget/events-widget.component.scss @@ -20,7 +20,7 @@ .widget-button--indicator { position: absolute; - top: 30px; + top: 24px; color: var(--event-widget-activity-bg-color); &.error { @@ -79,6 +79,7 @@ .dark-menu-item { &.update-available { cursor: pointer; + opacity: 1; i.fa { color: var(--primary-color) !important; diff --git a/UI/Web/src/app/nav/_components/events-widget/events-widget.component.ts b/UI/Web/src/app/nav/_components/events-widget/events-widget.component.ts index 4235dc407..38bf8cd9c 100644 --- a/UI/Web/src/app/nav/_components/events-widget/events-widget.component.ts +++ b/UI/Web/src/app/nav/_components/events-widget/events-widget.component.ts @@ -72,8 +72,6 @@ export class EventsWidgetComponent implements OnInit, OnDestroy { */ updateAvailable: boolean = false; - debugMode: boolean = false; - protected readonly EVENTS = EVENTS; diff --git a/UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.scss b/UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.scss index 14e068895..e0a4eb61d 100644 --- a/UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.scss +++ b/UI/Web/src/app/nav/_components/grouped-typeahead/grouped-typeahead.component.scss @@ -1,8 +1,3 @@ -form { - max-height: 38px; -} - - .search-result img { width: 100% !important; } @@ -16,75 +11,89 @@ form { .typeahead-input { - border: 1px solid transparent; - border-radius: 4px; - padding: 0px 6px; - display: inline-block; - overflow: hidden; + border: 1px solid transparent; + border-radius: 4px; + overflow: hidden; + position: relative; + z-index: 1; + box-sizing: border-box; + box-shadow: none; + cursor: text; + background-color: var(--searchbar-bg-color); + color: var(--body-text-color); + min-height: 32px; + transition-property: all; + transition-duration: 0.3s; + display: block; + width: 50%; + + .search { + display: flex; position: relative; - z-index: 1; - box-sizing: border-box; - box-shadow: none; - cursor: text; - background-color: var(--input-bg-color); - color: var(--body-text-color); - min-height: 38px; + min-height: 32px; + + .btn-close { + position: unset; + margin-top: unset; + align-self: center; + margin: 0 8px; + } + } + + + input { + width: 100%; + padding: 0px 6px; + outline: 0 !important; + border-radius: .28571429rem; + margin: 0px !important; + text-indent: 0 !important; + line-height: inherit !important; + box-shadow: none !important; transition-property: all; transition-duration: 0.3s; display: block; + opacity: 1; + position: relative; + left: 4px; + border: none; + background-color: transparent; - .search { - display: flex; - position: relative; + &:focus-visible { + width: 100%; } + } + &.focused { + width: 100%; + border-color: var(--primary-color); input { - outline: 0 !important; - border-radius: .28571429rem; - padding: 0px !important; - min-height: 0px !important; - max-width: 100% !important; - margin: 0px !important; - text-indent: 0 !important; - line-height: inherit !important; - box-shadow: none !important; - width: 300px; - transition-property: all; - transition-duration: 0.3s; - display: block; - opacity: 1; - position: relative; - left: 4px; - border: none; - - &:focus-visible { - width: calc(100vw - 180px); - } - - &:empty { - padding-top: 6px !important; - } + color: #fff; } - - &.focused { - width: 98.5%; - border-color: var(--input-focused-border-color); - } - + } } +@media only screen and (max-width: 980px) { + .typeahead-input { + width: 65%; + } +} + /* small devices (phones, 650px and down) */ @media only screen and (max-width:650px) { - input { - width: 100% + .typeahead-input { + width: 75%; + margin: 0 auto; } +} - input:focus-visible { - width: 100% !important; - } +@media only screen and (max-width: 500px) { + .typeahead-input { + width: 100%; + } } @@ -160,10 +169,10 @@ ul ul { } .overlay { - position: absolute; + position: fixed; top: 0; left: 0; background: rgba(0,0,0,0.4); - width: 100%; - height: 100dvh; -} \ No newline at end of file + width: 100vw; + height: 100vh; +} diff --git a/UI/Web/src/app/nav/_components/nav-header/nav-header.component.html b/UI/Web/src/app/nav/_components/nav-header/nav-header.component.html index 958213225..7c49b2934 100644 --- a/UI/Web/src/app/nav/_components/nav-header/nav-header.component.html +++ b/UI/Web/src/app/nav/_components/nav-header/nav-header.component.html @@ -9,12 +9,14 @@ } - - + +
    @if (accountService.currentUser$ | async; as user) { -
    +
    - - @if (!searchFocused) { @if((breakpoint$ | async)! > Breakpoint.Tablet) { @if (backToTopNeeded) {
    @@ -206,7 +206,7 @@
    } } - } +
    diff --git a/UI/Web/src/app/nav/_components/nav-header/nav-header.component.scss b/UI/Web/src/app/nav/_components/nav-header/nav-header.component.scss index 87c734e98..296e9de45 100644 --- a/UI/Web/src/app/nav/_components/nav-header/nav-header.component.scss +++ b/UI/Web/src/app/nav/_components/nav-header/nav-header.component.scss @@ -1,91 +1,140 @@ -.btn:focus, .btn:hover { +.btn:focus { box-shadow: 0 0 0 0.1rem var(--navbar-btn-hover-outline-color); } .navbar { - background-color: var(--navbar-bg-color); + background-color: var(--navbar-bg-color); - .side-nav-toggle { - cursor: pointer; - margin-left: 13px; - font-size: 1.2rem; - i { - color: var(--navbar-fa-icon-color); - } + .navbar-nav { + .nav-item { + &.search { + width: 100%; + } } + } + + .side-nav-toggle { + cursor: pointer; + margin-left: 0.8125rem; + font-size: 1.2rem; + + i { + color: var(--navbar-fa-icon-color); + opacity: 0.8; + } + + &:hover { + i { + opacity: 1; + } + } + } + + .nav-item:not(.search) { + display: unset; + opacity: 0.8; + &:hover { + opacity: 1; + } + } } + // On Really small screens, hide the server settings wheel and show it in nav + // TODO: Look into doing this with bootstrap 5 (and moving to _utilities.scss) + .xs-only { + display: none; + } + + .not-xs-only { + display: inherit; + } + + @media only screen and (max-width:300px) { + .xs-only { + display: inherit; + } + + .not-xs-only { + display: none; + } + } + + .nav-item.dropdown { + position: unset; + } + +.navbar-brand { + font-family: var(--brand-font-family); + font-weight: bold; + margin: 0 2rem; + display: flex; + align-items: center; + + &:hover { + text-decoration: none; + } + + .logo-icon { + align-items: center; + align-self: center; + display: flex; + flex-direction: column; + height: 1.5rem; + width: 1.5rem; + margin-right: 0.5rem; + } + + .logo { + vertical-align: text-top; + max-height: 1.75rem; + line-height: 2.0625rem; + margin-left: 0.3125rem; + } + + .phone-hidden { + vertical-align: middle; + } +} + + .focus-visible:focus { + visibility: visible; + color: var(--nav-header-text-color); + } + + .ng-autocomplete { + margin-bottom: 0px; + } + + .primary-text { + color: var(--nav-header-text-color); + border: none; + } + + .search-result { + width: 1.5rem; + margin-top: 0.3125rem; + } + + .scroll-to-top:hover { + animation: MoveUpDown 1s linear infinite; + } + + .text-light { + color: var(--search-result-text-lite-color) !important; + } + /* small devices (phones, 650px and down) */ @media only screen and (max-width:650px) { - .navbar-nav { - width: 0; + .navbar-nav { + width: 0; + } + + .navbar-brand { + margin: 0 1rem 0 1rem; + + .logo-icon { + margin: unset; } -} - -// On Really small screens, hide the server settings wheel and show it in nav -// TODO: Look into doing this with bootstrap 5 (and moving to _utilities.scss) -.xs-only { - display: none; -} -.not-xs-only { - display: inherit; -} -@media only screen and (max-width:300px) { - .xs-only { - display: inherit; - } - .not-xs-only { - display: none; - } -} - -.nav-item.dropdown { - position: unset; -} - -.navbar-brand { - font-family: var(--brand-font-family); - font-weight: bold; - margin: 0 1rem; - - &:hover { - text-decoration: none; - } - - .logo { - max-height: 28px; - vertical-align: text-top; - } - - .phone-hidden { - vertical-align: middle; - } -} - -.focus-visible:focus { - visibility: visible; - color: var(--nav-header-text-color); -} - -.ng-autocomplete { - margin-bottom: 0px; -} - -.primary-text { - color: var(--nav-header-text-color); - border: none; -} - -.search-result { - width: 24px; - margin-top: 5px; -} - -.scroll-to-top:hover { - animation: MoveUpDown 1s linear infinite; -} - -.text-light { - color: var(--search-result-text-lite-color) !important; + } } diff --git a/UI/Web/src/app/series-detail/_components/download-button/download-button.component.html b/UI/Web/src/app/series-detail/_components/download-button/download-button.component.html index 518bdc83c..9b1cb46af 100644 --- a/UI/Web/src/app/series-detail/_components/download-button/download-button.component.html +++ b/UI/Web/src/app/series-detail/_components/download-button/download-button.component.html @@ -1,7 +1,7 @@ @if (canDownload$ | async) { @if (download$ | async; as download) { - } @else { - } diff --git a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html index 15513790f..950b5a8eb 100644 --- a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html +++ b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html @@ -1,5 +1,5 @@ - + @if (series && seriesMetadata && libraryType !== null) {
    @@ -48,7 +48,7 @@
    -
    +
    -
    @@ -89,19 +89,19 @@ @if ((accountService.hasValidLicense$ | async) && libraryAllowsScrobbling) {
    -
    }
    -
    - +
    +
    -
    +
    diff --git a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.scss b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.scss index e19cfeb2c..26ef0aabc 100644 --- a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.scss +++ b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.scss @@ -27,4 +27,6 @@ } } - +:host ::ng-deep .card-actions.btn-actions .btn { + padding: 0.375rem 0.75rem; +} diff --git a/UI/Web/src/app/settings/_components/setting-item/setting-item.component.html b/UI/Web/src/app/settings/_components/setting-item/setting-item.component.html index a5195ae61..2fd979c62 100644 --- a/UI/Web/src/app/settings/_components/setting-item/setting-item.component.html +++ b/UI/Web/src/app/settings/_components/setting-item/setting-item.component.html @@ -1,7 +1,7 @@
    -
    -
    +
    +
    @if (labelId) { @@ -15,9 +15,9 @@
    @if (showEdit) { - + } @if (titleActionsRef) { @@ -25,7 +25,6 @@
    - @if (isEditMode) { } @else { @@ -34,7 +33,6 @@ } - @if (subtitle) {
    } diff --git a/UI/Web/src/app/sidenav/_components/manage-external-sources/manage-external-sources.component.ts b/UI/Web/src/app/sidenav/_components/manage-external-sources/manage-external-sources.component.ts index 99c399714..e268daadb 100644 --- a/UI/Web/src/app/sidenav/_components/manage-external-sources/manage-external-sources.component.ts +++ b/UI/Web/src/app/sidenav/_components/manage-external-sources/manage-external-sources.component.ts @@ -1,21 +1,19 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DestroyRef, inject} from '@angular/core'; -import {CommonModule, NgOptimizedImage} from '@angular/common'; +import {NgOptimizedImage} from '@angular/common'; import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from "@angular/forms"; import {NgbCollapse, NgbTooltip} from "@ng-bootstrap/ng-bootstrap"; import {translate, TranslocoDirective} from "@jsverse/transloco"; import {AccountService} from "../../../_services/account.service"; -import {ToastrService} from "ngx-toastr"; import {EditExternalSourceItemComponent} from "../edit-external-source-item/edit-external-source-item.component"; import {ExternalSource} from "../../../_models/sidenav/external-source"; import {ExternalSourceService} from "../../../_services/external-source.service"; import {FilterPipe} from "../../../_pipes/filter.pipe"; -import {SmartFilter} from "../../../_models/metadata/v2/smart-filter"; import {WikiLink} from "../../../_models/wiki"; @Component({ selector: 'app-manage-external-sources', standalone: true, - imports: [CommonModule, FormsModule, NgOptimizedImage, NgbTooltip, ReactiveFormsModule, TranslocoDirective, NgbCollapse, EditExternalSourceItemComponent, FilterPipe], + imports: [FormsModule, NgOptimizedImage, NgbTooltip, ReactiveFormsModule, TranslocoDirective, NgbCollapse, EditExternalSourceItemComponent, FilterPipe], templateUrl: './manage-external-sources.component.html', styleUrls: ['./manage-external-sources.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush diff --git a/UI/Web/src/app/sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component.html b/UI/Web/src/app/sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component.html index f2318192b..ee6f0c734 100644 --- a/UI/Web/src/app/sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component.html +++ b/UI/Web/src/app/sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component.html @@ -1,5 +1,5 @@ -
    +
    diff --git a/UI/Web/src/app/sidenav/_components/side-nav-item/side-nav-item.component.scss b/UI/Web/src/app/sidenav/_components/side-nav-item/side-nav-item.component.scss index b7f7041aa..92b151b2c 100644 --- a/UI/Web/src/app/sidenav/_components/side-nav-item/side-nav-item.component.scss +++ b/UI/Web/src/app/sidenav/_components/side-nav-item/side-nav-item.component.scss @@ -1,152 +1,33 @@ @import '../../../../theme/variables'; -::ng-deep .side-nav.closed { +::ng-deep .side-nav app-side-nav-item:first-child { + .active-highlight { + border-top-left-radius: 3px; + } +} + +::ng-deep .side-nav app-side-nav-item:first-child { .side-nav-item { - .side-nav-text { - opacity: 0 !important; - } - - .card-actions { - opacity: 0 !important; - } - - &.active { - color: var(--side-nav-item-active-color); - background-color: unset !important; - } + border-top-left-radius: 3px; } } -.side-nav-item { - position: relative; - align-items: center; - display: flex; - justify-content: space-between; - padding: 0 0 0 10px; - width: 100%; - height: auto; - min-height: 40px; - overflow: hidden; - cursor: pointer; - font-size: 0.9rem; - - .side-nav-text { - opacity: 1; - min-width: 100px; - word-break: break-all; - -webkit-line-clamp: 1; - text-overflow: ellipsis; - display: -webkit-box !important; - -webkit-box-orient: vertical; - overflow: hidden; - - div { - min-width: 102px; - width: 100% +@media (max-width: $grid-breakpoints-lg) { + ::ng-deep .side-nav app-side-nav-item:first-child { + .side-nav-item { + border-top-left-radius: 0px; } } - span { - display:flex; - - &:last-child { - flex-grow: 1; - justify-content: end; - } - - div { - align-items: center; - height: 100%; - justify-content: inherit; - min-width: 30px; - width: 100%; - padding-left: 5px; - - i { - font-size: 18px; - } + ::ng-deep .side-nav app-side-nav-item:last-child { + .side-nav-item { + border-bottom-left-radius: 0px; } } - - &.closed { - .side-nav-text { - opacity: 0; - } - - .card-actions { - opacity: 0; - } - - &.active { - color: var(--side-nav-item-active-color); - background-color: unset; - } - - i { - color: var(--side-nav-item-closed-color); - } - - &:hover { - color: var(--side-nav-hover-text-color); - background-color: var(--side-nav-hover-bg-color); - - i { - color: var(--side-nav-item-closed-hover-color); - } - } - } - - &:hover { - color: var(--side-nav-hover-text-color); - background-color: var(--side-nav-hover-bg-color); - - .card-actions i.fa { - // TODO: The override to white does not work, please fix for light themes - color: var(--side-nav-hover-text-color) !important; - } - } - - &.active { - color: var(--side-nav-item-active-color); - background-color: var(--side-nav-active-bg-color); - - .active-highlight { - background-color: var(--side-nav-item-active-color); - width: 5px; - height: 100%; - position: absolute; - left: 0; - } - - .side-nav-text, i { - color: var(--side-nav-item-active-text-color) !important; - } - - &:hover { - color: var(--side-nav-hover-text-color); - background-color: var(--side-nav-hover-bg-color); - - .card-actions i.fa { - // TODO: The override to white does not work, please fix for light themes - color: var(--side-nav-hover-text-color) !important; - } - } - - } -} - - -a { - text-decoration: none; - color: var(--side-nav-text-color); } @media (max-width: $grid-breakpoints-lg) { .side-nav-item { - align-items: center; - padding: 0 10px; - height: 55px; - font-size: 1rem; .side-nav-text { width: 100%; @@ -155,12 +36,5 @@ a { span:last-child { flex-grow: 0; } - - - &.closed { - .card-actions { - font-size: inherit; - } - } } } diff --git a/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.html b/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.html index 2d8e5db87..f88d1471a 100644 --- a/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.html +++ b/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.html @@ -9,7 +9,7 @@ @for(section of sections; track section.title + section.children.length; let idx = $index;) { @if (hasAnyChildren(user, section)) { -
    {{t(section.title)}}
    +
    {{t(section.title)}}
    @for(item of section.children; track item.fragment) { @if (accountService.hasAnyRole(user, item.roles)) { diff --git a/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.scss b/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.scss index 2515ad5fd..79917b512 100644 --- a/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.scss +++ b/UI/Web/src/app/sidenav/preference-nav/preference-nav.component.scss @@ -1,84 +1,36 @@ @import '../../../theme/variables'; // TODO: Move this to a common file so it applies both ways .side-nav { - padding-bottom: 10px; - width: 190px; - background-color: var(--side-nav-bg-color); - height: calc((var(--vh)*100) - 75px); - position: fixed; - margin: 0; - left: 10px; - top: 73px; - overflow-y: hidden; - overflow-x: hidden; - border-radius: var(--side-nav-border-radius); - transition: width var(--side-nav-openclose-transition), background-color var(--side-nav-bg-color-transition), border-color var(--side-nav-border-transition); - border: var(--side-nav-border); - scrollbar-gutter: stable both-edges; - scrollbar-width: thin; - // For firefox @supports (-moz-appearance:none) { - scrollbar-color: transparent transparent; - scrollbar-width: thin; + scrollbar-color: transparent transparent; + scrollbar-width: thin; } &::-webkit-scrollbar { - background-color: transparent; /*make scrollbar space invisible */ - width: inherit; - display: none; - visibility: hidden; - background: transparent; + background-color: transparent; /*make scrollbar space invisible */ + width: inherit; + display: none; + visibility: hidden; + background: transparent; } &::-webkit-scrollbar-thumb { - background: transparent; /*makes it invisible when not hovering*/ + background: transparent; /*makes it invisible when not hovering*/ } &:hover { - scrollbar-width: thin; - overflow-y: auto; - - // For firefox - @supports (-moz-appearance:none) { - scrollbar-color: rgba(255,255,255,0.3) rgba(0, 0, 0, 0); - } - - &::-webkit-scrollbar-thumb { - visibility: visible; - background-color: rgba(255,255,255,0.3); /*On hover, it will turn grey*/ - } - } - - &.no-donate { - height: calc((var(--vh)*100) - 82px); - } - - &.hidden { - display: none; - opacity: 0; - } - - &.closed { - width: 50px; - overflow-x: hidden; + scrollbar-width: thin; overflow-y: auto; - background-color: var(--side-nav-closed-bg-color); - border: var(--side-nav-border-closed); - } + // For firefox + @supports (-moz-appearance:none) { + scrollbar-color: rgba(255,255,255,0.3) rgba(0, 0, 0, 0); + } - .side-nav-item:first { - border-top-left-radius: var(--side-nav-border-radius); - border-top-right-radius: var(--side-nav-border-radius); - } -} - -::ng-deep .side-nav-text { - div { - display: flex; - } - span { - font-size: 0.6rem; + &::-webkit-scrollbar-thumb { + visibility: visible; + background-color: rgba(255,255,255,0.3); /*On hover, it will turn grey*/ + } } } @@ -112,21 +64,6 @@ height: calc((var(--vh)*100) - var(--nav-mobile-offset)); } } - - .side-nav-overlay { - background-color: var(--side-nav-overlay-color); - width: 100vw; - height: calc((var(--vh)*100) - var(--nav-offset)); - position: absolute; - left: 0; - z-index: 998; - - &.closed { - display: none; - } - } - - } .side-nav-header { @@ -134,12 +71,3 @@ font-weight: bold; margin-left: 5px; } - -.side-nav-header:first-of-type { - margin-top: 0.5rem !important; -} - -// Overrides for this component -::ng-deep .side-nav-item { - padding: 0 0 0 20px !important; -} diff --git a/UI/Web/src/app/volume-detail/volume-detail.component.html b/UI/Web/src/app/volume-detail/volume-detail.component.html index 822683b39..d1f64e20f 100644 --- a/UI/Web/src/app/volume-detail/volume-detail.component.html +++ b/UI/Web/src/app/volume-detail/volume-detail.component.html @@ -1,6 +1,6 @@ - +
    diff --git a/UI/Web/src/assets/images/logo.ai b/UI/Web/src/assets/images/logo.ai new file mode 100644 index 000000000..5aac208a0 --- /dev/null +++ b/UI/Web/src/assets/images/logo.ai @@ -0,0 +1,350 @@ +%PDF-1.6 % +1 0 obj <>/OCGs[18 0 R]>>/Pages 3 0 R/Type/Catalog>> endobj 2 0 obj <>stream + + + + + Adobe Illustrator 29.0 (Windows) + 2024-10-24T07:23:09-06:00 + 2024-10-24T07:23:09-06:00 + 2024-10-24T07:23:09-06:00 + + + + 256 + 256 + JPEG + /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAAEAAwER AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE 1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp 0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo +DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7 FXYq7FUNfalp9hH6l5cR26djIwWtPAHc/Ri15M0MYuRAYvqP5n6HbkraRy3jDowHpofpb4v+FyPE 6vL21ij9IMvs/HySC6/NTWJKi2tYIAe7cpGH01Ufhg4nAn25kP0gD7UnuvPHmm5qGv3jU9ogsdPp UA/jjbhz7Szy/i+WyUXF5eXLcrmeSdutZHZz/wAMTgcOeSUvqJKjiwdiqtbX19amttcSwHxjdk/4 iRi2Qyyj9JITe188+abagW/aRR2lVZK/SwLfjhty4dp54/xfPdOLX81NZSgubWCcDuvKNj9NWH4Y 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 + + + + 1 + False + False + + 512.000000 + 512.000000 + Points + + + + Cyan + Magenta + Yellow + Black + + + + + + Default Swatch Group + 0 + + + + Document + AIRobin + application/pdf + + + logo + + + proof:pdf + uuid:70ca705b-264e-483f-9a4f-371736a92172 + uuid:5cf0c312-a9e7-4dbd-8b76-d35d9457c70f + Adobe PDF library 17.00 + + + + + + + + + + + + + + + + + + + + + + + + + +endstream endobj 3 0 obj <> endobj 5 0 obj <>/Properties<>>>/Thumb 22 0 R/TrimBox[0.0 0.0 512.0 512.0]/Type/Page/PieceInfo<>>> endobj 20 0 obj <>stream +HW͎)ҲfdA~=T55kdOS].v޷_g[8cY?_'`ֲ}u;ڙkۏp=!Vkw߶#[Ό͆۴gd#.6mlEτK>Sbo=OiSDQ&S7)w,5MS]! ֯daWGߥC1Į9峈 `"gɅ]0[aMECHR"O +UfLI7>(^l G +XI:a-Hs v N*NItbRkc♸WzTx(x +g \@qdt;BmIy +ZPuZL)>hLfr +SB/(O3#.8\UΘ@P>́>^Sa`nn[w.3;a{'ipHo&h^Nbh=T [{<+\P$PljHXppLg Ѡ4p"mX:L4ĉ!8B_}Z$so,HUv_ q4:0C%vveċW޷/ۿ}}B-o&['#Sw /9xm†Q%aOX ?հZ9PB} ϱ,s<)f_]S'غ d0qb>5Pgs1 D f fݙ|d&o2u 21 3LrM3D4 MrqP &9tU,!I'ŕD]&-Nޝ_IAO+=ؖ˴dsCqz&IO + MzqP &==,.zJ}SJD2a4b>unA78ŶXƛdsCqz&IOICD Ҵ_ss9+ ,p妧˃Vzo.;mv:=x.ރmL/7=ȤL0ӦUyڭ<jsrǁAM"LsC$. +Ɣ $R<ԕ($fhu k*vI]jL ޥF0Nnل8I#[2Nɖj~m}:|tn[ҍI[z7ptbe)òizɷ>[ǁބ +>]oEőe= +yYP¼z]ZUVSͥ<lv60MnPND5 +aVdnˆm!| " U`~_t]Z<]AXK ahL°J*a?&a7('lak֦da> # $]4~LY `uHg +j ,Gtp);<{_`{5s4ƶ\L3SXChw`z*lxV#)YT(* =P1Z R^;nԥTkg R8@q'[0pVtbѬǶL݄4 X+9ysGqwxXxU;j|̙_KR!4' 9U2#nbÔ^.:NGy l<8 ?Z 82͎0yc2߭c6IfmL8x}ܞ 58a2;VJe]Y6ޡ *bPw*nVo^aĈ͆R=cV0hFvqA m#ALDɘ$b11 +ΚHBsPɴ!:J}LB%tXpho\:6VQѧyd?J\ :E-}$qP({Phxּ};. ^ 1.\."Nj{0ᡋ[/F%t#H &tLdtOߧHKEL2SvK\($|jd 2l]x`⡑g`XHaohFA=@G|nӌpF99s%@ .7cHoZ\ W-αd@46me3 ~wmˉw]/C>#eaYцImXȤ}.%;sy!ߡ@ :Ao{It݋E/np蜻2Ýxԏdz|<݋sU9wjܽ(Z/npZ7s-c#'UOUh< #Lw LXJjՈfZ5y3^K +endstream endobj 22 0 obj <>stream +8;X]TbHZ^C&5:0/-hkQJKEbh0g=4c=_2us:+q4'o6/Q10HAgn3e(oO:kP2KQ4G;>= +p@8Mpf4AIQ[OPTq=A&NU[\PXIt&!! +"U*_\TD1>&g[Nr)pqb:7^B:P`rb30""M`MCI$=92T6J.s!reG0!J1j8g7WpR7ed2b +?Ye$gJ`;0ahaRR)+oYR=6iSTaU](Ac?_Mu?h`U!rrE&4_YPr>4(]84$s3LY!D!Utj +nR%tSn=Q48D>pH:ftI@1S:=90qg?E`/TnP=n\lT!0f/`4ICA2)&+nbjH9hK@64fbT +gn3V_m#V)*5DdX*:](((&8#EkKL#8BW5-g@HFS:j4,h9%&=c'@&6g,^9aGsUPHAd/ +bSHI?5p>ef\YO:3fc?KR.EJrBE;OLUJDHUXrrMn2[0pHT\.3',RoLkLf2S\]QYOlY +T2!N*#64c(rr<$!s8N0$)FpT]~> +endstream endobj 8 0 obj <> endobj 9 0 obj <> endobj 10 0 obj <>stream +%!PS-Adobe-3.0 +%%Creator: Adobe Illustrator(R) 24.0 +%%AI8_CreatorVersion: 29.0.0 +%%For: (Christopher Ramos) () +%%Title: (logo.ai) +%%CreationDate: 10/24/2024 7:23 AM +%%Canvassize: 16383 +%%BoundingBox: 704 284 1216 796 +%%HiResBoundingBox: 704 284 1216 796 +%%DocumentProcessColors: Cyan Magenta Yellow Black +%AI5_FileFormat 14.0 +%AI12_BuildNumber: 186 +%AI3_ColorUsage: Color +%AI7_ImageSettings: 0 +%%RGBProcessColor: 0 0 0 ([Registration]) +%AI3_Cropmarks: 704 284 1216 796 +%AI3_TemplateBox: 959.5 540.5 959.5 540.5 +%AI3_TileBox: 654 144 1266 936 +%AI3_DocumentPreview: None +%AI5_ArtSize: 14400 14400 +%AI5_RulerUnits: 2 +%AI24_LargeCanvasScale: 1 +%AI9_ColorModel: 1 +%AI5_ArtFlags: 0 0 0 1 0 0 1 0 0 +%AI5_TargetResolution: 800 +%AI5_NumLayers: 1 +%AI17_Begin_Content_if_version_gt:24 4 +%AI10_OpenToVie: 511 821 1 0 0 0 1814 1099 18 0 0 153 238 0 0 0 1 1 0 1 1 0 1 +%AI17_Alternate_Content +%AI9_OpenToView: 511 821 1 1814 1099 18 0 0 153 238 0 0 0 1 1 0 1 1 0 1 +%AI17_End_Versioned_Content +%AI5_OpenViewLayers: 7 +%AI17_Begin_Content_if_version_gt:24 4 +%AI17_Alternate_Content +%AI17_End_Versioned_Content +%%PageOrigin:0 0 +%AI7_GridSettings: 72 8 72 8 1 0 0.800000011920929 0.800000011920929 0.800000011920929 0.899999976158142 0.899999976158142 0.899999976158142 +%AI9_Flatten: 1 +%AI12_CMSettings: 00.MS +%%EndComments + +endstream endobj 11 0 obj <>stream +%AI24_ZStandard_Data(/X):w&Dh1"2@m¢8N KXCDA@k +GuEޗJ~1nAg~9-mӫc߶޻iwᚮYo_SGoyaկ5?[I4ök5%; +U9+N}La|tkVU#!Y񫵠ko[2߯w ީ)RT?mH߻T]`1 +ީxۆW aPˏ\kPb߿֯Ƃn\|jU/|˯V6v jpol`yoI>FO#dK MRf_`ؽɱTʆt>ƛİ$MwܩO׺kwo[Յq;1gӽR5`FS;ao/2Nsܚou~l9%t!Lp}5_bxu_{QY[PCC_\,1A5 |ϧ1ǿûIj!'W磒|tK:(#GAN4) xcچׅv˖Ow65j[ZmMkt@3|`8,{w5Q2K +mØTe' aY"_R4,|X2HJ ZF]@ڂƵcƱ "7;)Q4Kчh<,p;CqM 14CX8"k@?[p2[/1z2&0˗;wdvM{2;%qXIIy׸NIbaY2\ ,XVGOқWYzvЃ "8$X&)e*,Ȃ- P ǐ 0 p ٰ E/b((b)"**"+"G,pq$r4GtLGu\GvlGNvғ ")#I%i(*,ْ/2,r,ɲD˴T˵d˶f7 )IiٚGA4DEtDIDMEe)ԧ`b:dZfikʦmծzTCUTGTKTQ5UUuUYUWk븒kbk뺲krY YY-YEٔUٕeٖmo} a+cKekhjl۶kfJb +=mE(GW35M4Cӛd˴4K,#K%/Y[s$*b)bؖ +bY +ObJ=E$Aӗ%YXX%4EG,GqQdC< +E""e(idWG̱IqGώ],}e-CzbCrs~bO}iˮ*h(hI#:b(юvٚɚe&ihfh&hzf[%[ZZ%ZeY%YX%Xҗ%/[%WR%,%Q$K$GR$C$=INc;:c:98c8V\EULES,EREQ EP"q p 0 p 0 G[hL0F?ߧOל:'xE +W]hBZ=ߧ2۪_sBcVNj m1V7b5jX6d kWUXC* L%÷ y&;9k }˿՚Uru2oܒLR#i읗^y."*.WÑ|$> %~1J"Kkˮ&ZˮKwQ|4{OxCn))ndXSx1AyCGkW/zA?_ðs(ILAp8aBqaPD1hAmVf$3 >`5Hr4z[A?$p,"@+%nAvzn $тrX:q0i-՛wAzgնi5[ӼڟW8F^ 9A̩JQkN9 Bj ǻ3̀_oVB=eư꿢ۆ땺 rDa RiA9˸zYַcA~ri4GGq_vTVv\1#|HE^i2!PdɜGH^]?rZ(+db48Reh CԳ20NbDӱ"]V&qpQXFŞ4T(6j|& $ +BN)yt02I4t_PڎNq x&GRv[V(2A@`wfl)>TJJ6pXV6 c.HGe3<, +ʎ< 'G)M&%j[@,QtK P'ӀxCaA z:DB[ڟi)j'P<8"TK(N +@!$$aA4MAw'+7Vт)H!‚M %$!tIGK!cyPB*h!4_N*pX1B>sǀJIy0òRqsm.HLHunG]~RsXf,gԤ$PĢ(U ׍ -9,7i*OXI( kb"{pAB`;,s1:W +u9f>"v rX\ HUk ƴ#ք6:ir&(n"C ?a{@rhr'xEASvKhF+U''i9lb&P<``pZtg +NN\T]&bRpXk,ht M<,'2ݫĀs uK(g(C亏lB9,4H(O~tS`9XObO|mKOJ9K?-9JcޱY:g>\Jqתz 9uGN6x)UB9 9<}vWaYj[.ckYguV"<c+Nݖicm_6.1B7-xgz;(=sX.LH2R|VBLld:=4Ƴ+KMJ Cρ`|"NfVPO=VЍ|0[.܍>_KQkv䄚%(԰uE"Qx,9Āe#ɱ9bޱHNVYX96V|",Xu!8gXzfP62 IaYvaޫIW,^{N_+/7ڂ^/a尌w髻Vdŀ3 נ%^hvZĉB%D7@-&kA"xj@E?2#b$Ƕ2yu*1rlc`Q|MRjH:>}Q/z;e-I1b9,kijS/%,]$X9Ak4KLD<)IZų[G Wd&Ф#KqWXi nӻPpHfS_ނ㜒-y Whes֞i^U߮_{yj-^a{am5ӂj[P0h~Lñj_%Ѱ'xP^tM׫6 Znz->z|?]ٞM[ɳǞM&Ϧ9jnhQe-ZrELlUxBѴiUQi^3m)m <Ӽ3 76j>ymۂG85j:Fy2>PxkO^*5<;z^pPt÷i^ꥹKf^7C'VKEEʹS]14!8 p}2K~i6oelUhN/[;1Mj2ݰOoLk<5`q/ >"z>}kVYP -rwdžA?|B5 "3mp^z(~[ZLnZ/3lêE߯ʹJ_34,M붆k6$moʹkֵzӫT h+g4ӂaAZ%8,p;.#%B#MeLJA?~N +{Q^5H:2#uYdJ\!K9$)()3>=BòD㛃xje8x f:|J0D`q9[n.-<X-,Yq":# UEAqXVO ? +9S`PQtQR H|҄-&`TS '^dbyj( +?4hn){zƂѣ.=$>> /wmb".hEb;Ĩl+Q)X,0H-ejǯ{ArQl%4րxr(A4^Ώ]s&aʎB2} +vT>[rX(ؑf% +RZ>;#bC9,sKB-G»(Q-M`rX6"\Ci@|5"05э)(& JXW@cޗpzCxTA.|coIL]G5ӨL%~\X&! 1)&w$l=55D8Y𪸀$%D8=G.=TեHϦ`3h}D 6ʲ?gprǕ;n=C( +lEqh @W\h \6='˂}ޕ}gnQ㨨$Qx/Qx Q:4E֛fob=V-@`;@~N +z&4^O,ࠃkv(yB.ʜBG1(/VeacRyjۦ-Jv=ӃS<$ +-B6vՅ@KޥH)R|lW #ꠍβ?gٟg{rGPE3 B36ɅSr/蓁8 +!l5 V5'!ĤeZ ޲D] ~1agH"UTqRE3LvrQ޷oӎٱ +,0B`c*=6=8ǟV!m\TyM eALQ TS?oxHd~|aԇ$(- )H$rԤ$E BLdx*2xH`_]خ.=Ⰼ$z87:,s>ԅ# +Az?~1:EG*\mi\{/t_@>PL.L =òV ?>^dA '^o,bbCJ}{vWT%_] %J=gW!uɪK_{w%Qxi,~$ +OMԾ X`=hk6zy+Ǩ"vEj[ mpdpl`AP(W4 +%Gs-́EvVvĄxCqpːYw !nK !5جZ}LcppyhQXZ B0j.- `tLKJ3 +MkòW-b+ec͒d>..MeݦAۋq<(c(e!zHaHgdCQL`+&2(y2& i$8eDHRD"DU{Nǚ$, )a} Q$ 3h hy<.,v!m{]L, Nƅ]X,0d;{UeMyr͓2(Iz8KVT tKr** J) l %Q0 R0I6+ +]3-(|]\SS}E긤߾ GFbήuym2tM?$˾5qqUp͓՗=;6i>\cAlގ%%1:;֞S1=>2簌g MEl Φy%48;ֿTE}88<;=];k +|\dBsvkI'99 GJqt + SZ0TY`sXA ,6[zPFkG&t%#jSo2ؑ.{|efe$ԎW #ɣz8 MR`G8&U)M5q͇H=-CxH8MiF{4 +c ?iE`#r<N$đ(!@yWak@a0auIPpéAjnrXJl&kg@5 7kҖ@q6zkL@qe'JjDG ^I ) ΏY``*E<$r~ő(rҜKI:[\ij$"vR*q(JqO-8[&Lh :h0 +ٴ2ESnjt XsAb2S=o'@R\g)5Ђ̦mPOaF/ R[@[Ame#P݄ مL=A6U'Eq-*1a* Txh:R2#9$0V;u蝺uvrl]{D䄋%? epQq>MF \ ejqX@$,"{`P$0c2ePZS!IEϒrN=r C Ea+ݪbòn!zԙR-yߝAZTSsx ߌLm)}abpXf?N6ic7c;]њ,8,' 4u]mOoSwɆ&26!&P{7o"’egxПK0_EtqXF f+ +'vt66U%pPD9,8<~nO9E|D7ЗKa&D +z mѶH-h#Fj9,SXxPgr`vPK?ȕzE_QV#G8`u A!2[0 n, @=6YՂK@,ͱ9ꚱUDdžv+@av96\48MOH8ߣW]}p h+463vnHGЪaTzYӪH e&YR[I+A:ycJ?aƽS!lv0cSx͑6plQƱՏS]Xgacͧ A[ꝺ❺d}&m RBGYIy +UwS˩s@ڤrpijDjsXLO6Vފ +X҇Qta=uQPHԉV=Gd$.Cq{ՃV XZ$䰬a@尌'RY/αvIijH^G_&Bd`}WAae],D<舣QJKRn#[J~rL[(2zPuWq $dXR +90HCD^X(|xĀ iֆ[PÚ +a D(=&![}0Gj?&ʀ2`=NErX^U?R@tew}`J =\@TlBx $Hl{ZA1PqUXb7Mj- A6%J~>)΍$NZƒKTax0ێ'(IQ8? ?uN@4+(e+$@HդT+|"kϷx` Ba(-) 4ȉPa ɴ@>)>i]A#+"FC5}Mgnl+J@m v|˶SuxL6愚$Ad"[-'`nd +C]$Q4ɪ}z |J g[ d/ʋ&ѩ8PCmS/GwLbrI<¨y +$T[mZnf6n[zYUeTH= fAZ8>UVXߟR_t7ڒɎ&T4v]ޏB ڃ $,!sôƒW?}|+2~heF7$yD+{\4J^ג hqX"͔ !]Q|‡xkI V/oK%8ڤ΂}4r `>}Rbh%kad(ҵeP(C6ӐbvJaLO+RpRdxqz%]z*14ȣh|V#ZjM 钘Z15=N|~ahIElz :X?Z"^`bRd@BUZAG +!K Z4RF#6m&d NI@vѬjK%_mdd/)-hasAQ,a{J +3i(xM`> p{t)ߔ)us2afnh qP3F@ջ%r&Sb ? q !PW_5g:${骤l9bs0k$g\.%,A ڪ}:'[v`2&8]XȮӾlÁRO|Z3Nfsprwhn'H0q0k;US2@EJj?C[2-Ќ7`AEqc"{B>r#hX\GTc9}ϼNGt 9]Ei/9tB~`Ht5GϕEH'@U<2@g % +seV8oFƈLBa'f`E SFrvʻgk>LfBcK)> +lڏ;~p(>gd`utk+o]G:fVx;g%e OE3$C(+w-K@ڣQc&toeLBnQ!.m˴'o{&f@1ဌ|1~ۭ.ļin[շmH?WmpQT2$tϚZE7|<S!i"ijDN9u(]C{Qp CWgAAos=0~H;&Ի&k2&o9flI6+;gY- P􇰛^ÂvPӏp 2kH&.p(Q$ؠY&{)?RuEǠ%V0vޔ*2&dqeF>#g \HW}SNz]rjG#GQ)Kq`נz2bkZ[9^wY#&K4rESS:_JZ\S?&]wo-,9Mk|4'DDb>̱Cۏ:(TO7+߀pB}-MkEygZ,H36zz7IAZ SGr:b5E֣R rg<)JgA@zvaZlG3( |PiW0i,v +~r"(.Fl̂oply@>#^Dl)p +6+i@K+SiQ-(ߝB :P51*“['h$-O$+P#4Br8@jl8;/I +,r/q# +v]^lq(q3jshkv/,!</6=#Tl9C4r3"J`~kj;༇p㺮1Qe[uEFgiAZ6pFP~6]'"/_mFӸ.-̀XjMpun~4ZK"ӧ'%[\yI(Wǵ\1c|Oz%#0tL< +f 3rЬoHUG+ @|-k9TnD8j;˵ g#,ۇͺ K|Hg8n NYpA?G*i2}(ɗ:fhƎY P"w;u3ZPNĎ=Ã!gm'J+O 8ӈudu-o}XA}GR~7҇cU]RGh~kB(vMOR Ef9a_ 'eJji cR,'(N0$b ˝L-Us?_Q&琟;w(l%{܁;m092_8{Oa!JUOkvp2beY?=KƫS/œɔmi{pyאl p|ᔁ7U >! dQĉ x<-dw1#B<v\^7PaKvy $'{]ͧ& + |=*\W9}:sF/ +n3j/j$Z^..h9|7,᫦_[2^V{/d/T +~/p]aBd/Q$~/_B.d_=xi(YwhzS `\5586:Z9 ʒI pY8;l\I:(Kņ}pJ8!Ki:x˘^^l27D-l>鳔2 +uБP9Pdgvؽy y--rZ]MlP!z|OI2׹I=aLIꮐ} n8IOLxg_mug̉UL O'c&A]E'Ԗ6٘-ܕET$pˆ1u!BSgQ5K +]R ch~΅$_~]O;Ax oۅ~JI9TS12y"L Gz:]k8W9'Mzs.餴 $I(XPsw1.0V]VtXVFWS:1|@d68NDA}‡cm? ٻA#)zAHNpۥ]eۄ}q^>ɀ8.b6eGƋ6q.ٚk{*jdzny_2N6ԃ9 K&hM\N?hn ;pr5M7yKzo%;.ǜģm, +]"pH'Q1`i~ ;wnJÊa=څsae(xY/3{ ۢ*ä0;<+ߕŇ%?gE+S9Z;4$Wpeg8 E.C?E`F,hN3"7vEDd;WJ@*1Z3.)ʴIiGE46peGA"D,o>LC3?6Qn e%5l? ]zJ6.%ͰB<%Zs>Q'k/!֭FS\G!aAQ.wL\h0^0JR_.ؔS)Ci0Ӂ0JL q" 7͌}7 A|rL$Iz>T٠N-jꐥ 8 )E-olhFh\ȓO:5<+ _a.#h[_vg3<]-XuEcHCFwK5Ο`_BUa%@"Ou{ё;e{rJ%be +;|?]F'qhh CE bs}πEO8^tP*~|EFGCA>`XEzi2Zal{(dϰh n[æ1E ˿ OfȃFW)pD 9N=f1BW5.=d߬_?#Rwd<9%Dpl:`'*as 97G^[05[KvNZmxǝjo,R a5T95Ѝ$e@HU?DSt-m7Ga +M $ܣn837?l5tj氮*+]jSDF8qH:=EHq94v]#I5nVL#<J_w|cԽtjiRK&"/,*@*I%\;40kdF#>BڸMntاsB)цL啎Wfj?NZB.:vٷ9m\@ bP[so0㏀T|5CA*_̇hQZ} HՈ&WW܊8> dO~U=k-p]VgVѼ)'S4eoFFʱ1`Q +qTgp[oƅ(`+‰IOp]+ _8$C͓lwTFIaRv1 >C +_iC'PEP *nM8yM-kp .;]¬ l4XJa4\"V1uP id+P1IKtb")ο4"XkԺM(-/)Tb9]7ܮ/ՍwJXۧ`dOmZ`sȑ{wB˽,fB^ !SE;#)ϡU 95,CH6)bĞѐ, +tMK#~Q;+ ,o +m,nkݎ|u.ՙ(m/ɗ$qgVV$I {)$jcV}K.|k /^p2S + +9GY̽me>!l_ SގzIcGD^*ۧu "Txu4ۜ0;f3UL~+i8.`4/K|DĤFԵEһ\,Q 3ˍvhTu-"*Qj0:%/g9J'fNr8WV:(RG[T axݍn@@u(ߎi3&J:՗dNR G2qǜ >|˼SZYcGY[x<=l A!BPgCbO^ G7kh{x^ (G 7QbxU%"@:AO'sO uȍƫUa8vm/en %9Q QA"=U*ʺ7e}|D?^ۓHfYh4\ĉ Mtkc)ޟE835BƑۗD ¥iJJѷ aSJwJwMB{uGڼQfĴ>~3򗷩7*gѬю=OVUգwV7!D^&@H4'1 +0T?AG#@=DɆbq&jD:+<{S3>3nDxT9*da֝Mcy3ͦueh[XcDޣ5hTJtvy9mHm'dcX/BP]# ?&8s5\c $;4I^0ZV+} ma()2{Sr}D+'{JT(eig-fnf. CݟpO_&# +ӬTswȗjtډ^g|)ʼn\rc z>$J2sǷ@95J8H‚{46O@~oA'Dݞj%%@#y!t>;.܍sSI|#h{d $nteňloVϗBabJq~v! +etfIDShۙ1 GKcWb2p̱C4:3dMiT +5~w-G˩% U#C-Aԅ^  ڔ! BɼHu"MɁ̴ASv-Ȗld%6{gҞ]J۞1wAD^aghAm8yv>$ + qckQ%IHI#62ysniazI +SL,)葠 Z Ӝ(D"FN"Gsc~QBFbA;ȹW=.77m62|G+ԅUU=!yZ]2p#*n[a0C=cTfC|J +>@k"̫3[0lRfXhv:lzH[%\J$ .w>)'c FJg]uG D@mQ F 5["tZ(510 ܃^ +/i>bK~Y<` +:Q-DEa x40Hޏox?#W'~4aZ"QAdJ:qf7 ={]28w=TERN9̍nD,+oSH6T/m>^ ܄m?` +U#^lU[-.n"{VdvAǿ-+osL$l!GЗPrqJK>sfg6]6j2) B3 <ϝrU-!$bj?,h7x +6@sr+ i'Ⱦu/X`[VuAܫs[իJlowbv3F>Oy;XzɐVR—8խwvC@C( ^If\_~~Bin)T].WdNttĔ[W+VabH̢MDPo;e4Cid$zÎl'v{ݽ&L`G(ubsGۗ)VNweXc ErV~cm7v2n\M,-r̄*)4_ +,O F7nZtm_*s*۬RL {Q{"DyY.poWBP#z%T&q yɩJ-xN$*jf7mv-8ˮ] x;* +Kny,g1aSb$_J; "q)Sʾ(fuh Pm:_PbPQe n%$Z;'2\Rۗs7[IdDWSnPs_k@ZYX6xSм<85|WO|l>#!,-kpb*|ވUyQ"uٝP40\@L&8acIcNt\k!hB sŃݼmcR`ž+'f2\Q)OX9&Ɨ/f^%SX[mq/ݮq q +B,Vq1kei)$ΗЯ=V1.Nv7k^ zclA'*Z GR؁)f 1:2{x ZWU&<&]M{R-JL9B'bڱ9=J7f`;kg`b(1íEgZ/׶QpgQ"Jcr:ːyۤ s |`^DTN6uFH$X*Oj1^HB]'.-Ozة +قajPi2(O m H 7(D3_8 |k[XA8E@#)^w4)ֺFVMUw_Ҝ#gjbE ~=j#fY~X҉?pѢPώ+ !`k:4nRwF]2&,v)}wJ&cVYO$Bxi3ym'ej )+Jw==c6'LӜ_#>g+))Vb+dYGǝ|-d crS|5 n:bٽM%t1'\хbFVYycfnhVI*f"UA^{@gB|!q Afzks 3ጭvG7&Dse} ~y7[Lm3Bczt2]q5`p}?̠Ye k/k@?,n(Z9K&!N{ob0d78}SmS_@\_kc{r i?|}᥿s[R4yfǻ>~ o!EjjA2{!WQ(\l + +`1OvH?(y=W0Ús ɗ*wrݷ/}7]Kf?~@z= y pAx* -" +aP΀&Eáffq^ERJ8t൥ݺjM]M +j볢}#,$`DzT["0yTz_]P̤aɄ6 ϕ1A֦=$#}Du`3?Rۮ?m^w|'D׎[abϮDS+6"~0Isl HCL,Ȗ?\W-AOSGDv +'yEӧst54 )r5+'8b#J0{:SMAo59 ISfY3觇&N_ޔ !MП9(&26}x/˄ߞF!Яkϋъq;?-z41.DL)*19XֹU!'&{GaCĺfN" #>TfbDJ W0D +Ń#2E ŀ8)P@ hx&R zXTNB4"F1buD.68@x(@%$ydAR1aā20 L +Ar 3 B60fLh8L`hH0"FxR*;,*2h@E@C$"C-2eQ)01S +@YD`dR8TPAJ>T !! +EB$$aL2rr-"!BD) Y:k P))lq|D>^&edPF gCgd&&ĆqX̔, G~,&$L2B4+yP9%`y> F @H0*lɊP8 )n!CƤaXPg ȳ"@g!äg!dFB +/"aa PRH0%j5,:#-CC!040O.a`|JVAEpL9Zt\8X NG $@`0spH10&l>jR +[ و>8 G%*@F.pK p`.(#QN84M5EL3Ҵ&с >GEh6l:B`ʃ f!d4 xtL CLQi2y0": qL`dA c V@bGAp1Y.,,l(Cʕ EJGcbHux(I(#ɂd> )w4dsxx d +hGDN!$bنd(bY؃m54=sjTq?oxoT_j6/T-:{7|{ull-m);;S;^Q/?<=C暍e̊5 u  r+5s[Sjںέ~ٖܶW1b~z6D7{G]ګS=_Wf ]=>Uc&ec㽽DCdV|vܝ +/U_?37~&jG͋k6+߯mO7;T?Whg-|TvJ{{饺VǕwڕw{5l<\wǪػ٫r5]miϼkm31/<4\Ż|+{/Zgۭ<. +Ʒ_{jlhL_m=za/g\;W+|4cw[uOlۼV]͞ U>ٱfȝ eZgvɿYp9y.g~ΞYa{:S[[^֬T[i6";oU<\m_9jSmzjֽﴯ[so>>.o:So~ƌMY/N;uwk;^gvJߖ9lһwuS]~c~孍ɺ}Nipo6Wf^0Q՗}u^[x-Tk_u=tbuWN;^W_]n]lGCbI"ȔH1,ĒB$HH)h61)1 80MeEyafSn]cduUe_ۿ͐ݖj+&*3K06>S[^K6cw^o;vgG?|Ԯ/Su} Wu>>{jf:2ŶgkԢY;< +6۹#v}.W۟Pٯ2~SuvzowoyU/'.v/ZQ_/W7uU_Vg_޾j=_ޝ)&i'&&&&)Y2#&j]Ҷ˶üoG迢*/3u:C6|w]ǬZ齵v"2۴߼v5?~ee_:_YY^Vh]w~._VqqWMfՙmkT^{jz]ADfDFF$Ic@ ($JPKRa<aJ f !CAjDFӤ?WF\s1cm#6@Mi-OHfnӸ'YFv65Qn}eѦ֫d*m^8`GkBUH<Bp"[Q"Mj#w\TEY#M!*&ύbTI,@Xu6_@.K3OQX[K_WK=`7y ..z_OmlZ@XLi^X%HM:gr?4 WksZlcTïa8 k?{a +'YEzK7}Cs3!8ϗV Ƴ @"Rǭ_.I <5y>r]9ƞ6/N#^hW9~$_ %7Ȋ0QZuKOPnnw >ϩX|XN p V;Xh1p9 Y#j^ +z~K}meO;4)bLMÜr d +~?Zw*ʻh VYX-{WVmSXhP }+= +^|6P]+`2vW6o|i믛mG./^&abd-HDz2)u397✜&ˑqh`SShq]̈́x ;E&4 +c=Ȝ޷Dĉ4]+0h +zC{7AS<`hzd`bv)uI0NP$&Yjk/(,GhnN!Ky": J G +*ĉeނZ^IV< ćr+̈A}?=ڷ:95+.frnFS +^Q VI<nS}G(l:sr//6MjF 4cadWӜi+utp<1/*SnZC[K(Don (Z % +_igČ^+OMĆD73Y* !L7dN|#Xi`2b,csEYBL`H?vWU&"fHF{S Wr0]S8X̖+Cîp.; +xrәo"q+c̝h*s"q; +,GU'03jT=q|cg9Pǁ'㱉:/nwGg|6+t~ 0dmw9XqҀs[Ib(.GIvxwSyrfL}@~CAT\>Y J;E~};DNXϊ_$".΢ *rwfb]b~VtZ?v:q?B~SЛxڼ}OYt2 DtTuDyx rp(ap2kռ;gsH?yTΎ:4843aC5uCڱj6qN_9(dqúwfmW7OwL9- +Q]6l̵3>'^M +d8by4CeD 2Gw!ӵ$ta4:@N2;">MSaJΠBkUZnv +.`nhߕg!7÷P%kȉF\B1 X:lD\t,yjY-C!-ӘM -G׳/qa[Nh|2b@3n[nئd^"Oz[X{pwy(N<芟ChtE$/aͶr6ߡݨw#>ER#qxI8n5wxBObd&zYd):*z7Ch쟲Q/TiG=>Z`$\#6ɥk$*h"qZ?)LuFc'(2Cfr47ViAm%/kWo8m`[+{K؀ v$9;߱hmf!O3Q>1Ŏ5@h$Q:L.Y]Ҹ9%,9 ]2.P'"V uf#Yz \zqBaEw\o_p4Ǐ="=#ď"xDj=y8#MSO *N➺áSSOASS>SHwԤf=CEY)W@өEOtJ84XHz +8ЩWT^ ]c',KQG),@}?-d%Yc+(cԝ"(oKG#O qsT49AJ)K%hYE6=Vo ]h6޷bW!鵋 |w s(2V@OjY[|hũD*J1S$؋rW"ȑ`RE`0)YE*O$}fډ̳ 6lTOVfD6@ФxBċTQcP-?bG G/J*~k2m}ooP8>Y@qS/V<_V }´Q^U%\ +B!n}C_EYV}-izt/ҀΎTL\I&aZf*"F[Q6"Hg,RkKB!qN.&Zi$)JWwC*e. 5*4xxhBsoʂYߕy_QDYYUg'>f2(qGh XjۥH-jNsʔl_`u55gyd@4ZPqlY@'+!GXcEy7rM :rNBk4-6{>zJj ŗՑT`9gNHuszv^7JRNH F(DO吏Ei#!Z/n 8R CV?  3h1@=@i1Q`Zp"ގ2Lkgm>" 0$>c@r~Kۡ-"ѾO Qy)"mY1g~4VCY=b|@C4FD]`ƠA}._|CQEq?1*|C zfk$O90rE"6*ҭZϠ>>в^>/q?bQ:9|5 +3jHjX2CUqY'͡(8͔ӎOrjR*NJPI'IJ"OhR_J3eJM)5=^ҋ-TqdՇOƦN(NYzD1sԉ* R| t*IW[OAU:z*1̜@v}jُGf FbA(vjwZ AxhY&wfa屿/(lk!Z{/A$m^, +Qnbؼ^REhY^?|*ODҙp8 +bx:g zKeBny}B_**fQKsssarؑcvi@VEA"GV^&E٫Y'9C*p?D A|6!Z+ _}@%k4M9"9d.h6  WKP|gS`#‘d _ąOhhI^({jKIQuoH4f04.HId/p !su"Նwi@OYI5]F!Q,S<oFU'ցW*#i7W(g&fsQ4! + +endstream endobj 23 0 obj [/Indexed/DeviceRGB 255 24 0 R] endobj 24 0 obj <>stream +8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 +b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` +E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn +6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j$XKrcYp0n+Xl_nU*O( +l[$6Nn+Z_Nq0]s7hs]`XX$6Ra!<<'!!!*'!!rrmPX()~> +endstream endobj 18 0 obj <> endobj 25 0 obj [/View/Design] endobj 26 0 obj <>>> endobj 21 0 obj <> endobj 19 0 obj [18 0 R] endobj 27 0 obj <> endobj xref +0 28 +0000000004 65535 f +0000000016 00000 n +0000000147 00000 n +0000019000 00000 n +0000000000 00000 f +0000019051 00000 n +0000000000 00000 f +0000000000 00000 f +0000022737 00000 n +0000022809 00000 n +0000022949 00000 n +0000024346 00000 n +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000000000 00000 f +0000058342 00000 n +0000058639 00000 n +0000019404 00000 n +0000058526 00000 n +0000021974 00000 n +0000057767 00000 n +0000057815 00000 n +0000058410 00000 n +0000058441 00000 n +0000058664 00000 n +trailer +<<0628B457C29FCC48A6AFD9EA892A100B>]>> +startxref +58846 +%%EOF diff --git a/UI/Web/src/assets/images/logo.svg b/UI/Web/src/assets/images/logo.svg new file mode 100644 index 000000000..165af2ec4 --- /dev/null +++ b/UI/Web/src/assets/images/logo.svg @@ -0,0 +1,26 @@ + + \ No newline at end of file diff --git a/UI/Web/src/index.html b/UI/Web/src/index.html index d84eda22a..898619302 100644 --- a/UI/Web/src/index.html +++ b/UI/Web/src/index.html @@ -4,7 +4,7 @@ Kavita - + diff --git a/UI/Web/src/theme/components/_buttons.scss b/UI/Web/src/theme/components/_buttons.scss index 1080898b6..48f562c24 100644 --- a/UI/Web/src/theme/components/_buttons.scss +++ b/UI/Web/src/theme/components/_buttons.scss @@ -37,7 +37,20 @@ box-shadow: inset 0px -2px 0px 0px var(--btn-secondary-outline-text-color); border-bottom-left-radius: 0; border-bottom-right-radius: 0; + } +} +.btn-actions { + color: var(--btn-fa-icon-color); + border-radius: var(--btn-actions-border-radius); + + &:hover { + background-color: var(--btn-actions-hover-bg); + } + + &:active, &:focus { + background-color: rgb(255 255 255 / 28%) !important; + border-color: transparent !important; } } @@ -45,7 +58,7 @@ filter: var(--btn-icon-filter) !important; } -.btn-primary:disabled, .btn-primary.disabled { +.btn-primary:disabled, .btn-primary.disabled, .btn-tertiary.disabled { background-color: var(--btn-disabled-bg-color); color: var(--btn-disabled-text-color); border-color: var(--btn-disabled-border-color); diff --git a/UI/Web/src/theme/components/_input.scss b/UI/Web/src/theme/components/_input.scss index 0186f60af..503be879c 100644 --- a/UI/Web/src/theme/components/_input.scss +++ b/UI/Web/src/theme/components/_input.scss @@ -7,7 +7,7 @@ input:not([type="range"]), .form-control { border-color: var(--input-focused-border-color); background-color: var(--input-bg-color); color: var(--input-text-color); - box-shadow: 0 0 0 0.25rem var(--input-focus-boxshadow-color); + box-shadow: 0 0 0 .25rem var(--input-focus-boxshadow-color); } &:read-only { diff --git a/UI/Web/src/theme/components/_navbar.scss b/UI/Web/src/theme/components/_navbar.scss index be61dac34..efde59f88 100644 --- a/UI/Web/src/theme/components/_navbar.scss +++ b/UI/Web/src/theme/components/_navbar.scss @@ -1,7 +1,12 @@ .navbar { - background-color: var(--navbar-bg-color); - color: var(--navbar-text-color); - z-index: 1040; + background-color: var(--navbar-bg-color); + color: var(--navbar-text-color); + z-index: 1040; + border-radius: 4px; + left: 0px; + margin: var(--navbar-header-margin); + padding: 0; + height: 3rem; } @@ -11,4 +16,10 @@ i.fa.nav { .nav-tabs .nav-link.active::before { transform: scaleY(0); -} \ No newline at end of file +} + +@media (max-width: $grid-breakpoints-lg) { + .navbar { + margin: 8px 12px; + } +} diff --git a/UI/Web/src/theme/components/_progress.scss b/UI/Web/src/theme/components/_progress.scss index 298643e72..08184e2ae 100644 --- a/UI/Web/src/theme/components/_progress.scss +++ b/UI/Web/src/theme/components/_progress.scss @@ -2,6 +2,10 @@ background-color: var(--progress-bg-color); } +.progress-bar { + background-color: var(--progress-bar-color); +} + .progress-bar.text-bg-success { background-color: var(--progress-bar-color) !important; } diff --git a/UI/Web/src/theme/components/_sidenav.scss b/UI/Web/src/theme/components/_sidenav.scss index 390dedbdb..5f8f567e9 100644 --- a/UI/Web/src/theme/components/_sidenav.scss +++ b/UI/Web/src/theme/components/_sidenav.scss @@ -1,227 +1,388 @@ @import "../variables"; +//START sidebar container .side-nav-container { - padding-bottom: 10px; - width: 190px; - background-color: var(--side-nav-bg-color); - height: calc((var(--vh) * 100) - 115px); - position: fixed; - margin: 0; - left: 10px; - top: 73px; - border-radius: var(--side-nav-border-radius); - transition: - width var(--side-nav-openclose-transition), - background-color var(--side-nav-bg-color-transition), - border-color var(--side-nav-border-transition); - border: var(--side-nav-border); + width: var(--side-nav-width); + background-color: var(--side-nav-bg-color); + height: calc((var(--vh) * 100) - 7.375rem); + position: fixed; + margin: 0; + left: 0.625rem; + top: 4rem; + border-radius: var(--side-nav-border-radius); + transition: width var(--side-nav-openclose-transition), background-color var(--side-nav-bg-color-transition), border-color var(--side-nav-border-transition); + border: var(--side-nav-border); - &::-webkit-scrollbar { - visibility: hidden; + &::-webkit-scrollbar { + visibility: hidden; + } + + &.no-donate { + height: calc((var(--vh) * 100) - 5.125rem); + } + + &.hidden { + display: none; + opacity: 0; + } + //START closed state of the sidebar + &.closed { + width: 4.0625rem; + overflow-x: hidden; + overflow-y: hidden; + background-color: var(--side-nav-closed-bg-color); + border: var(--side-nav-border-closed); + height: calc((var(--vh) * 100) - 6.5rem); + border-radius: unset; + + .side-nav { + .side-nav-item { + color: var(--side-nav-item-closed-color); + + &:hover { + &.active { + color: var(--side-nav-item-active-text-color); + } + } + + .active-highlight { + opacity: 0; + } + + .side-nav-text { + opacity: 0; + display: none; + } + + .card-actions { + opacity: 0; + display: none; + } + } + } + } + //END closed state of the sidebar + //START sidebar + .side-nav { + overflow-y: hidden; + height: 100%; + scrollbar-gutter: stable; + scrollbar-width: thin; + //START sidebar nav item + .side-nav-item { + position: relative; + align-items: center; + display: flex; + justify-content: space-between; + width: 100%; + height: auto; + min-height: 2.6rem; + overflow: hidden; + cursor: pointer; + font-size: 0.9rem; + text-decoration: none; + color: var(--side-nav-text-color); + + .phone-hidden { + display: flex; + + &:first-of-type { + text-align: center; + width: 2.5rem; + margin-left: 0.3rem; + } + + &:last-child { + flex-grow: 1; + justify-content: end; + } + + div { + align-items: center; + height: 100%; + justify-content: inherit; + width: 100%; + + i { + font-size: var(--side-nav-icon-size); + } + } + } + + .active-highlight { + background-color: #2f2f2f; + background-color: rgb(255 255 255 / 9%); + width: 0.25rem; + height: 100%; + position: absolute; + left: 0; + } + + .side-nav-text { + opacity: 1; + min-width: 6.25rem; + word-break: break-all; + -webkit-line-clamp: 1; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + overflow: hidden; + + div { + min-width: 6.375rem; + width: 100% + } + } + + .card-actions { + flex-grow: 1; + justify-content: end; + display: flex; + } + + &.active { + background-color: var(--side-nav-active-bg-color); + color: var(--side-nav-item-active-text-color); + + .active-highlight { + background-color: var(--side-nav-item-active-color); + } + } + + &:hover { + color: var(--side-nav-hover-text-color); + background-color: var(--side-nav-hover-bg-color); + } + } + //END sidebar nav item + // For firefox + @supports (-moz-appearance: none) { + scrollbar-color: transparent transparent; + scrollbar-width: thin; } + &::-webkit-scrollbar { + background-color: transparent; /*make scrollbar space invisible */ + width: inherit; + display: none; + visibility: hidden; + background: transparent; + } + + &::-webkit-scrollbar-thumb { + background: transparent; /*makes it invisible when not hovering*/ + } + + &:hover { + scrollbar-width: thin; + overflow-y: auto; + // For firefox + @supports (-moz-appearance: none) { + scrollbar-color: rgba(255, 255, 255, 0.3) rgba(0, 0, 0, 0); + } + + &::-webkit-scrollbar-thumb { + visibility: visible; + background-color: rgba(255, 255, 255, 0.3); /*On hover, it will turn grey*/ + } + } + } + //END sidebar + //START preference sidebar + &.preference { + height: calc((var(--vh)*100) - 4.6875rem); + width: 14.875rem; + + .side-nav { + overflow-x: hidden; + padding-bottom: 0.625rem; + + .side-nav-header { + color: #ffffff; + font-size: 0.9375rem; + + &:first-of-type { + margin-top: 0.7rem; + } + } + + .side-nav-item { + font-size: 0.9rem; + min-height: 1.875rem; + justify-content: unset; + margin-left: 1.125rem; + + &.active { + .side-nav-text { + color: var(--side-nav-item-active-text-color); + } + } + + .side-nav-text { + text-align: unset; + margin-left: 0.75rem; + font-size: 0.8125rem; + color: #999999; + } + + .card-actions { + display: none; + } + } + } + } + //END preference sidebar +} +//END sidebar container + +//START kavita+ subscription bottom heart button +.sidenav-bottom { + position: absolute; + bottom: 0; + width: var(--side-nav-width); + font-size: 0.75rem; + transition: width var(--side-nav-openclose-transition); + z-index: 999; + background-color: var(--side-nav-bg-color); + + .donate { + .side-nav-item { + width: 100%; + padding: 0 5rem; + justify-content: center; + align-items: center; + display: flex; + min-height: 3.125rem; + color: var(--side-nav-text-color); + + &:hover { + color: var(--side-nav-hover-text-color); + background-color: var(--side-nav-hover-bg-color); + } + + .active-highlight { + display: none; + } + + .phone-hidden { + div { + i { + font-size: var(--side-nav-icon-size); + } + } + } + + .side-nav-text { + display: none !important; + } + + .card-actions { + display: none; + } + } + } + //START sidebar closed + &.closed { + width: 3.4375rem; + overflow-x: hidden; + overflow-y: auto; + background-color: unset; + + .side-nav-item { + width: 100%; + padding: 0; + display: block; + line-height: 2.5rem; + text-align: center; + min-height: unset; + color: var(--side-nav-item-closed-color); + + &:hover { + background-color: unset !important; + } + } + } + //END sidebar closed +} +//END kavita+ subscription bottom heart button + +@media (max-width: $grid-breakpoints-lg) { + .side-nav-container { + padding: 0.625rem 0; + padding-left: 0.3125rem; + width: 55vw; + background-color: var(--side-nav-mobile-bg-color); + height: 100dvh; + position: fixed; + margin: 0; + left: 0; + top: 0; + transition: width var(--side-nav-openclose-transition); + z-index: 1050; + overflow-y: auto; + border: var(--side-nav-mobile-border); + border-radius: 0rem; + &.preference { - height: calc((var(--vh) * 100)); + background-color: unset; + .side-nav { + .side-nav-header { + font-size: 1.25rem; + } + + .side-nav-item { + .active-highlight { + } + + .side-nav-text { + div { + font-size: 1rem; + } + } + } + } } &.no-donate { - height: calc((var(--vh) * 100) - 82px); - } - - &.hidden { - display: none; - opacity: 0; + height: 100dvh; } &.closed { - width: 55px; - overflow-x: hidden; - overflow-y: hidden; - background-color: var(--side-nav-closed-bg-color); - border: var(--side-nav-border-closed); + width: 0; + overflow: hidden; + box-shadow: none; } .side-nav { - overflow-y: hidden; - height: 100%; - mask-image: linear-gradient(to bottom, transparent, black 0%, black 97%, transparent 100%); - -webkit-mask-image: linear-gradient(to bottom, transparent, black 0%, black 97%, transparent 100%); - scrollbar-gutter: stable; - scrollbar-width: thin; - - // For firefox - @supports (-moz-appearance: none) { - scrollbar-color: transparent transparent; - scrollbar-width: thin; - } - - &::-webkit-scrollbar { - background-color: transparent; /*make scrollbar space invisible */ - width: inherit; - display: none; - visibility: hidden; - background: transparent; - } - - &::-webkit-scrollbar-thumb { - background: transparent; /*makes it invisible when not hovering*/ - } - - &:hover { - scrollbar-width: thin; - overflow-y: auto; - - // For firefox - @supports (-moz-appearance: none) { - scrollbar-color: rgba(255, 255, 255, 0.3) rgba(0, 0, 0, 0); - } - - &::-webkit-scrollbar-thumb { - visibility: visible; - background-color: rgba(255, 255, 255, 0.3); /*On hover, it will turn grey*/ - } - } - - .side-nav-item:first { - border-top-left-radius: var(--side-nav-border-radius); - border-top-right-radius: var(--side-nav-border-radius); - } - } -} - -.sidenav-bottom { - position: absolute; - bottom: 0; - width: 190px; - font-size: 12px; - transition: width var(--side-nav-openclose-transition); - z-index: 999; - left: 10px; - - .donate { - .side-nav-item { - width: 100%; - padding: 0 80px; - justify-content: center; - align-items: center; - - &:hover { - background-color: unset !important; - color: white !important; - - i { - color: var(--side-nav-item-closed-color) !important; - - &:hover { - color: white !important; - } - } - } - - span { - flex-grow: unset !important; - min-width: unset !important; - - div { - min-width: unset !important; - - i { - font-size: 1rem !important; - } - } - } - - &.closed { - span { - &.phone-hidden { - div { - width: 100%; - } - } - - .side-nav-text { - div { - width: 0; - } - } - } - } + overflow: auto; + .side-nav-item { + .active-highlight { + border-top-left-radius: 0rem; + border-bottom-left-radius: 0rem; } + } } - &.closed { - width: 45px; - overflow-x: hidden; - overflow-y: auto; - - .side-nav-item { - width: 100%; - padding: 0; - display: block; - line-height: 40px; - text-align: center; - - &:hover { - background-color: unset; - } - } - } -} - -@media (max-width: $grid-breakpoints-lg) { - .side-nav-container { - padding: 10px 0; - width: 55vw; - background-color: var(--side-nav-mobile-bg-color); - height: 100dvh; - position: fixed; - margin: 0; - left: 0; - top: 0; - transition: width var(--side-nav-openclose-transition); - z-index: 1050; - overflow-y: auto; - border: var(--side-nav-mobile-border); - - &.no-donate { - height: 100dvh; - } - - &.closed { - width: 0; - overflow: hidden; - box-shadow: none; - } - - .side-nav { - overflow: auto; - } - - .side-nav-item { - padding: 0; - } - - .side-nav-item:first { - border-top-left-radius: var(--side-nav-border-radius); - border-top-right-radius: var(--side-nav-border-radius); - } + .side-nav-item { + padding: 0; } + } .sidenav-bottom { display: none; &.closed { - left: 10px; + left: 0.625rem; } } .side-nav-overlay { background-color: var(--side-nav-overlay-color); width: 100vw; - height: calc((var(--vh) * 100) - var(--nav-mobile-offset)); + height: 100vh; position: absolute; left: 0; - top: var(--nav-mobile-offset); - z-index: 998; + top: 0; + z-index: 1041; &.closed { display: none; @@ -230,8 +391,8 @@ } .btn-close { - margin-top: -28px; + margin-top: -1.75rem; font-size: 0.8rem; position: absolute; - right: 16px; + right: 1rem; } diff --git a/UI/Web/src/theme/themes/dark.scss b/UI/Web/src/theme/themes/dark.scss index 19ed6da2e..ce2501076 100644 --- a/UI/Web/src/theme/themes/dark.scss +++ b/UI/Web/src/theme/themes/dark.scss @@ -58,29 +58,32 @@ * match the non-default/alpha on launch. */ --colorscape-enabled: true; + /* These are the default background colors for the app. These will be updated on different pages with the generated colors. Must be RGB */ --colorscape-primary-color: rgb(38, 38, 38); --colorscape-lighter-color: rgb(32, 32, 32); --colorscape-darker-color: rgb(28, 28, 28); --colorscape-complementary-color: rgb(51, 51, 51); + /* These need to be an alpha 0 variant. */ --colorscape-primary-alpha-color: rgba(38, 38, 38, 0); --colorscape-lighter-alpha-color: rgba(32, 32, 32, 0); --colorscape-darker-alpha-color: rgba(28, 28, 28, 0); --colorscape-complementary-alpha-color: rgba(51, 51, 51, 0); + /* These are the default background colors. They need to match and cannot be a var reference. They will not be updated. Must be RGB */ --colorscape-primary-default-color: rgb(38, 38, 38); --colorscape-lighter-default-color: rgb(32, 32, 32); --colorscape-darker-default-color: rgb(28, 28, 28); --colorscape-complementary-default-color: rgb(51, 51, 51); - /* Meta and Globals */ --theme-color: #000000; --color-scheme: dark; --tile-color: var(--primary-color); --nav-offset: 60px; --nav-mobile-offset: 55px; + /* Should we render the series cover as background on mobile */ --mobile-series-img-background: true; @@ -90,22 +93,20 @@ --setting-header-font-weight: bold; --setting-break-color: rgba(255, 255, 255, 0.2); - /* Table */ --table-header-bg-color: rgba(0,0,0,.15); --table-header-text-color: hsla(0,0%,100%,.9); --table-body-bg-color: hsla(0,0%,100%,.02); --table-body-text-color: hsla(0,0%,100%,.85); - --table-body-striped-bg-color: hsla(0,0%,100%,.25); --table-body-border: hidden; --table-body-striped-bg-color: var(--elevation-layer2); - /* Navbar */ - --navbar-bg-color: var(--elevation-layer11-dark); + --navbar-bg-color: black; --navbar-text-color: white; --navbar-fa-icon-color: white; --navbar-btn-hover-outline-color: rgba(255, 255, 255, 1); + --navbar-header-margin: 0px; // 8px allows for the Plex navbar + --nav-offset: 56px; /* Inputs */ --input-bg-color: #343a40; @@ -124,33 +125,27 @@ --btn-primary-hover-text-color: white; --btn-primary-hover-bg-color: var(--primary-color-darker-shade); --btn-primary-hover-border-color: var(--primary-color-darker-shade); - --btn-primary-outline-text-color: white; --btn-primary-outline-bg-color: transparent; --btn-primary-outline-border-color: var(--primary-color); --btn-primary-outline-hover-text-color: white; --btn-primary-outline-hover-bg-color: var(--primary-color-darker-shade); --btn-primary-outline-hover-border-color: var(--primary-color-darker-shade); - --btn-secondary-text-color: white; --btn-secondary-bg-color: #6c757d; --btn-secondary-border-color: #6c757d; --btn-secondary-hover-bg-color: var(--bs-btn-hover-bg); --btn-secondary-hover-border-color: var(--bs-btn-hover-border-color); --btn-secondary-font-weight: bold; - --btn-secondary-outline-text-color: white; --btn-secondary-outline-bg-color: transparent; --btn-secondary-outline-border-color: transparent; --btn-secondary-outline-hover-bg-color: transparent; --btn-secondary-outline-hover-border-color: transparent; --btn-secondary-outline-font-weight: bold; - - --btn-primary-text-text-color: white; --btn-secondary-text-text-color: lightgrey; --btn-danger-text-text-color: var(--error-color); - --btn-alt-bg-color: #424c72; --btn-alt-border-color: #444f75; --btn-alt-hover-bg-color: #3b4466; @@ -161,6 +156,8 @@ --btn-disabled-text-color: white; --btn-disabled-border-color: #6c757d; --bs-btn-disabled-border-color: transparent; + --btn-actions-border-radius: 0.375rem; + --btn-actions-hover-bg: rgb(255 255 255 / 18%); /* Nav (Tabs) */ --nav-item-min-width: 150px; @@ -204,7 +201,6 @@ --alert-text-color: #fff3cd; --alert-bg-color: transparent; - /* Checkboxes/Switch */ --checkbox-checked-bg-color: var(--primary-color); --checkbox-border-color: var(--input-focused-border-color); @@ -220,6 +216,8 @@ --tagbadge-filled-bg-color: var(--primary-color); /* Side Nav */ + --side-nav-width: 230px; + --side-nav-icon-size: 0.9rem; --side-nav-bg-color: var(--elevation-layer9-dark); --side-nav-mobile-bg-color: var(--elevation-layer2-dark-solid); --side-nav-openclose-transition: 0.15s ease-in-out; @@ -227,8 +225,8 @@ --side-nav-mobile-box-shadow: 3px 0em 5px 10em rgb(0 0 0 / 50%); --side-nav-hover-text-color: white; --side-nav-hover-bg-color: black; - --side-nav-text-color: white; - --side-nav-border-radius: 5px; + --side-nav-text-color: hsla(0,0%,100%,.85); + --side-nav-border-radius: 3px; --side-nav-border: none; --side-nav-border-closed: none; --side-nav-border-transition: 0.5s ease-in-out; @@ -236,13 +234,12 @@ --side-nav-bg-color-transition: 0.5s ease-in-out; --side-nav-closed-bg-color: transparent; --side-nav-item-active-color: var(--primary-color); - --side-nav-item-active-text-color: white; + --side-nav-item-active-text-color: #fff; --side-nav-active-bg-color: transparent; --side-nav-overlay-color: var(--elevation-layer11-dark); --side-nav-item-closed-color: var(--elevation-layer10); --side-nav-item-closed-hover-color: white; - /* List items */ --list-group-item-text-color: var(--body-text-color); --list-group-item-bg-color: transparent; @@ -324,6 +321,7 @@ --grid-breakpoints-xl: $grid-breakpoints-xl; --body-font-family: "EBGaramond", "Helvetica Neue", sans-serif; --brand-font-family: "Spartan", sans-serif; + --html-font-size: 16px; /* Card */ --card-bg-color: var(--elevation-layer3); @@ -334,7 +332,7 @@ --card-border-radius: 5px; --card-progress-bar-color: var(--primary-color); --card-overlay-bg-color: rgba(0, 0, 0, 0); - --card-overlay-hover-bg-color: rgba(0, 0, 0, 0.4); + --card-overlay-hover-bg-color: rgba(30,30,30,.6); --card-progress-triangle-size: 28px; /* Slider */ @@ -375,14 +373,14 @@ --event-widget-update-bg-color: var(--primary-color); --event-widget-activity-bg-color: var(--primary-color); - /* Search */ --search-result-text-lite-color: initial; + --searchbar-bg-color: rgb(255 255 255 / 12%); /* Bulk Selection */ --bulk-selection-text-color: var(--navbar-text-color); --bulk-selection-highlight-text-color: var(--primary-color); - --bulk-selection-bg-color: rgba(39,39,39,1); + --bulk-selection-bg-color: var(--elevation-layer11-dark); /* List Card Item */ --card-list-item-bg-color: linear-gradient(180deg, rgba(0,0,0,0.15) 0%, rgba(0,0,0,0.15) 1%, rgba(0,0,0,0) 100%); diff --git a/UI/Web/src/theme/utilities/_global.scss b/UI/Web/src/theme/utilities/_global.scss index a0d78c732..2a96114a6 100644 --- a/UI/Web/src/theme/utilities/_global.scss +++ b/UI/Web/src/theme/utilities/_global.scss @@ -1,5 +1,9 @@ // Global styles for the site. Keep this as small as possible +html { + font-size: var(--html-font-size); +} + html, body { height: 100%; overflow: hidden; } body { margin: 0;