diff --git a/package-lock.json b/package-lock.json index 06cfe36..ebc6c5b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,14 +10,14 @@ "license": "GPL-3.0-or-later", "dependencies": { "@angular/animations": "^19.2.14", - "@angular/cdk": "^18.2.14", + "@angular/cdk": "^19.2.18", "@angular/cli": "^19.2.14", "@angular/common": "^19.2.14", "@angular/compiler": "^19.2.14", "@angular/core": "^19.2.14", "@angular/forms": "^19.2.14", - "@angular/material": "^18.2.14", - "@angular/material-moment-adapter": "^18.2.14", + "@angular/material": "^19.2.18", + "@angular/material-moment-adapter": "^19.2.18", "@angular/platform-browser": "^19.2.14", "@angular/platform-browser-dynamic": "^19.2.14", "@angular/router": "^19.2.14", @@ -851,18 +851,16 @@ } }, "node_modules/@angular/cdk": { - "version": "18.2.14", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.14.tgz", - "integrity": "sha512-vDyOh1lwjfVk9OqoroZAP8pf3xxKUvyl+TVR8nJxL4c5fOfUFkD7l94HaanqKSRwJcI2xiztuu92IVoHn8T33Q==", + "version": "19.2.18", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-19.2.18.tgz", + "integrity": "sha512-aGMHOYK/VV9PhxGTUDwiu/4ozoR/RKz8cimI+QjRxEBhzn4EPqjUDSganvlhmgS7cTN3+aqozdvF/GopMRJjLg==", "dependencies": { + "parse5": "^7.1.2", "tslib": "^2.3.0" }, - "optionalDependencies": { - "parse5": "^7.1.2" - }, "peerDependencies": { - "@angular/common": "^18.0.0 || ^19.0.0", - "@angular/core": "^18.0.0 || ^19.0.0", + "@angular/common": "^19.0.0 || ^20.0.0", + "@angular/core": "^19.0.0 || ^20.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -1104,32 +1102,31 @@ } }, "node_modules/@angular/material": { - "version": "18.2.14", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.14.tgz", - "integrity": "sha512-28pxzJP49Mymt664WnCtPkKeg7kXUsQKTKGf/Kl95rNTEdTJLbnlcc8wV0rT0yQNR7kXgpfBnG7h0ETLv/iu5Q==", + "version": "19.2.18", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-19.2.18.tgz", + "integrity": "sha512-xxedRQ9u7aiUYVrHAxASLUxnofN29xaqEGhBcHLAfOsFXdDMwDe/2ly79iKufwEs5BFBm3nfhJoarXZ3+8pucQ==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/animations": "^18.0.0 || ^19.0.0", - "@angular/cdk": "18.2.14", - "@angular/common": "^18.0.0 || ^19.0.0", - "@angular/core": "^18.0.0 || ^19.0.0", - "@angular/forms": "^18.0.0 || ^19.0.0", - "@angular/platform-browser": "^18.0.0 || ^19.0.0", + "@angular/cdk": "19.2.18", + "@angular/common": "^19.0.0 || ^20.0.0", + "@angular/core": "^19.0.0 || ^20.0.0", + "@angular/forms": "^19.0.0 || ^20.0.0", + "@angular/platform-browser": "^19.0.0 || ^20.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/material-moment-adapter": { - "version": "18.2.14", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-18.2.14.tgz", - "integrity": "sha512-igICm+qQl/KeglU4LcCHgSaaoJR6RUlDzpCs2+kfLSnsvAy5Z0ZauW3pbIsCEIDb0zknBqos9d8x+pXg/bncCQ==", + "version": "19.2.18", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-19.2.18.tgz", + "integrity": "sha512-YMXkwqaGILBypXIvLZe4cBk4mFttQJhaAjOwi5585Vmjq9sR9z9uViGSlbwfzbc7LRqV/2vphrbJYDsso7MNYQ==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/core": "^18.0.0 || ^19.0.0", - "@angular/material": "18.2.14", + "@angular/core": "^19.0.0 || ^20.0.0", + "@angular/material": "19.2.18", "moment": "^2.18.1" } }, @@ -7281,7 +7278,6 @@ "version": "4.5.0", "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "devOptional": true, "engines": { "node": ">=0.12" }, @@ -10729,7 +10725,6 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", - "devOptional": true, "dependencies": { "entities": "^4.4.0" }, diff --git a/package.json b/package.json index 0b4f3d6..0e0e2b6 100644 --- a/package.json +++ b/package.json @@ -13,14 +13,14 @@ "private": true, "dependencies": { "@angular/animations": "^19.2.14", - "@angular/cdk": "^18.2.14", + "@angular/cdk": "^19.2.18", "@angular/cli": "^19.2.14", "@angular/common": "^19.2.14", "@angular/compiler": "^19.2.14", "@angular/core": "^19.2.14", "@angular/forms": "^19.2.14", - "@angular/material": "^18.2.14", - "@angular/material-moment-adapter": "^18.2.14", + "@angular/material": "^19.2.18", + "@angular/material-moment-adapter": "^19.2.18", "@angular/platform-browser": "^19.2.14", "@angular/platform-browser-dynamic": "^19.2.14", "@angular/router": "^19.2.14", diff --git a/src/app/admin-view/grades/attendence-summary/attendence-summary.component.scss b/src/app/admin-view/grades/attendence-summary/attendence-summary.component.scss index 3e7b07e..cc9b457 100644 --- a/src/app/admin-view/grades/attendence-summary/attendence-summary.component.scss +++ b/src/app/admin-view/grades/attendence-summary/attendence-summary.component.scss @@ -7,10 +7,10 @@ #legend { display: flex; justify-self: center; + gap: 3ch; * { margin: 2px; } - gap: 3ch; } .circle { @@ -28,7 +28,7 @@ @for $n from 1 through 3 { &:nth-of-type(#{$n})::before { - background-color: nth($list, $n); + background-color: list.nth($list, $n); } } } \ No newline at end of file diff --git a/src/app/admin-view/news-edit/news-edit.component.scss b/src/app/admin-view/news-edit/news-edit.component.scss index efcf568..eb3cebf 100644 --- a/src/app/admin-view/news-edit/news-edit.component.scss +++ b/src/app/admin-view/news-edit/news-edit.component.scss @@ -11,11 +11,11 @@ mat-card-title { mat-card-footer p { font-size: 0.8rem; color: #4a4a4a; + margin-bottom: 0; + text-align: end; @media (prefers-color-scheme: dark) { color: #999999 } - margin-bottom: 0; - text-align: end; } mat-card-content p { diff --git a/src/app/app-view/app-view.component.scss b/src/app/app-view/app-view.component.scss index a43f72f..b05d7d9 100644 --- a/src/app/app-view/app-view.component.scss +++ b/src/app/app-view/app-view.component.scss @@ -16,12 +16,12 @@ :host { width: 100%; - @supports (-webkit-touch-callout: none) { - height: 95vh; - } height: 100vh; display: flex; flex-direction: column; + @supports (-webkit-touch-callout: none) { + height: 95vh; + } } a { diff --git a/src/app/app-view/news/news.component.scss b/src/app/app-view/news/news.component.scss index df4b130..ceae4f8 100644 --- a/src/app/app-view/news/news.component.scss +++ b/src/app/app-view/news/news.component.scss @@ -19,11 +19,11 @@ mat-card-title { mat-card-footer p { font-size: 0.8rem; color: #4a4a4a; + margin-bottom: 0; + text-align: end; @media (prefers-color-scheme: dark) { color: #999999 } - margin-bottom: 0; - text-align: end; } mat-card-content p { diff --git a/src/styles.scss b/src/styles.scss index 88b7af7..672d1bf 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -7,7 +7,8 @@ // 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. // Be sure that you only ever include this mixin once! -@include mat.core(); +@include mat.elevation-classes(); +@include mat.app-background(); $ipwa-palette: ( 50: #e8ebf7,