From 734087a4e707bdd3850beb09cdf2df45ced46d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= Date: Mon, 20 Jan 2020 12:20:25 +0100 Subject: [PATCH] Ajout d'un style custom --- Front/skydivelogs-app/angular.json | 17 ++++++++--------- Front/skydivelogs-app/src/app/app.component.ts | 2 +- .../src/app/new-jump/new-jump.component.css | 2 -- Front/skydivelogs-app/src/custom-theme.scss | 10 ++++++++++ Front/skydivelogs-app/src/styles.css | 2 -- 5 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 Front/skydivelogs-app/src/custom-theme.scss diff --git a/Front/skydivelogs-app/angular.json b/Front/skydivelogs-app/angular.json index e7a056d..99a77cc 100644 --- a/Front/skydivelogs-app/angular.json +++ b/Front/skydivelogs-app/angular.json @@ -20,8 +20,9 @@ "src/assets", "src/favicon.ico" ], - "styles": [ - "./node_modules/@angular/material/prebuilt-themes/purple-green.css", + "styles": [{ + "input": "src/custom-theme.scss" + }, "src/styles.css" ], "scripts": [] @@ -37,12 +38,10 @@ "extractLicenses": true, "vendorChunk": false, "buildOptimizer": true, - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ] + "fileReplacements": [{ + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + }] } } }, @@ -131,4 +130,4 @@ "prefix": "app" } } -} \ No newline at end of file +} diff --git a/Front/skydivelogs-app/src/app/app.component.ts b/Front/skydivelogs-app/src/app/app.component.ts index 5cd9283..bf6f859 100644 --- a/Front/skydivelogs-app/src/app/app.component.ts +++ b/Front/skydivelogs-app/src/app/app.component.ts @@ -19,4 +19,4 @@ export class AppComponent implements OnInit { toggleMenu() { this.showMenu = !this.showMenu; } -} +} \ No newline at end of file diff --git a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.css b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.css index 7af606a..a123ef0 100644 --- a/Front/skydivelogs-app/src/app/new-jump/new-jump.component.css +++ b/Front/skydivelogs-app/src/app/new-jump/new-jump.component.css @@ -6,8 +6,6 @@ max-width: 500px; width: 100%; - background-color: black; - /* color: white; */ padding: 15px } diff --git a/Front/skydivelogs-app/src/custom-theme.scss b/Front/skydivelogs-app/src/custom-theme.scss new file mode 100644 index 0000000..463759f --- /dev/null +++ b/Front/skydivelogs-app/src/custom-theme.scss @@ -0,0 +1,10 @@ +@import '~@angular/material/theming'; + +@include mat-core(); + +$custom-theme-primary: mat-palette($mat-grey, 900); +$custom-theme-accent:mat-palette($mat-pink, A200, A100, A400); +$custom-theme-warn: mat-palette($mat-red); +$custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent, $custom-theme-warn); + +@include angular-material-theme($custom-theme); diff --git a/Front/skydivelogs-app/src/styles.css b/Front/skydivelogs-app/src/styles.css index 0d9ce65..d9496ed 100644 --- a/Front/skydivelogs-app/src/styles.css +++ b/Front/skydivelogs-app/src/styles.css @@ -1,5 +1,3 @@ -/* You can add global styles to this file, and also import other style files */ - html, body { height: 100%;