From eeda5f3c7252c1146e1b36751562a8ad9861ecd9 Mon Sep 17 00:00:00 2001
From: Calum Mackervoy <c.mackervoy@gmail.com>
Date: Fri, 20 Dec 2019 19:53:05 +0000
Subject: [PATCH 1/2] do not display null items
---
src/templates/hd-customer.pug | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/templates/hd-customer.pug b/src/templates/hd-customer.pug
index df6beba2..1da40e49 100644
--- a/src/templates/hd-customer.pug
+++ b/src/templates/hd-customer.pug
@@ -5,15 +5,12 @@ sib-widget(name='hd-customer')
h3 Client:
ul
li #[span Business name: ]${await value.name}
- li #[span Company register: ]${await value.companyRegister}
- li
- span Address:
- br
- p ${await value.address}
+ li ${await value.companyRegister ? `<span>Company register: </span> ${await value.companyRegister}` : ``}
+ li ${await value.address ? `<span>Address: </span><br/><p>${await value.address}</p>`: ``}
div
h3 Contact:
ul
- li(class='mdi-account-outline') #[span ${await value.firstName} ${await value.lastName}], ${await value.role}
+ li(class='mdi-account-outline') #[span ${await value.firstName} ${await value.lastName ? await value.lastName : ""}]${await value.role ? `, ${await value.role}` : ""}
li(class='mdi-email-outline')
a(href='mailto:${await value.email}') ${await value.email}
- li(class='mdi-cellphone-iphone') ${await value.phone}
+ span ${await value.phone ? `<li class='mdi-cellphone-iphone'>${await value.phone}</li>` : ``}
--
GitLab
From b0456c53981f065ea8d808cd0903b2eaaac3e251 Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Wed, 8 Jan 2020 12:45:13 +0100
Subject: [PATCH 2/2] icons are now on a span inside a li
---
src/styles/layout/project-profile/project-profile.scss | 2 +-
src/templates/hd-customer.pug | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/styles/layout/project-profile/project-profile.scss b/src/styles/layout/project-profile/project-profile.scss
index 287172f4..60ec420d 100644
--- a/src/styles/layout/project-profile/project-profile.scss
+++ b/src/styles/layout/project-profile/project-profile.scss
@@ -133,7 +133,7 @@
li {
margin-bottom: 0.5em;
- &::before {
+ span::before {
color: $color-43-100-50;
font-size: 2.2rem;
margin: 0 1rem 0 0;
diff --git a/src/templates/hd-customer.pug b/src/templates/hd-customer.pug
index 1da40e49..51563c2f 100644
--- a/src/templates/hd-customer.pug
+++ b/src/templates/hd-customer.pug
@@ -10,7 +10,8 @@ sib-widget(name='hd-customer')
div
h3 Contact:
ul
- li(class='mdi-account-outline') #[span ${await value.firstName} ${await value.lastName ? await value.lastName : ""}]${await value.role ? `, ${await value.role}` : ""}
- li(class='mdi-email-outline')
- a(href='mailto:${await value.email}') ${await value.email}
- span ${await value.phone ? `<li class='mdi-cellphone-iphone'>${await value.phone}</li>` : ``}
+ li #[span(class='mdi-account-outline') ${await value.firstName} ${await value.lastName ? await value.lastName : ""}]${await value.role ? `, ${await value.role}` : ""}
+ li
+ span(class='mdi-email-outline')
+ a(href='mailto:${await value.email}') ${await value.email}
+ span ${await value.phone ? `<li><span class='mdi-cellphone-iphone'>${await value.phone}</span></li>` : ``}
--
GitLab