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 2f5f00703..651634a0c 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 @@ -3,7 +3,7 @@
- {{RequestType[result.type] | humanize}} + {{ 'Common.' + RequestType[result.type] | translate }}
{{getAvailbilityStatus()}} @@ -21,9 +21,10 @@
-
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 ec2dbae3b..e5312092a 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 @@ -1,5 +1,4 @@ -$ombi-primary:#3f3f3f; -$card-background: #2b2b2b; +@import "~styles/variables.scss"; #cardImage { border-radius: 5px; @@ -141,19 +140,20 @@ small { .card-top-info{ position: absolute; - text-transform: uppercase; top: 0px; width: 100%; - background-color: rgba(15,23,31,0.6); + background-color: rgba(15,23,31,0.7); display:flex; justify-content: space-between; padding-top:0.6em; padding-bottom:0.3em; z-index:2; + letter-spacing: 0.2px; } .top-left { font-size: 14px; + font-weight:200; padding-left: 0.5em; font-size: 14px; } @@ -161,6 +161,7 @@ small { /* common */ .top-right{ display:flex; + font-weight:200; } .top-right span.indicator, span.indicator-text { @@ -247,7 +248,7 @@ a.poster-overlay:hover{ width: 100%; margin-left: 0; margin-right: 0; - margin-top: -37px; + margin-top: -36px; margin-bottom: 0px; opacity:0; transition: .5s ease; @@ -261,4 +262,8 @@ a.poster-overlay:hover{ .c:hover .button-request-container { opacity:1; +} + +.btn-ombi{ + background-color:#293a4c; } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts index c67ad1129..a257eafcb 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts +++ b/src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts @@ -24,6 +24,8 @@ export class DiscoverCardComponent implements OnInit { public fullyLoaded = false; public loading: boolean; + public requestable: boolean; + // This data is needed to open the dialog private tvSearchResult: ISearchTvResultV2; @@ -44,19 +46,10 @@ export class DiscoverCardComponent implements OnInit { } public async getExtraTvInfo() { - // if (this.result.tvMovieDb) { - this.tvSearchResult = await this.searchService.getTvInfoWithMovieDbId(+this.result.id); - // } else { - // this.tvSearchResult = await this.searchService.getTvInfo(+this.result.id); - // } - // if (!this.tvSearchResult || this.tvSearchResult?.status.length > 0 && this.tvSearchResult?.status === "404") { - // this.hide = true; - // return; - // } - + this.tvSearchResult = await this.searchService.getTvInfoWithMovieDbId(+this.result.id); + this.requestable = true; this.setTvDefaults(this.tvSearchResult); this.updateTvItem(this.tvSearchResult); - } public async getAlbumInformation() { @@ -69,12 +62,13 @@ export class DiscoverCardComponent implements OnInit { if (art.image) { this.result.posterPath = art.image; - this.fullyLoaded = true; } }) } this.result.title = x.startYear ? `${x.name} (${x.startYear})` : x.name; this.result.overview = x.overview; + this.fullyLoaded = true; + this.requestable = true; }); } @@ -166,6 +160,7 @@ export class DiscoverCardComponent implements OnInit { } else { this.fullyLoaded = true; } + this.requestable = true; } private updateMovieItem(updated: ISearchMovieResultV2) { diff --git a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss index 325c03512..5c153175d 100644 --- a/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss +++ b/src/Ombi/ClientApp/src/app/discover/components/carousel-list/carousel-list.component.scss @@ -71,7 +71,7 @@ .discover-filter-buttons-group { background: $ombi-background-primary; - border: 1px solid $ombi-background-primary-accent; + border: 1px solid #293a4c; border-radius: 30px; color:#fff; margin-bottom:10px; @@ -84,6 +84,7 @@ border-radius: 30px; padding-left: 20px; padding-right: 20px; + border-left:none; } ::ng-deep .mat-button-toggle-appearance-standard .mat-button-toggle-label-content{ @@ -91,7 +92,7 @@ } .button-active{ - background:$ombi-active; + background:#293a4c; } 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 6a6ceac58..ed54c3aa5 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 @@ -221,7 +221,7 @@ .social-icons-container{ position:absolute; - top:84px; + top:0px; right:0px; width:100%; background-color:rgba(15,23,31,.6); @@ -329,6 +329,10 @@ margin-left:10px; } +.dark-theme{ + position:relative; +} + @media (max-width:500px){ .row.justify-content-center.justify-content-sm-start.header-container{ flex-wrap:wrap; diff --git a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html index 3ca868685..c1b69b303 100644 --- a/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html +++ b/src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html @@ -53,36 +53,33 @@ -