diff --git a/src/Ombi/ClientApp/angular.json b/src/Ombi/ClientApp/angular.json index 4038c9a56..0dd70fd7a 100644 --- a/src/Ombi/ClientApp/angular.json +++ b/src/Ombi/ClientApp/angular.json @@ -25,10 +25,8 @@ "src/assets" ], "styles": [ - "./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css", "src/styles/_imports.scss", "node_modules/bootstrap/scss/bootstrap.scss", - "node_modules/primeng/resources/themes/md-dark-deeppurple/theme.css", "node_modules/font-awesome/scss/font-awesome.scss", "node_modules/primeng/resources/primeng.min.css", "node_modules/primeicons/primeicons.css", diff --git a/src/Ombi/ClientApp/src/app/app.component.html b/src/Ombi/ClientApp/src/app/app.component.html index d4297aeb4..1f3f4012c 100644 --- a/src/Ombi/ClientApp/src/app/app.component.html +++ b/src/Ombi/ClientApp/src/app/app.component.html @@ -170,7 +170,7 @@
- + diff --git a/src/Ombi/ClientApp/src/styles/Styles.scss b/src/Ombi/ClientApp/src/styles/Styles.scss index 41539ca61..5345ea995 100644 --- a/src/Ombi/ClientApp/src/styles/Styles.scss +++ b/src/Ombi/ClientApp/src/styles/Styles.scss @@ -21,6 +21,4 @@ $dark-theme: mat-dark-theme($ombi-dark-app-primary, $ombi-dark-app-accent, $ombi // `.dark` will be affected by this alternate dark theme instead of the default theme. .dark { @include angular-material-theme($dark-theme); - - } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/styles/shared.scss b/src/Ombi/ClientApp/src/styles/shared.scss index dda039602..bd1c0b37f 100644 --- a/src/Ombi/ClientApp/src/styles/shared.scss +++ b/src/Ombi/ClientApp/src/styles/shared.scss @@ -39,7 +39,7 @@ html, body { min-height: 100vh; overflow: initial; - scrollbar-color: #616161 #303030; //firefox + // scrollbar-color: #616161 #303030; //firefox scrollbar-width: thin; //firefox -webkit-overflow-scrolling: touch; } @@ -106,7 +106,7 @@ table { } ::ng-deep .dark .nav-link.active { - color: #303030; + color: $ombi-active; background-color: $accent-dark; border-color: rgba(0, 0, 0, 0.18); font-weight: 400; diff --git a/src/Ombi/ClientApp/src/styles/variables.scss b/src/Ombi/ClientApp/src/styles/variables.scss index 3e497bbc8..e1a05bf68 100644 --- a/src/Ombi/ClientApp/src/styles/variables.scss +++ b/src/Ombi/ClientApp/src/styles/variables.scss @@ -1,17 +1,18 @@ -@import "./mat-palette.scss"; +// @import "./mat-palette.scss"; @import '~@angular/material/theming'; +@import "./new-mat-palette.scss"; // BASE // 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 // hue. Available color palettes: https://material.io/design/color/ $ombi-app-primary: mat-palette($ombi-primary); -$ombi-app-accent : mat-palette($ombi-accent, 400); +$ombi-app-accent : mat-palette($ombi-accent); // The warn palette is optional (defaults to red). $ombi-app-warn : mat-palette($mat-deep-orange); // Define an alternate dark theme. -$ombi-dark-app-primary: mat-palette($mat-grey, 800); -$ombi-dark-app-accent: mat-palette($mat-amber, A200, A100, A400); +$ombi-dark-app-primary: mat-palette($ombi-primary); +$ombi-dark-app-accent: mat-palette($ombi-accent); $ombi-dark-app-warn: mat-palette($mat-deep-orange); @@ -30,16 +31,16 @@ $warn: mat-color($ombi-app-warn); // DARK -$background-dark: mat-color(mat-palette($mat-grey, 800));; +$background-dark: mat-color( mat-palette($ombi-background)); $backgroundTint-dark: mat-color(mat-palette($mat-grey, 900)); $text-dark: white; -$panel: mat-color(mat-palette($mat-grey, 800)); +$panel: mat-color($ombi-dark-app-primary); $primary-dark: mat-color($ombi-dark-app-primary); $accent-dark: mat-color($ombi-dark-app-accent); $warn-dark: mat-color($ombi-dark-app-warn); -$ombi-active: #62d2fa; -$ombi-background-accent: #1b242f; +$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