diff --git a/angular.json b/angular.json index befc5f877..1805e9685 100644 --- a/angular.json +++ b/angular.json @@ -32,7 +32,6 @@ "src/manifest.webmanifest" ], "styles": [ - "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/m3-theme.scss", "./node_modules/video.js/dist/video-js.css" ], diff --git a/src/m3-theme.scss b/src/m3-theme.scss index 5567c2460..f87615eec 100644 --- a/src/m3-theme.scss +++ b/src/m3-theme.scss @@ -1,10 +1,11 @@ -// This file was generated by running 'ng generate @angular/material:m3-theme'. -// Proceed with caution if making changes to this file. - @use 'sass:map'; @use '@angular/material' as mat; @use 'styles' ; +@include mat.core(); + +$my-typography: mat.m2-define-typography-config(); +@include mat.typography-hierarchy($my-typography); // Note: Color palettes are generated from primary: #ffffff $_palettes: ( @@ -64,7 +65,7 @@ $_palettes: ( ), neutral: ( 0: #000000, - 10: #1c1b1b, + 10: #1b1c1c, 20: #313030, 25: #3c3b3b, 30: #474646, @@ -153,13 +154,14 @@ $dark-theme: mat.define-theme(( ), )); - -@include mat.core(); - html { - @include mat.all-component-themes($dark-theme); - //--mdc-dialog-container-color: red; - // Apply the dark theme by default + @include mat.all-component-themes($light-theme); + + .dark-theme { + @include mat.all-component-colors($dark-theme); + } + + /* // Apply the dark theme by default @include mat.core-theme($dark-theme); @include mat.button-theme($dark-theme); @@ -169,5 +171,5 @@ html { // typography and density styles. @include mat.core-color($light-theme); @include mat.button-color($light-theme); - } + } */ } \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index 68f216c0a..be4b1e21c 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,7 +1,6 @@ // @import 'themes/'; @import '@yangkghjh/videojs-aspect-ratio-panel/dist/videojs-aspect-ratio-panel.css'; - body, html { user-select: none; @@ -42,12 +41,12 @@ textarea, outline: none; } -.dark-theme .mat-expansion-panel, +/* .dark-theme .mat-expansion-panel, .dark-theme .mat-drawer, .dark-theme .mat-app-background, .dark-theme.mat-app-background { background-color: #1d1d1d; -} +} */ .dark-theme { ::-webkit-scrollbar {