changed some of the base theming

pull/3996/head
tidusjar 4 years ago
parent 7c0210f62f
commit 63b8984dbf

@ -25,10 +25,8 @@
"src/assets" "src/assets"
], ],
"styles": [ "styles": [
"./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
"src/styles/_imports.scss", "src/styles/_imports.scss",
"node_modules/bootstrap/scss/bootstrap.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/font-awesome/scss/font-awesome.scss",
"node_modules/primeng/resources/primeng.min.css", "node_modules/primeng/resources/primeng.min.css",
"node_modules/primeicons/primeicons.css", "node_modules/primeicons/primeicons.css",

@ -170,7 +170,7 @@
<div> <div>
<app-my-nav id="main-container" [showNav]="showNav" [isAdmin]="isAdmin" [applicationName]="applicationName" [applicationLogo]="customizationSettings?.logo" [username]="username" [email]="user?.email " (logoutClick)="logOut();" (themeChange)="onSetTheme($event)"> <app-my-nav id="main-container dark" [showNav]="showNav" [isAdmin]="isAdmin" [applicationName]="applicationName" [applicationLogo]="customizationSettings?.logo" [username]="username" [email]="user?.email " (logoutClick)="logOut();" (themeChange)="onSetTheme($event)">
</app-my-nav> </app-my-nav>

@ -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` 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);
} }

@ -39,7 +39,7 @@ html,
body { body {
min-height: 100vh; min-height: 100vh;
overflow: initial; overflow: initial;
scrollbar-color: #616161 #303030; //firefox // scrollbar-color: #616161 #303030; //firefox
scrollbar-width: thin; //firefox scrollbar-width: thin; //firefox
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
@ -106,7 +106,7 @@ table {
} }
::ng-deep .dark .nav-link.active { ::ng-deep .dark .nav-link.active {
color: #303030; color: $ombi-active;
background-color: $accent-dark; background-color: $accent-dark;
border-color: rgba(0, 0, 0, 0.18); border-color: rgba(0, 0, 0, 0.18);
font-weight: 400; font-weight: 400;

@ -1,17 +1,18 @@
@import "./mat-palette.scss"; // @import "./mat-palette.scss";
@import '~@angular/material/theming'; @import '~@angular/material/theming';
@import "./new-mat-palette.scss";
// BASE // BASE
// 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); $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). // The warn palette is optional (defaults to red).
$ombi-app-warn : mat-palette($mat-deep-orange); $ombi-app-warn : mat-palette($mat-deep-orange);
// Define an alternate dark theme. // Define an alternate dark theme.
$ombi-dark-app-primary: mat-palette($mat-grey, 800); $ombi-dark-app-primary: mat-palette($ombi-primary);
$ombi-dark-app-accent: mat-palette($mat-amber, A200, A100, A400); $ombi-dark-app-accent: mat-palette($ombi-accent);
$ombi-dark-app-warn: mat-palette($mat-deep-orange); $ombi-dark-app-warn: mat-palette($mat-deep-orange);
@ -30,16 +31,16 @@ $warn: mat-color($ombi-app-warn);
// DARK // 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)); $backgroundTint-dark: mat-color(mat-palette($mat-grey, 900));
$text-dark: white; $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); $primary-dark: mat-color($ombi-dark-app-primary);
$accent-dark: mat-color($ombi-dark-app-accent); $accent-dark: mat-color($ombi-dark-app-accent);
$warn-dark: mat-color($ombi-dark-app-warn); $warn-dark: mat-color($ombi-dark-app-warn);
$ombi-active: #62d2fa; $ombi-active: mat-color($ombi-dark-app-accent);
$ombi-background-accent: #1b242f; $ombi-background-accent: mat-color($ombi-dark-app-primary);
$ombi-background-primary: #0f171f; $ombi-background-primary: #0f171f;
$ombi-background-primary-accent: #35465c; $ombi-background-primary-accent: #35465c;
Loading…
Cancel
Save