bit more work on the dark mode !wip

pull/3895/head
tidusjar 5 years ago
parent bbf4d72de1
commit ee17d4dff1

@ -10,7 +10,6 @@ import { AuthGuard } from "../auth/auth.guard";
import { PipeModule } from "../pipes/pipe.module"; import { PipeModule } from "../pipes/pipe.module";
import { DiscoverCardDetailsComponent } from "./card/discover-card-details.component"; import { DiscoverCardDetailsComponent } from "./card/discover-card-details.component";
import { MatDialog } from "@angular/material"; import { MatDialog } from "@angular/material";
import { EpisodeRequestComponent } from "../shared/episode-request/episode-request.component";
const routes: Routes = [ const routes: Routes = [
{ path: "", component: DiscoverComponent, canActivate: [AuthGuard] }, { path: "", component: DiscoverComponent, canActivate: [AuthGuard] },
@ -25,11 +24,9 @@ const routes: Routes = [
DiscoverComponent, DiscoverComponent,
DiscoverCardComponent, DiscoverCardComponent,
DiscoverCardDetailsComponent, DiscoverCardDetailsComponent,
EpisodeRequestComponent,
], ],
entryComponents: [ entryComponents: [
DiscoverCardDetailsComponent, DiscoverCardDetailsComponent
EpisodeRequestComponent
], ],
exports: [ exports: [
RouterModule, RouterModule,

@ -1,5 +1,5 @@
@import "~@angular/material/theming"; @import "~@angular/material/theming";
@import "../../styles/Styles.scss"; @import "~styles/Styles.scss";
//MINE //MINE
@media (max-width: 570px) { @media (max-width: 570px) {
h1 { h1 {
@ -198,8 +198,4 @@
.keywords-panel { .keywords-panel {
margin-top: 8%; margin-top: 8%;
}
.card-color {
background: $panel-color;
} }

@ -10,7 +10,6 @@ import { MovieDetailsComponent } from "./movie/movie-details.component";
import { TvDetailsComponent } from "./tv/tv-details.component"; import { TvDetailsComponent } from "./tv/tv-details.component";
import { PipeModule } from "../pipes/pipe.module"; import { PipeModule } from "../pipes/pipe.module";
import { YoutubeTrailerComponent } from "./youtube-trailer.component"; import { YoutubeTrailerComponent } from "./youtube-trailer.component";
import { EpisodeRequestComponent } from "../shared/episode-request/episode-request.component";
const routes: Routes = [ const routes: Routes = [
{ path: "movie/:movieDbId", component: MovieDetailsComponent }, { path: "movie/:movieDbId", component: MovieDetailsComponent },
@ -27,7 +26,6 @@ const routes: Routes = [
MovieDetailsComponent, MovieDetailsComponent,
YoutubeTrailerComponent, YoutubeTrailerComponent,
TvDetailsComponent, TvDetailsComponent,
EpisodeRequestComponent,
], ],
exports: [ exports: [
RouterModule, RouterModule,

@ -106,7 +106,7 @@
<button *ngIf="movie.belongsToCollection" mat-raised-button <button *ngIf="movie.belongsToCollection" mat-raised-button
class="btn-spacing-below full-width mat-elevation-z8">{{movie.belongsToCollection.name}}</button> class="btn-spacing-below full-width mat-elevation-z8">{{movie.belongsToCollection.name}}</button>
<mat-card class="card-full card-color mat-elevation-z8"> <mat-card class="card-full mat-elevation-z8">
<mat-card-content> <mat-card-content>
<div> <div>
<span><strong>Theatrical Release:</strong> <span><strong>Theatrical Release:</strong>

@ -1,4 +1,4 @@
import { Component } from "@angular/core"; import { Component, ViewEncapsulation } from "@angular/core";
import { ImageService, SearchV2Service, RequestService, MessageService } from "../../services"; import { ImageService, SearchV2Service, RequestService, MessageService } from "../../services";
import { ActivatedRoute } from "@angular/router"; import { ActivatedRoute } from "@angular/router";
import { DomSanitizer } from "@angular/platform-browser"; import { DomSanitizer } from "@angular/platform-browser";
@ -10,6 +10,7 @@ import { AuthService } from "../../auth/auth.service";
@Component({ @Component({
templateUrl: "./movie-details.component.html", templateUrl: "./movie-details.component.html",
styleUrls: ["../media-details.component.scss"], styleUrls: ["../media-details.component.scss"],
encapsulation: ViewEncapsulation.None
}) })
export class MovieDetailsComponent { export class MovieDetailsComponent {
public movie: ISearchMovieResultV2; public movie: ISearchMovieResultV2;

@ -1,4 +1,4 @@
import { Component } from "@angular/core"; import { Component, ViewEncapsulation } from "@angular/core";
import { ImageService, SearchV2Service, RequestService, MessageService } from "../../services"; import { ImageService, SearchV2Service, RequestService, MessageService } from "../../services";
import { ActivatedRoute } from "@angular/router"; import { ActivatedRoute } from "@angular/router";
import { DomSanitizer } from "@angular/platform-browser"; import { DomSanitizer } from "@angular/platform-browser";
@ -9,6 +9,7 @@ import { YoutubeTrailerComponent } from "../youtube-trailer.component";
@Component({ @Component({
templateUrl: "./tv-details.component.html", templateUrl: "./tv-details.component.html",
styleUrls: ["../media-details.component.scss"], styleUrls: ["../media-details.component.scss"],
encapsulation: ViewEncapsulation.None
}) })
export class TvDetailsComponent { export class TvDetailsComponent {
public tv: ISearchTvResultV2; public tv: ISearchTvResultV2;

@ -13,10 +13,12 @@ import {
MatButtonModule, MatNativeDateModule, MatIconModule, MatSidenavModule, MatListModule, MatToolbarModule, MatTooltipModule} from '@angular/material'; MatButtonModule, MatNativeDateModule, MatIconModule, MatSidenavModule, MatListModule, MatToolbarModule, MatTooltipModule} from '@angular/material';
import { MatCardModule, MatInputModule, MatTabsModule, MatAutocompleteModule, MatCheckboxModule, MatExpansionModule, MatDialogModule, MatProgressSpinnerModule, import { MatCardModule, MatInputModule, MatTabsModule, MatAutocompleteModule, MatCheckboxModule, MatExpansionModule, MatDialogModule, MatProgressSpinnerModule,
MatChipsModule } from "@angular/material"; MatChipsModule } from "@angular/material";
import { EpisodeRequestComponent } from "./episode-request/episode-request.component";
@NgModule({ @NgModule({
declarations: [ declarations: [
IssuesReportComponent, IssuesReportComponent,
EpisodeRequestComponent,
], ],
imports: [ imports: [
SidebarModule, SidebarModule,
@ -38,16 +40,22 @@ import {
MatListModule, MatListModule,
MatToolbarModule, MatToolbarModule,
MatCheckboxModule, MatCheckboxModule,
TranslateModule,
MatExpansionModule, MatExpansionModule,
MatDialogModule, MatDialogModule,
], ],
entryComponents: [
EpisodeRequestComponent
],
exports: [ exports: [
TranslateModule, TranslateModule,
CommonModule, CommonModule,
FormsModule, FormsModule,
TranslateModule,
SidebarModule, SidebarModule,
MatProgressSpinnerModule, MatProgressSpinnerModule,
IssuesReportComponent, IssuesReportComponent,
EpisodeRequestComponent,
TruncateModule, TruncateModule,
InputSwitchModule, InputSwitchModule,
MomentModule,MatCardModule, MomentModule,MatCardModule,

@ -1,42 +1,47 @@
@import '~@angular/material/theming'; @import '~@angular/material/theming';
@import "./mat-palette.scss"; @import "./mat-palette.scss";
// Plus imports for other components in your app. // Plus imports for other components in your app.
// Include the common styles for Angular Material. We include this here so that you only // Include the common styles for Angular Material. We include this here so that you only
// have to load a single css file for Angular Material in your app. // have to load a single css file for Angular Material in your app.
// Be sure that you only ever include this mixin once! // Be sure that you only ever include this mixin once!
@include mat-core(); @include mat-core();
// Define the palettes for your theme using the Material Design palettes available in palette.scss // Define the palettes for your theme using the Material Design palettes available in palette.scss
// (imported above). For each palette, you can optionally specify a default, lighter, and darker // (imported above). For each palette, you can optionally specify a default, lighter, and darker
// hue. Available color palettes: https://material.io/design/color/ // hue. Available color palettes: https://material.io/design/color/
$ombi-app-primary: mat-palette($ombi-primary, 500); $ombi-app-primary: mat-palette($ombi-primary, 500);
$ombi-app-accent: mat-palette($ombi-accent, A200, A100, A400); $ombi-app-accent : mat-palette($ombi-accent, A200, A100, A400);
$panel-color: white; $panel: white;
$text:black;
$background: white;
// The warn palette is optional (defaults to red). // The warn palette is optional (defaults to red).
$ombi-app-warn: mat-palette($mat-deep-orange); $ombi-app-warn : mat-palette($mat-deep-orange);
// Create the theme object (a Sass map containing all of the palettes). // Create the theme object (a Sass map containing all of the palettes).
$ombi-app-theme: mat-light-theme($ombi-app-primary, $ombi-app-accent, $ombi-app-warn); $ombi-app-theme: mat-light-theme($ombi-app-primary, $ombi-app-accent, $ombi-app-warn);
// Include theme styles for core and each component used in your app. // Include theme styles for core and each component used in your app.
// Alternatively, you can import and @include the theme mixins for each component // Alternatively, you can import and @include the theme mixins for each component
// that you are using. // that you are using.
@include angular-material-theme($ombi-app-theme); @include angular-material-theme($ombi-app-theme);
// Define an alternate dark theme. // Define an alternate dark theme.
$ombi-app-primary: mat-palette($mat-grey, 800); $ombi-dark-app-primary: mat-palette($mat-grey, 800);
$ombi-app-accent: mat-palette($mat-amber, A200, A100, A400); $ombi-dark-app-accent : mat-palette($mat-amber, A200, A100, A400);
$ombi-app-warn: mat-palette($mat-deep-orange); $ombi-dark-app-warn : mat-palette($mat-deep-orange);
$dark-theme: mat-dark-theme($ombi-app-primary, $ombi-app-accent, $ombi-app-warn); $dark-theme : mat-dark-theme($ombi-dark-app-primary, $ombi-dark-app-accent, $ombi-dark-app-warn);
$primary: mat-color($ombi-app-primary);
$accent: mat-color($ombi-app-accent);
$warn: mat-color($ombi-app-warn);
// Include the alternative theme styles inside of a block with a CSS class. You can make this // Include the alternative theme styles inside of a block with a CSS class. You can make this
// CSS class whatever you want. In this example, any component inside of an element with // CSS class whatever you want. In this example, any component inside of an element with
// `.dark-theme` will be affected by this alternate dark theme instead of the default theme. // `.dark` will be affected by this alternate dark theme instead of the default theme.
.dark { .dark {
@include angular-material-theme($dark-theme); @include angular-material-theme($dark-theme);
$panel-color: mat-color(mat-palette($mat-grey, 800)); $panel: mat-color(mat-palette($mat-grey, 800));
$primary: mat-color($ombi-dark-app-primary);
$accent: mat-color($ombi-dark-app-accent);
$warn: mat-color($ombi-dark-app-warn);
$background: #424242;
$text: white;
} }

@ -1,3 +1,4 @@
@import "Styles.scss";
// PrimeNG Carosel overrides // PrimeNG Carosel overrides
.ui-carousel-dropdown { .ui-carousel-dropdown {
display:none; display:none;
@ -8,6 +9,7 @@
.ui-carousel-viewport { .ui-carousel-viewport {
border:0 !important; border:0 !important;
background-color:$background !important;
} }
.ui-carousel .ui-carousel-header { .ui-carousel .ui-carousel-header {

Loading…
Cancel
Save