From 5059e2ae0f12a9b600a7638df2957d187a3742b4 Mon Sep 17 00:00:00 2001 From: twanariens Date: Sat, 23 Jan 2021 21:06:45 +0100 Subject: [PATCH 01/24] Mobile css for the discover cards --- .../card/discover-card.component.scss | 1 - .../carousel-list/carousel-list.component.ts | 41 +++++++++++++++++-- 2 files changed, 38 insertions(+), 4 deletions(-) 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..d11977c8d 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; } 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 0279fbd06..f19a17b7e 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 @@ -41,22 +41,57 @@ export class CarouselListComponent implements OnInit { private storageService: StorageService) { this.responsiveOptions = [ { - breakpoint: '2559px', + 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 } From 598c0cfb997dca0236db661d129e3f1bd4cf63ed Mon Sep 17 00:00:00 2001 From: tidusjar Date: Sat, 23 Jan 2021 21:05:49 +0000 Subject: [PATCH 02/24] Fixed some exceptions being thrown on the backend, nothing that intresting really --- src/Ombi.Core/Engine/TvSearchEngine.cs | 23 +++++++++++++++-------- src/Ombi.Mapping/Profiles/TvProfile.cs | 6 +++--- 2 files changed, 18 insertions(+), 11 deletions(-) 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 From 985479f4dcbb12e43c2bd57bf16068271298e328 Mon Sep 17 00:00:00 2001 From: twanariens Date: Sat, 23 Jan 2021 22:58:24 +0100 Subject: [PATCH 03/24] New login css --- .../src/app/login/login.component.html | 4 +- .../src/app/login/login.component.scss | 94 ++++++------------- .../src/app/login/login.component.ts | 4 +- .../src/styles/material-overrides.scss | 42 ++++++++- src/Ombi/ClientApp/src/styles/variables.scss | 3 +- 5 files changed, 77 insertions(+), 70 deletions(-) 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 @@ 
+
\ 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 010db760e..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 @@ -63,14 +63,11 @@ small { .ombi-card{ height:100%; } - -@media (min-width: 2000px) { - #cardImage { - height: 100%; - object-fit: cover; - display: block; - } -} + #cardImage { + height: 100%; + object-fit: cover; + display: block; + } @@ -207,4 +204,12 @@ small { .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 From af9d45add75d9a718cb1c0556573685d842fffb9 Mon Sep 17 00:00:00 2001 From: twanariens Date: Sun, 24 Jan 2021 13:21:41 +0100 Subject: [PATCH 15/24] Fixed a color issue with hover --- src/Ombi/ClientApp/src/styles/shared.scss | 1 - 1 file changed, 1 deletion(-) 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; } } From 5fb2d3053df091aa21865f8eff983c9c07f7b95f Mon Sep 17 00:00:00 2001 From: twanariens Date: Sun, 24 Jan 2021 13:22:04 +0100 Subject: [PATCH 16/24] Even more color issues fixed --- src/Ombi/ClientApp/src/styles/Styles.scss | 28 +++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/Ombi/ClientApp/src/styles/Styles.scss b/src/Ombi/ClientApp/src/styles/Styles.scss index 607a926ef..61a298b56 100644 --- a/src/Ombi/ClientApp/src/styles/Styles.scss +++ b/src/Ombi/ClientApp/src/styles/Styles.scss @@ -53,4 +53,32 @@ .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; } \ No newline at end of file From 448d1da04dc0ac03ec46dc95acdb7a97fe20dfd0 Mon Sep 17 00:00:00 2001 From: twanariens Date: Sun, 24 Jan 2021 13:22:20 +0100 Subject: [PATCH 17/24] WIP on the detail page --- .../movie/movie-details.component.html | 37 ++++++++----- .../movie-information-panel.component.html | 8 +-- .../social-icons/social-icons.component.html | 44 ++++------------ .../social-icons/social-icons.component.scss | 19 ++----- .../top-banner/top-banner.component.html | 8 +-- .../top-banner/top-banner.component.scss | 12 ++++- .../media-details.component.scss | 52 +++++++++++++------ 7 files changed, 94 insertions(+), 86 deletions(-) diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html index d62cad6f0..832b469c1 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html @@ -5,7 +5,12 @@
+
@@ -14,19 +19,27 @@ -
- - - -
- -
- - +
+ + + {{'Search.ViewOnPlex' | translate}} + + + + {{'Search.ViewOnEmby' | translate}} + + + + {{'Search.ViewOnJellyfin' | translate}} + + + + + - + +
-
+
{{'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..1b7ea2f76 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="col-xl-11 col-lg-8 col-md-8 col-sm-7 col-12 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..91cfc606b 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,13 @@ .large-text { font: 500 40px/30px Roboto, "Helvetica Neue", sans-serif; -} \ No newline at end of file +} + +@media (min-width:571px){ + .title-top-banner{ + margin-left:300px; +}} + +@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; +} From 5584c3aded3f444ece3b9c08042cb71c903bf148 Mon Sep 17 00:00:00 2001 From: twanariens Date: Sun, 24 Jan 2021 13:41:05 +0100 Subject: [PATCH 18/24] WIP detail page (better fix for title) --- .../components/shared/top-banner/top-banner.component.html | 2 +- .../components/shared/top-banner/top-banner.component.scss | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 1b7ea2f76..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 @@ -7,7 +7,7 @@
+ class="mobile-top-text">

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

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 91cfc606b..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 @@ -4,7 +4,8 @@ @media (min-width:571px){ .title-top-banner{ - margin-left:300px; + padding-left:330px; + margin-left:0px; }} @media (max-width:571px){ From 4e62613026c9f9b9700e44c678bc4c4886fc3fa8 Mon Sep 17 00:00:00 2001 From: twanariens Date: Sun, 24 Jan 2021 14:09:22 +0100 Subject: [PATCH 19/24] Style changes on side-nav for less spacing between items --- src/Ombi/ClientApp/src/app/my-nav/my-nav.component.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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{ From 8c37564717ade1390239c77afa25e415a003a597 Mon Sep 17 00:00:00 2001 From: twanariens Date: Sun, 24 Jan 2021 14:09:43 +0100 Subject: [PATCH 20/24] Fix for buttons in request list (spacing) --- .../components/albums-grid/albums-grid.component.html | 2 +- .../components/movies-grid/movies-grid.component.html | 2 +- .../app/requests-list/components/requests-list.component.scss | 4 ++++ .../requests-list/components/tv-grid/tv-grid.component.html | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) 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 3e949fdd9..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 @@ -58,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 @@ -
+
From 52abf18b87ba596c574ad4070488920125f63113 Mon Sep 17 00:00:00 2001 From: twanariens Date: Sun, 24 Jan 2021 14:37:56 +0100 Subject: [PATCH 21/24] Made a big boo boo but fixed it :D (forgot to close span on View On buttons) --- .../movie/movie-details.component.html | 104 +++++++----------- 1 file changed, 41 insertions(+), 63 deletions(-) diff --git a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html index 832b469c1..4b0abbf8a 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html +++ b/src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html @@ -33,50 +33,49 @@ {{'Search.ViewOnJellyfin' | translate}} + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -149,7 +148,6 @@ - @@ -170,7 +168,6 @@ - @@ -191,29 +188,10 @@ - - - - - - - - - - -
- - - - - - - - From b733fd10dcb98f3de5dc0ec21a9c01854b888aad Mon Sep 17 00:00:00 2001 From: twanariens Date: Sun, 24 Jan 2021 21:21:05 +0100 Subject: [PATCH 22/24] Fix for the login screen on mobile devices --- .../src/app/login/login.component.scss | 38 ++++++++++++------- .../src/styles/material-overrides.scss | 18 --------- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/src/Ombi/ClientApp/src/app/login/login.component.scss b/src/Ombi/ClientApp/src/app/login/login.component.scss index e3aa3b8f4..9eacab721 100644 --- a/src/Ombi/ClientApp/src/app/login/login.component.scss +++ b/src/Ombi/ClientApp/src/app/login/login.component.scss @@ -71,18 +71,6 @@ div.bg { /* * Form styles */ -.profile-name-card { - font-size: 16px; - font-weight: bold; - text-align: center; - margin: 10px 0 0; - min-height: 1em; -} - -.form-control { - color: black; - background-color: white !important; -} .reauth-email { display: block; @@ -164,12 +152,12 @@ div.bg { .small-middle-container{ margin: auto; overflow: auto; + width:auto; } } @media (min-width: 571px) { .small-middle-container{ margin: auto; - width: 35%; overflow: auto; } } @@ -199,4 +187,28 @@ div.bg { align-items: center; justify-content: center; height:100vh; +} + +.login-card.mat-card{ + background-color: rgba(0,0,0,0.6); + padding:60px 40px; +} + +.login-card H1.login_logo{ + display:flex; + font-family: Montserrat,sans-serif; + text-transform: uppercase; + color:$ombi-active; + align-items: center; + justify-content: center; + font-weight: 700; + font-size: 10em; + width:100%; + margin-bottom:70px; +} + +@media (max-width: 600px){ + .login-card H1.login_logo{ + font-size:20vw; + } } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/styles/material-overrides.scss b/src/Ombi/ClientApp/src/styles/material-overrides.scss index 84e7ae1f0..e020b0532 100644 --- a/src/Ombi/ClientApp/src/styles/material-overrides.scss +++ b/src/Ombi/ClientApp/src/styles/material-overrides.scss @@ -38,24 +38,6 @@ td.mat-cell { //Login Screen CSS -.login-card{ - background-color: rgba(0,0,0,0.6); -} - -.login-card H1.login_logo{ - display:flex; - font-family: Montserrat,sans-serif; - text-transform: uppercase; - color:$ombi-active; - align-items: center; - justify-content: center; - font-weight: 700; - font-size: 10em; - width:100%; - padding:40px; - margin-bottom:50px; -} - .login-buttons button{ margin:1em; &#sign-in{ From 38635efeffa784e549d28237f48c08b7da26f56a Mon Sep 17 00:00:00 2001 From: twanariens Date: Sun, 24 Jan 2021 21:43:29 +0100 Subject: [PATCH 23/24] Fix for the request on behalf window --- src/Ombi/ClientApp/src/styles/Styles.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Ombi/ClientApp/src/styles/Styles.scss b/src/Ombi/ClientApp/src/styles/Styles.scss index 61a298b56..fe52c07aa 100644 --- a/src/Ombi/ClientApp/src/styles/Styles.scss +++ b/src/Ombi/ClientApp/src/styles/Styles.scss @@ -81,4 +81,16 @@ .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; } \ No newline at end of file From f0853e964702bbc8a5dda6a08bdcc5aed48b21a5 Mon Sep 17 00:00:00 2001 From: twanariens Date: Sun, 24 Jan 2021 21:50:31 +0100 Subject: [PATCH 24/24] Fix colors of expansion panels --- src/Ombi/ClientApp/src/styles/Styles.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Ombi/ClientApp/src/styles/Styles.scss b/src/Ombi/ClientApp/src/styles/Styles.scss index fe52c07aa..7fd667cf2 100644 --- a/src/Ombi/ClientApp/src/styles/Styles.scss +++ b/src/Ombi/ClientApp/src/styles/Styles.scss @@ -93,4 +93,10 @@ .mat-form-field.mat-focused .mat-form-field-ripple{ background-color: $ombi-active; - } \ No newline at end of file + } + + @media (hover: none){ + .mat-expansion-panel:not(.mat-expanded):not([aria-disabled=true]) .mat-expansion-panel-header:hover{ + background: $ombi-background-accent; + } + }