From 6d6eadbd4447e2792b1100521d3fc269ccab7454 Mon Sep 17 00:00:00 2001
From: Marlene Simondant <msimondant@grandlyon.com>
Date: Mon, 17 Jan 2022 12:06:52 +0100
Subject: [PATCH 1/2] feat(version): Display app version
---
src/app/about/about.component.html | 1 +
src/app/about/about.component.scss | 6 ++++++
src/app/about/about.component.ts | 10 +++++-----
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html
index 678e05776..23034e3aa 100644
--- a/src/app/about/about.component.html
+++ b/src/app/about/about.component.html
@@ -27,6 +27,7 @@
acteurs.
</p>
<p>N'hésitez pas à contribuer à cet espace en partageant vos ressources</p>
+ <p class="version" fxLayoutAlign="center center">Version : {{ version }}</p>
</div>
<div fxLayout="column" fxLayoutAlign="center center" fxLayoutGap="20px">
<img src="/assets/logos/logo_europe.png" width="220" height="168" alt="logo de l'union européenne" />
diff --git a/src/app/about/about.component.scss b/src/app/about/about.component.scss
index 08f1b70f1..12bc848c1 100644
--- a/src/app/about/about.component.scss
+++ b/src/app/about/about.component.scss
@@ -13,3 +13,9 @@ h2 {
.about-container {
max-width: 760px;
}
+
+.version {
+ padding-top: 80px;
+ font-size: 12px;
+ color: #717171;
+}
diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts
index 9898f7a23..1368672d6 100644
--- a/src/app/about/about.component.ts
+++ b/src/app/about/about.component.ts
@@ -1,15 +1,15 @@
import { Component, OnInit } from '@angular/core';
+import { version } from '../../../package.json';
@Component({
selector: 'app-about',
templateUrl: './about.component.html',
- styleUrls: ['./about.component.scss']
+ styleUrls: ['./about.component.scss'],
})
export class AboutComponent implements OnInit {
+ public version: string = version;
- constructor() { }
-
- ngOnInit(): void {
- }
+ constructor() {}
+ ngOnInit(): void {}
}
--
GitLab
From 739d52e3fd5c3c1d729203cace82c1c17ab0b67e Mon Sep 17 00:00:00 2001
From: Marlene Simondant <msimondant@grandlyon.com>
Date: Wed, 19 Jan 2022 14:29:32 +0100
Subject: [PATCH 2/2] fix: use css variables for font color and size
---
src/app/about/about.component.scss | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/about/about.component.scss b/src/app/about/about.component.scss
index 12bc848c1..a5d775dd2 100644
--- a/src/app/about/about.component.scss
+++ b/src/app/about/about.component.scss
@@ -16,6 +16,6 @@ h2 {
.version {
padding-top: 80px;
- font-size: 12px;
- color: #717171;
+ font-size: $font-size-xxsmall;
+ color: $grey-3;
}
--
GitLab