From 68335ab8d8faf0c22d5430dd6d625d120e3b61e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABlle=20Morin?= <gmorin.dev@gmail.com>
Date: Thu, 19 Dec 2019 13:10:09 +0000
Subject: [PATCH] Gm fixbug
---
src/page-admin-circles.pug | 2 +-
src/page-circle-profile.pug | 2 ++
src/page-project-profile.pug | 2 ++
src/page-project.pug | 2 +-
src/styles/base/main.scss | 11 +++++++++--
.../layout/project-profile/project-profile.scss | 4 ----
src/templates/hd-business-provider.pug | 4 ++--
src/templates/hd-customer.pug | 4 ++--
8 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/page-admin-circles.pug b/src/page-admin-circles.pug
index 09fd95cd..1c72ae76 100644
--- a/src/page-admin-circles.pug
+++ b/src/page-admin-circles.pug
@@ -50,7 +50,7 @@
sib-widget(name='admin-circle-join-button')
template
- button.button.btn-margin-left.text-bold.text-uppercase.reversed.button-blue.bordered.with-icon.icon-arrow-right-circle.test
+ button.button.text-bold.text-uppercase.reversed.button-blue.bordered.with-icon.icon-arrow-right-circle.test
sib-form(
data-src=''
nested-field='members'
diff --git a/src/page-circle-profile.pug b/src/page-circle-profile.pug
index 7d93724d..5a7302e8 100644
--- a/src/page-circle-profile.pug
+++ b/src/page-circle-profile.pug
@@ -11,6 +11,8 @@ sib-router(default-route='circle-profile', hidden)
bind-resources
fields='creationDateSet(title, creationDate)'
+ class-title='word-spacing-right'
+
value-title='Creation date: '
widget-creationDate='sib-display-date'
diff --git a/src/page-project-profile.pug b/src/page-project-profile.pug
index b62a5f36..f8b72ff2 100644
--- a/src/page-project-profile.pug
+++ b/src/page-project-profile.pug
@@ -15,6 +15,8 @@ sib-router(default-route='project-profile', hidden)
bind-resources
fields='creationDateSet(title, creationDate)'
+ class-title='word-spacing-right'
+
value-title='Creation date: '
widget-creationDate='sib-display-date'
diff --git a/src/page-project.pug b/src/page-project.pug
index 8f940bff..eac83122 100644
--- a/src/page-project.pug
+++ b/src/page-project.pug
@@ -7,7 +7,7 @@
fields='const-title1, number, customer.name, name'
class-const-title1='h1-like'
- class-number='h1-like'
+ class-number='h1-like word-spacing-right'
class-customer.name='h1-like'
class-name='h1-aside name'
diff --git a/src/styles/base/main.scss b/src/styles/base/main.scss
index eba18bee..8c7f2e42 100644
--- a/src/styles/base/main.scss
+++ b/src/styles/base/main.scss
@@ -135,10 +135,9 @@ h5 {
&:not(:empty)::before {
color: $color-233-18-29;
- content: '- ';
+ content: ' - ';
font-size: 2rem;
font-weight: bold;
- margin-left: 0.60rem;
}
}
@@ -224,6 +223,14 @@ h5 {
padding: 4.5rem;
}
+.word-spacing-left {
+ margin-left: 0.60rem;
+}
+
+.word-spacing-right {
+ margin-right: 0.60rem;
+}
+
// Compatibility layer for non-updated components
@import 'compat';
// Other base components
diff --git a/src/styles/layout/project-profile/project-profile.scss b/src/styles/layout/project-profile/project-profile.scss
index 4ad0b2f8..287172f4 100644
--- a/src/styles/layout/project-profile/project-profile.scss
+++ b/src/styles/layout/project-profile/project-profile.scss
@@ -27,10 +27,6 @@
margin-top: 0.8rem;
}
}
-
- span {
- margin-right: 0.6rem;
- }
}
&:last-child {
diff --git a/src/templates/hd-business-provider.pug b/src/templates/hd-business-provider.pug
index be113acc..dad0fe8c 100644
--- a/src/templates/hd-business-provider.pug
+++ b/src/templates/hd-business-provider.pug
@@ -1,6 +1,6 @@
sib-widget(name='hd-business-provider')
template
ul
- li #[span Happy Dev Paris:] 5%
- li #[span Business provider:] ${await value.name ? await value.name : ""} ${await value.name ? "," : ""} ${await value.fee ? await value.fee:0}%
+ li #[span Happy Dev Paris: ] 5%
+ li #[span Business provider: ] ${await value.name ? await value.name : ""}${await value.name ? "," : ""} ${await value.fee ? await value.fee:0}%
\ No newline at end of file
diff --git a/src/templates/hd-customer.pug b/src/templates/hd-customer.pug
index 32cfc993..df6beba2 100644
--- a/src/templates/hd-customer.pug
+++ b/src/templates/hd-customer.pug
@@ -4,8 +4,8 @@ sib-widget(name='hd-customer')
div
h3 Client:
ul
- li #[span Business name:]${await value.name}
- li #[span Company register:]${await value.companyRegister}
+ li #[span Business name: ]${await value.name}
+ li #[span Company register: ]${await value.companyRegister}
li
span Address:
br
--
GitLab