-
+
diff --git a/src/src/app/pages/notes-admin/notes-admin.page.scss b/src/src/app/pages/notes-admin/notes-admin.page.scss
index d30d1f1a..61f034b9 100644
--- a/src/src/app/pages/notes-admin/notes-admin.page.scss
+++ b/src/src/app/pages/notes-admin/notes-admin.page.scss
@@ -1,3 +1,5 @@
+
+/* TODO(mdc-migration): The following rule targets internal classes of card that may no longer apply for the MDC version. */
mat-card {
max-width: 800px;
margin: 1.5rem auto;
diff --git a/src/src/app/pages/saved-pages-admin/saved-pages-admin.page.html b/src/src/app/pages/saved-pages-admin/saved-pages-admin.page.html
index 7489aa0d..9beb1536 100644
--- a/src/src/app/pages/saved-pages-admin/saved-pages-admin.page.html
+++ b/src/src/app/pages/saved-pages-admin/saved-pages-admin.page.html
@@ -6,7 +6,7 @@
-
+
diff --git a/src/src/app/pages/saved-pages-admin/saved-pages-admin.page.scss b/src/src/app/pages/saved-pages-admin/saved-pages-admin.page.scss
index d30d1f1a..61f034b9 100644
--- a/src/src/app/pages/saved-pages-admin/saved-pages-admin.page.scss
+++ b/src/src/app/pages/saved-pages-admin/saved-pages-admin.page.scss
@@ -1,3 +1,5 @@
+
+/* TODO(mdc-migration): The following rule targets internal classes of card that may no longer apply for the MDC version. */
mat-card {
max-width: 800px;
margin: 1.5rem auto;
diff --git a/src/src/app/pages/search/search.page.html b/src/src/app/pages/search/search.page.html
index 538b573c..c5cc2e70 100644
--- a/src/src/app/pages/search/search.page.html
+++ b/src/src/app/pages/search/search.page.html
@@ -36,7 +36,7 @@
-
+
{
- // eslint-disable-next-line @typescript-eslint/quotes
this.appService.dispatchError(`Something went wrong and the Settings weren't saved. :(`);
}
);
@@ -235,7 +234,6 @@ export class StorageService extends SubscriberBase {
},
// error
() => {
- // eslint-disable-next-line @typescript-eslint/quotes
this.appService.dispatchError(`Something went wrong and the Page wasn't saved. :(`);
}
);
@@ -262,7 +260,6 @@ export class StorageService extends SubscriberBase {
},
// error
() => {
- // eslint-disable-next-line @typescript-eslint/quotes
this.appService.dispatchError(`Something went wrong and the Note wasn't saved. :(`);
}
);
@@ -294,7 +291,6 @@ export class StorageService extends SubscriberBase {
},
// error
() => {
- // eslint-disable-next-line @typescript-eslint/quotes
this.appService.dispatchError(`Something went wrong and the current cards weren't saved. :(`);
}
);
diff --git a/src/src/styles.scss b/src/src/styles.scss
index 2c21e054..faf0ec96 100644
--- a/src/src/styles.scss
+++ b/src/src/styles.scss
@@ -1,7 +1,5 @@
// Custom Theming for Angular Material
@use '@angular/material' as mat;
-// For more information: https://material.angular.io/guide/theming
-@import "@angular/material/theming";
// Plus imports for other components in your app.
@import "./styles/app.scss";
diff --git a/src/src/styles/app.scss b/src/src/styles/app.scss
index 5013a413..7fd80c02 100644
--- a/src/src/styles/app.scss
+++ b/src/src/styles/app.scss
@@ -117,7 +117,7 @@ a {
}
.mat-h1,
-.mat-headline,
+.mat-headline-5,
.mat-typography h1 {
font-weight: bold !important;
font-family: var(--card-heading-font-family) !important;
@@ -126,7 +126,7 @@ a {
}
.mat-h2,
-.mat-title,
+.mat-headline-6,
.mat-typography h2 {
font-weight: bold !important;
font-family: var(--card-heading-font-family) !important;
@@ -135,7 +135,7 @@ a {
}
.mat-h3,
-.mat-subheading-2,
+.mat-subtitle-1,
.mat-typography h3 {
font-weight: bold !important;
font-family: var(--card-heading-font-family) !important;
@@ -144,7 +144,7 @@ a {
}
.mat-h4,
-.mat-subheading-1,
+.mat-body-1,
.mat-typography h4 {
font-weight: bold !important;
font-family: var(--card-heading-font-family) !important;
@@ -175,25 +175,26 @@ p {
// overrides
+/* TODO(mdc-migration): The following rule targets internal classes of button that may no longer apply for the MDC version.*/
.mat-button-focus-overlay {
background-color: transparent !important;
}
-.mat-icon-button {
+.mat-mdc-icon-button {
line-height: inherit !important;
}
-.mat-dialog-container {
+.mat-mdc-dialog-container {
padding: 0 !important;
overflow: hidden !important;
}
-.mat-dialog-content {
+.mat-mdc-dialog-content {
padding: 0 12px !important;
margin: 0 !important;
}
-.mat-dialog-title {
+.mat-mdc-dialog-title {
margin: 0 0 2px !important;
}
-.mat-dialog-actions {
+.mat-mdc-dialog-actions {
margin-bottom: 0px;
justify-content: end;
}
@@ -204,7 +205,7 @@ p {
max-height: 95vh !important;
}
- .mat-dialog-content {
+ .mat-mdc-dialog-content {
max-height: 95vh !important;
}
}
diff --git a/src/src/test.ts b/src/src/test.ts
index 20423564..caf71351 100644
--- a/src/src/test.ts
+++ b/src/src/test.ts
@@ -1,5 +1,3 @@
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
@@ -7,19 +5,8 @@ import {
platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing';
-declare const require: {
- context(path: string, deep?: boolean, filter?: RegExp): {
- keys(): string[];
- (id: string): T;
- };
-};
-
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting()
);
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
diff --git a/src/tsconfig.json b/src/tsconfig.json
index 31b3a4e8..f81bf877 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -11,7 +11,8 @@
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
- "target": "es2020",
+ "useDefineForClassFields": false,
+ "target": "es2022",
"module": "ESNext",
"lib": ["es2018", "dom"]
}