diff --git a/.azuredevops/pipelines/templates/variables.yml b/.azuredevops/pipelines/templates/variables.yml index c52df627d..205e68eaa 100644 --- a/.azuredevops/pipelines/templates/variables.yml +++ b/.azuredevops/pipelines/templates/variables.yml @@ -27,4 +27,4 @@ variables: value: "4.0.$(Build.BuildId)" - name: isMain - value: $[or(contains(variables['Build.SourceBranch'], 'develop'), contains(variables['Build.SourceBranch'], 'main'))] \ No newline at end of file + value: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/develop'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))] \ No newline at end of file diff --git a/README.md b/README.md index 8ba5f6f4c..9e49ad62b 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Here are some of the features Ombi has: # Preview -![Preview](https://i.imgur.com/Bz4fz3H.jpg) +![Preview](https://i.imgur.com/kBXIqer.png) # Installation diff --git a/src/Ombi.Core/Engine/TvSearchEngine.cs b/src/Ombi.Core/Engine/TvSearchEngine.cs index 38ba8be1a..433cacee0 100644 --- a/src/Ombi.Core/Engine/TvSearchEngine.cs +++ b/src/Ombi.Core/Engine/TvSearchEngine.cs @@ -59,7 +59,12 @@ namespace Ombi.Core.Engine { continue; } - retVal.Add(await ProcessResult(tvMazeSearch, false)); + var mappedResult = await ProcessResult(tvMazeSearch, false); + if (mappedResult == null) + { + continue; + } + retVal.Add(mappedResult); } return retVal; } @@ -194,7 +199,7 @@ namespace Ombi.Core.Engine foreach (var tvMazeSearch in items) { var result = await ProcessResult(tvMazeSearch, includeImages); - if(settings.HideAvailableFromDiscover && result.Available) + if (result == null || settings.HideAvailableFromDiscover && result.Available) { continue; } @@ -211,15 +216,17 @@ namespace Ombi.Core.Engine private async Task ProcessResult(SearchTvShowViewModel item, bool includeImages) { + if (item.Id == 0) + { + return null; + } item.TheTvDbId = item.Id.ToString(); if (includeImages) { - - if (item.TheTvDbId.HasValue()) - { - item.BackdropPath = await _imageService.GetTvBackground(item.TheTvDbId); - } - + if (item.TheTvDbId.HasValue()) + { + item.BackdropPath = await _imageService.GetTvBackground(item.TheTvDbId); + } } await RunSearchRules(item); diff --git a/src/Ombi.Mapping/Profiles/TvProfile.cs b/src/Ombi.Mapping/Profiles/TvProfile.cs index 8cb4e38b6..0e1378d95 100644 --- a/src/Ombi.Mapping/Profiles/TvProfile.cs +++ b/src/Ombi.Mapping/Profiles/TvProfile.cs @@ -47,7 +47,7 @@ namespace Ombi.Mapping.Profiles CreateMap() - .ForMember(dest => dest.Id, opts => opts.MapFrom(src => Convert.ToInt32(src.Ids.Tvdb.ToString()))) + .ForMember(dest => dest.Id, opts => opts.MapFrom(src => src.Ids.Tvdb.HasValue ? Convert.ToInt32(src.Ids.Tvdb.ToString()) : 0)) .ForMember(dest => dest.FirstAired, opts => opts.MapFrom(src => src.FirstAired.HasValue ? src.FirstAired.Value.ToString("yyyy-MM-ddTHH:mm:ss") : string.Empty)) .ForMember(dest => dest.ImdbId, opts => opts.MapFrom(src => src.Ids.Imdb)) .ForMember(dest => dest.Network, opts => opts.MapFrom(src => src.Network)) @@ -57,9 +57,9 @@ namespace Ombi.Mapping.Profiles .ForMember(dest => dest.Title, opts => opts.MapFrom(src => src.Title)) .ForMember(dest => dest.Status, opts => opts.MapFrom(src => TraktEnumHelper.GetDescription(src.Status))) .ForMember(dest => dest.Trailer, - opts => opts.MapFrom(src => src.Trailer.ToString().ToHttpsUrl())) + opts => opts.MapFrom(src => src.Trailer != null ? src.Trailer.ToString().ToHttpsUrl() : string.Empty)) .ForMember(dest => dest.Homepage, - opts => opts.MapFrom(src => src.Homepage.ToString().ToHttpsUrl())); + opts => opts.MapFrom(src => src.Homepage != null ? src.Homepage.ToString().ToHttpsUrl() : string.Empty)); } } } \ No newline at end of file diff --git a/src/Ombi.Store/Repository/Requests/TvRequestRepository.cs b/src/Ombi.Store/Repository/Requests/TvRequestRepository.cs index 985f464fd..a5a7406ab 100644 --- a/src/Ombi.Store/Repository/Requests/TvRequestRepository.cs +++ b/src/Ombi.Store/Repository/Requests/TvRequestRepository.cs @@ -22,21 +22,21 @@ namespace Ombi.Store.Repository.Requests { return await Db.TvRequests.Where(x => x.TvDbId == tvDbId) .Include(x => x.ChildRequests) - .ThenInclude(x => x.RequestedUser) + .ThenInclude(x => x.RequestedUser) .Include(x => x.ChildRequests) - .ThenInclude(x => x.SeasonRequests) - .ThenInclude(x => x.Episodes) + .ThenInclude(x => x.SeasonRequests) + .ThenInclude(x => x.Episodes) .FirstOrDefaultAsync(); } public TvRequests GetRequest(int tvDbId) { - return Db.TvRequests.Where(x => x.TvDbId == tvDbId) + return Db.TvRequests.Where(x => x.TvDbId == tvDbId).AsSplitQuery() .Include(x => x.ChildRequests) - .ThenInclude(x => x.RequestedUser) + .ThenInclude(x => x.RequestedUser) .Include(x => x.ChildRequests) - .ThenInclude(x => x.SeasonRequests) - .ThenInclude(x => x.Episodes) + .ThenInclude(x => x.SeasonRequests) + .ThenInclude(x => x.Episodes) .FirstOrDefault(); } diff --git a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html index 3ca931c60..4fefca11b 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html +++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.html @@ -1,24 +1,32 @@
-
- {{getAvailbilityStatus()}} -
- +
+
+ {{RequestType[result.type] | humanize}} +
+
+ {{getAvailbilityStatus()}} +
+
+ {{result.title}} -
{{RequestType[result.type] | humanize}}
+
-
{{result.title}}
-
{{result.overview}}
+ +
+
{{result.title}}
+
{{result.overview}}
+
+
-
-
\ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss index cd486afd4..2c787eb37 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss +++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.scss @@ -3,7 +3,6 @@ $card-background: #2b2b2b; #cardImage { border-radius: 5px; - height: 315px; object-fit:cover; } @@ -61,17 +60,14 @@ small { font-size: 0.8rem; } -@media (min-width: 2000px) { - .ombi-card{ - height:100%; - } - - #cardImage { - height: 100%; - object-fit: cover; - display: block; - } +.ombi-card{ + height:100%; } + #cardImage { + height: 100%; + object-fit: cover; + display: block; + } @@ -80,79 +76,6 @@ small { max-width: 600px; } - /* common */ - .ribbon { - width: 100px; - height: 96px; - overflow: hidden; - position: absolute; - text-align:right; - } - - .ribbon span { - position: absolute; - display: none; - background-color: transparent; - color: #fff; - text-shadow: 0 1px 1px rgba(0,0,0,.2); - text-transform: uppercase; - text-align: right; - font-size: 14px; - } - - .ribbon.available span{ - display:block; - } - - .ribbon.available span:before{ - content: ''; - display: inline-block; - width: 10px; - height: 10px; - -moz-border-radius: 7.5px; - -webkit-border-radius: 7.5px; - border-radius: 7.5px; - background-color: #1DE9B6; - } - - .ribbon.approved span { - display: block; - } - - .ribbon.approved span:before{ - content: ''; - display: inline-block; - width: 10px; - height: 10px; - -moz-border-radius: 7.5px; - -webkit-border-radius: 7.5px; - border-radius: 7.5px; - background-color: #ff5722; - } - - .ribbon.requested span { - display: block; - } - - .ribbon.requested span:before{ - content: ''; - display: inline-block; - width: 10px; - height: 10px; - -moz-border-radius: 7.5px; - -webkit-border-radius: 7.5px; - border-radius: 7.5px; - background-color: #ffd740; - } - - - /* top right*/ - .ribbon-top-right { - top: 13px; - right: 0px; - z-index: 999999; - } - .ombi-card { padding: 5px; } @@ -202,28 +125,91 @@ small { .title { font-size: 18px; } - .top-left { - font-size: 14px; - position: absolute; - text-transform: uppercase; - top: 0px; - width: 100%; - background-color: rgba(15,23,31,0.6); - padding-left: 1em; - padding-top: 1em; - padding-bottom: 0.5em;font-size: 14px; - position: absolute; - text-transform: uppercase; - - } - .full-width { + + +.full-width { width: 100%; } - .ellipsis { +.ellipsis { display: -webkit-box; -webkit-line-clamp: 6; -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; } + +.card-top-info{ + position: absolute; + text-transform: uppercase; + top: 0px; + width: 100%; + background-color: rgba(15,23,31,0.6); + display:flex; + justify-content: space-between; + padding-top:0.6em; + padding-bottom:0.3em; + z-index:2; +} + +.top-left { + font-size: 14px; + padding-left: 0.5em; + font-size: 14px; +} + +/* common */ +.top-right span { + display: none; + background-color: transparent; + color: #fff; + text-shadow: 0 1px 1px rgba(0,0,0,.2); + text-align: right; + font-size: 14px; + padding-right: 1em; +} + +.top-right span:before{ + content: ''; + width: 10px; + height: 10px; + -moz-border-radius: 7.5px; + -webkit-border-radius: 7.5px; + border-radius: 7.5px; + margin-right:5px; +} + +.top-right.available span{ + display:block; +} + +.top-right.available span:before{ + display: inline-block; + background-color: #1DE9B6; +} + +.top-right.approved span { + display: block; +} + +.top-right.approved span:before{ + display: inline-block; + background-color: #ff5722; +} + +.top-right.requested span { + display: block; +} + +.top-right.requested span:before{ + display: inline-block; + background-color: #ffd740; +} + +::ng-deep a.poster-overlay{ + color:#fff; +} + +a.poster-overlay:hover{ + text-decoration: none; +} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts index 942e4707b..a60f5eb65 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.ts @@ -34,29 +34,94 @@ export class CarouselListComponent implements OnInit { get mediaTypeStorageKey() { return "DiscoverOptions" + this.discoverType.toString(); }; - private amountToLoad = 14; + private amountToLoad = 17; private currentlyLoaded = 0; constructor(private searchService: SearchV2Service, private storageService: StorageService) { this.responsiveOptions = [ { - breakpoint: '2559px', + breakpoint: '4000px', + numVisible: 17, + numScroll: 17 + }, + { + breakpoint: '3800px', + numVisible: 16, + numScroll: 16 + }, + { + breakpoint: '3600px', + numVisible: 15, + numScroll: 15 + }, + { + breakpoint: '3400px', + numVisible: 14, + numScroll: 14 + }, + { + breakpoint: '3200px', + numVisible: 13, + numScroll: 13 + }, + { + breakpoint: '3000px', + numVisible: 12, + numScroll: 12 + }, + { + breakpoint: '2800px', + numVisible: 11, + numScroll: 11 + }, + { + breakpoint: '2600px', + numVisible: 10, + numScroll: 10 + }, + { + breakpoint: '2400px', + numVisible: 9, + numScroll: 9 + }, + { + breakpoint: '2200px', + numVisible: 8, + numScroll: 8 + }, + { + breakpoint: '2000px', numVisible: 7, numScroll: 7 }, { - breakpoint: '1024px', + breakpoint: '1800px', + numVisible: 6, + numScroll: 6 + }, + { + breakpoint: '1650px', + numVisible: 5, + numScroll: 5 + }, + { + breakpoint: '1500px', numVisible: 4, numScroll: 4 }, + { + breakpoint: '1250px', + numVisible: 3, + numScroll: 3 + }, { breakpoint: '768px', numVisible: 2, numScroll: 2 }, { - breakpoint: '560px', + breakpoint: '480px', numVisible: 1, numScroll: 1 } diff --git a/src/Ombi/ClientApp/src/app/login/login.component.html b/src/Ombi/ClientApp/src/app/login/login.component.html index 27b8d827a..d48b58e31 100644 --- a/src/Ombi/ClientApp/src/app/login/login.component.html +++ b/src/Ombi/ClientApp/src/app/login/login.component.html @@ -1,10 +1,12 @@ 
+
@@ -157,7 +168,6 @@
- @@ -178,29 +188,10 @@ - - - - - - - - - - -
- - - - - - - - diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html index 479644203..13cb4d16a 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/panels/movie-information-panel.component.html @@ -98,11 +98,11 @@
-
+
{{'MediaDetails.Genres' | translate }}:
- + {{genre.name}} @@ -110,10 +110,10 @@
-
+
{{'MediaDetails.Keywords' | translate }}: - + {{keyword.name}} diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html index 934423512..6107ac9a4 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.html @@ -1,7 +1,7 @@ - + diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.scss b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.scss index 24e22e7b7..6e611a04f 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.scss +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/social-icons/social-icons.component.scss @@ -1,19 +1,6 @@ +@import "~styles/variables.scss"; -.viewon-btn { - background-color: transparent; - margin-top: 7px; - text-decoration: none; +a.media-icons:hover{ + color:$ombi-active; } -.viewon-btn.plex { - border: 1px solid #ffd740; - color: #ffd740; -} -.viewon-btn.emby { - border: 1px solid #52b54a; - color: #52b54a; -} -.viewon-btn.jellyfin { - border: 1px solid #00a4dc; - color: #00a4dc; -} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/top-banner/top-banner.component.html b/src/Ombi/ClientApp/src/app/media-details/components/shared/top-banner/top-banner.component.html index bdb9aac37..5ab0ad228 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/shared/top-banner/top-banner.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/top-banner/top-banner.component.html @@ -4,15 +4,15 @@
-
+
-

{{title}} + class="mobile-top-text"> +

{{title}} ({{releaseDate | amLocal | amDateFormat: 'YYYY'}})

-

{{tagline}}

+

{{tagline}}

diff --git a/src/Ombi/ClientApp/src/app/media-details/components/shared/top-banner/top-banner.component.scss b/src/Ombi/ClientApp/src/app/media-details/components/shared/top-banner/top-banner.component.scss index 7ad12a274..9fd7c3acd 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/shared/top-banner/top-banner.component.scss +++ b/src/Ombi/ClientApp/src/app/media-details/components/shared/top-banner/top-banner.component.scss @@ -1,3 +1,14 @@ .large-text { font: 500 40px/30px Roboto, "Helvetica Neue", sans-serif; -} \ No newline at end of file +} + +@media (min-width:571px){ + .title-top-banner{ + padding-left:330px; + margin-left:0px; +}} + +@media (max-width:571px){ + .title-top-banner{ + text-align:center; +}} \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/media-details/media-details.component.scss b/src/Ombi/ClientApp/src/app/media-details/media-details.component.scss index 49a5a5433..e8ed3e2e1 100644 --- a/src/Ombi/ClientApp/src/app/media-details/media-details.component.scss +++ b/src/Ombi/ClientApp/src/app/media-details/media-details.component.scss @@ -43,7 +43,7 @@ background-size: cover; background-position: 50% 10%; transition: all .5s; - height: 450px; + height: 300px; color: #fff; position: relative; } @@ -90,17 +90,6 @@ right: 0; } -#summary-wrapper, -.summary-wrapper { - background-color: #000; - background-size: cover; - background-position: 50% 10%; - transition: all .5s; - height: 550px; - color: #fff; - position: relative; -} - .grey-text { color: #999; } @@ -182,8 +171,8 @@ } .media-icons { - color: white !important; - padding: 1%; + color: #FFF; + padding: 5px; } .media-row { @@ -232,4 +221,37 @@ border-radius: 1em; margin-right: 10px; margin-top: 5px; -} \ No newline at end of file +} + +.social-icons-container{ + position:absolute; + top:84px; + right:0px; + width:100%; + background-color:rgba(15,23,31,.6); +} + +.social-icons-container-inner{ + text-align:right; + display:flex; + justify-content: flex-end; + padding-right:2em; +} + +.viewon-btn { + background-color: transparent; + text-decoration: none; +} + +.viewon-btn.plex { + border: 1px solid #E5A00D; + color: #E5A00D; +} +.viewon-btn.emby { + border: 1px solid #52b54a; + color: #52b54a; +} +.viewon-btn.jellyfin { + border: 1px solid #00a4dc; + color: #00a4dc; +} diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss index b81f4ed90..c513aba89 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss +++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss @@ -118,7 +118,7 @@ align-items:center; justify-content: center; font-weight: 700; - font-size:24px; + font-size:36px; padding:40px 20px; height:auto; } @@ -131,12 +131,12 @@ .mat-list-item{ color:#FFF; font-family:Roboto, sans-serif; - font-size: 14px; + font-size: 16px; font-weight: 400; padding:10px 20px; height:auto; width:20rem; - margin-bottom:1rem; + margin-bottom:0.5rem; } .active-list-item{ diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.html b/src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.html index 63e771e89..95b88a4f4 100644 --- a/src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.html +++ b/src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.html @@ -28,7 +28,7 @@
- +
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.html b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.html index c32ceea1b..90a3e8784 100644 --- a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.html +++ b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.html @@ -28,7 +28,7 @@ -
+
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.scss b/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.scss index f8a34118d..1c6a9f617 100644 --- a/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.scss +++ b/src/Ombi/ClientApp/src/app/requests-list/components/requests-list.component.scss @@ -21,10 +21,6 @@ float:right; } -::ng-deep .mat-form-field-label{ - font-size: 1.2em; -} - ::ng-deep .mat-form-field-infix { width: 10em; margin-top:1em; @@ -62,4 +58,8 @@ .justify-content-md-center { justify-content: center !important; } +} + +::ng-deep table.requests button{ + margin:5px; } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.html b/src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.html index a612d5180..7e0902483 100644 --- a/src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.html +++ b/src/Ombi/ClientApp/src/app/requests-list/components/tv-grid/tv-grid.component.html @@ -28,7 +28,7 @@ -
+
diff --git a/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.html b/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.html index 37434ac04..21020a5af 100644 --- a/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.html +++ b/src/Ombi/ClientApp/src/app/settings/failedrequests/failedrequests.component.html @@ -20,7 +20,7 @@ - +
{{RequestType[v.type] | humanize}} {{v.retryCount}}
diff --git a/src/Ombi/ClientApp/src/app/settings/logs/logs.component.scss b/src/Ombi/ClientApp/src/app/settings/logs/logs.component.scss index 18096ace2..da5fdfd6e 100644 --- a/src/Ombi/ClientApp/src/app/settings/logs/logs.component.scss +++ b/src/Ombi/ClientApp/src/app/settings/logs/logs.component.scss @@ -9,5 +9,10 @@ } ::ng-deep .dark .code-block { - color:#FFF !important; + color:#FFF; +} + +::ng-deep .code-block { + color:#FFF; + font-family: Menlo, Monaco, "Courier New", Courier, monospace; } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss index 19dab627d..4f5477693 100644 --- a/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss +++ b/src/Ombi/ClientApp/src/app/usermanagement/usermanagement.component.scss @@ -22,10 +22,6 @@ float:right; } -::ng-deep .mat-form-field-label{ - font-size: 1.2em; -} - ::ng-deep .mat-form-field-infix { width: 10em; margin-top:1em; diff --git a/src/Ombi/ClientApp/src/styles/Styles.scss b/src/Ombi/ClientApp/src/styles/Styles.scss index 00974d45b..7fd667cf2 100644 --- a/src/Ombi/ClientApp/src/styles/Styles.scss +++ b/src/Ombi/ClientApp/src/styles/Styles.scss @@ -20,4 +20,83 @@ accent: $ombi-dark-app-accent, ) ), $ombi-dark-app-accent); + @include angular-material-theme($theme); + + .mat-table { + background: $ombi-background-accent; + } + + .mat-paginator { + background: $ombi-background-accent; + } + + .mat-flat-button.mat-primary, .mat-raised-button.mat-primary, .mat-fab.mat-primary, .mat-mini-fab.mat-primary{ + background-color: $ombi-background-accent; + } + + .mat-flat-button.mat-accent, .mat-raised-button.mat-accent, .mat-fab.mat-accent, .mat-mini-fab.mat-accent{ + color: $ombi-active-text; + } + + .mat-menu-panel{ + background: $ombi-background-accent; + } + + .mat-form-field-appearance-outline.mat-focused .mat-form-field-outline-thick{ + color: $ombi-active; + } + + .mat-form-field.mat-focused .mat-form-field-label{ + color: $ombi-active; + } + + .mat-input-element{ + caret-color: $ombi-active; + } + + .mat-card { + background: $ombi-background-accent; + } + + .mat-expansion-panel{ + background: $ombi-background-accent; + } + + .mat-chip.mat-standard-chip.mat-chip-selected.mat-accent{ + color:$ombi-active-text; + } + + .mat-chip.mat-standard-chip.mat-chip-selected.mat-primary{ + background-color: $ombi-background-primary; + } + + .mat-bottom-sheet-container{ + background: $ombi-background-accent; + } + + .grow:hover{ + color: $ombi-active; + } + + .mat-accent.grow:hover{ + color: $ombi-active-text; + } + + .mat-dialog-container{ + background: $ombi-background-accent; + } + + .mat-autocomplete-panel{ + background: $ombi-background-accent; + } + + .mat-form-field.mat-focused .mat-form-field-ripple{ + background-color: $ombi-active; + } + + @media (hover: none){ + .mat-expansion-panel:not(.mat-expanded):not([aria-disabled=true]) .mat-expansion-panel-header:hover{ + background: $ombi-background-accent; + } + } diff --git a/src/Ombi/ClientApp/src/styles/material-overrides.scss b/src/Ombi/ClientApp/src/styles/material-overrides.scss index 42d028c09..e020b0532 100644 --- a/src/Ombi/ClientApp/src/styles/material-overrides.scss +++ b/src/Ombi/ClientApp/src/styles/material-overrides.scss @@ -22,16 +22,36 @@ td.mat-cell { } // lighter bg -.mat-expansion-panel, +::ng-deep .mat-expansion-panel, .mat-card, .mat-dialog-container, .mat-menu-content, .mat-table, .mat-paginator { - background: $ombi-background-accent !important; + background: $ombi-background-accent; } // Dark bg .mat-sidenav-container { background: $ombi-background-primary; -} \ No newline at end of file +} + +//Login Screen CSS + +.login-buttons button{ + margin:1em; + &#sign-in{ + background-color: $ombi-active; + color: $ombi-active-text; + } + &#sign-plex{ + background-color: #282A2D; + color: #E5A00D; + } +} + +::ng-deep #main-container .mat-table { + background: $ombi-background-accent; +} + +// General Buttons CSS diff --git a/src/Ombi/ClientApp/src/styles/shared.scss b/src/Ombi/ClientApp/src/styles/shared.scss index bd1c0b37f..2dd922173 100644 --- a/src/Ombi/ClientApp/src/styles/shared.scss +++ b/src/Ombi/ClientApp/src/styles/shared.scss @@ -86,7 +86,6 @@ body { .grow:hover { transform: scale(1.1); - color: black; } } diff --git a/src/Ombi/ClientApp/src/styles/variables.scss b/src/Ombi/ClientApp/src/styles/variables.scss index 0ced67f24..928ef00b7 100644 --- a/src/Ombi/ClientApp/src/styles/variables.scss +++ b/src/Ombi/ClientApp/src/styles/variables.scss @@ -43,4 +43,5 @@ $warn-dark: mat-color($ombi-dark-app-warn); $ombi-active: mat-color($ombi-dark-app-accent); $ombi-background-accent: mat-color($ombi-dark-app-primary); $ombi-background-primary: #0f171f; -$ombi-background-primary-accent: #35465c; \ No newline at end of file +$ombi-background-primary-accent: #35465c; +$ombi-active-text:#1b242f; \ No newline at end of file