From 7dcda753c76e857a8940b6432ba8beb51599ce3b Mon Sep 17 00:00:00 2001
From: gaelle morin <gmorin.dev@gmail.com>
Date: Tue, 22 Dec 2020 16:04:13 +0100
Subject: [PATCH] feature: page about
---
src/index.pug | 3 +++
src/locales/en.json | 4 ++--
src/locales/es.json | 4 ++--
src/locales/fr.json | 4 ++--
src/styles/index.scss | 4 ++++
src/views/page-about.pug | 18 +++++++++---------
6 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/index.pug b/src/index.pug
index 60f2220d..e99ad252 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -52,6 +52,9 @@ html(lang="en")
main#content.segment.lg-three-quarter.text-top.notLoggedIn
+ #about(data-view="about")
+ include views/page-about.pug
+
//- if endpoints.get.dashboards
//- #dashboard(hidden, data-view="dashboard").no-sidebar.with-padding
//- include views/page-dashboard.pug
diff --git a/src/locales/en.json b/src/locales/en.json
index 1215ba8e..f51dabb9 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -39,8 +39,8 @@
"paragraph2": "Its mission is to empower users by enabling them to regain control of their digital tools and benefit from a network effect within a chosen ecosystem in order to emancipate themselves from large platforms."
},
"card2": {
- "title": "Contact us",
- "paragraph-1": "You want to contribute, report a bug, suggest an improvement, work with us?",
+ "subTitle": "Contact us",
+ "paragraph1": "You want to contribute, report a bug, suggest an improvement, work with us?",
"link": "Contact"
}
},
diff --git a/src/locales/es.json b/src/locales/es.json
index 242b21fb..b8ef845f 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -39,8 +39,8 @@
"paragraph2": "Su misión es devolver el poder a los usuarios permitiéndoles recuperar el control de su herramienta digital y beneficiarse de un efecto de red dentro de un ecosistema elegido para emanciparse de las grandes plataformas."
},
"card2": {
- "title": "Contactenos",
- "paragraph-1": "¿Quieres contribuir, informar de un error, sugerir una mejora, trabajar con nosotrxs?",
+ "subTitle": "Contactenos",
+ "paragraph1": "¿Quieres contribuir, informar de un error, sugerir una mejora, trabajar con nosotrxs?",
"link": "Contacto"
}
},
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 2fd48a4d..5cd00c52 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -39,8 +39,8 @@
"paragraph2": "Sa mission est de redonner le pouvoir aux utilisateurs en leur permettant de reprendre la main sur leur outil numérique et de bénéficier d’un effet de réseau au sein d’un écosystème choisi afin de s’émanciper des grandes plateformes."
},
"card2": {
- "title": "Contacte-nous",
- "paragraph-1": "Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ?",
+ "subTitle": "Contacte-nous",
+ "paragraph1": "Tu veux contribuer, nous remonter un bug, nous suggérer une amélioration, travailler avec nous ?",
"link": "Contact"
}
},
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 45cf5401..3cd687cf 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -6,6 +6,10 @@ main {
background-color: pink;
}
+.whitespace-normal {
+ white-space: normal;
+}
+
@import 'header/_index';
@import 'left-nav/_index';
@import 'content/_index';
\ No newline at end of file
diff --git a/src/views/page-about.pug b/src/views/page-about.pug
index 963788a0..777b6450 100644
--- a/src/views/page-about.pug
+++ b/src/views/page-about.pug
@@ -2,17 +2,17 @@ div.segment.padding-top-small.padding-right-large.padding-bottom-small.padding-l
h2.text-xlarge.text-color-heading.text-uppercase(data-trans='about.title')
div.segment.lg-two-third.margin-top-small.padding-right-xlarge
- div.segment.shadow.padding-top-xlarge.padding-right-xxlarge.padding-bottom-xxlarge.padding-left-xxlarge.text-center
+ div.segment.whitespace-normal.shadow.padding-top-xlarge.padding-right-xxlarge.padding-bottom-xxlarge.padding-left-xxlarge.text-center
h3.text-color-heading.text-semibold(data-trans='about.card1.subTitle')
div
- p.segment.float-left.text-large(data-trans='about.card1.paragraph1')
- p.segment.float-left.text-large(data-trans='about.card1.paragraph2')
+ p.segment.whitespace-normal.text-large(data-trans='about.card1.paragraph1')
+ p.segment.whitespace-normal.text-large(data-trans='about.card1.paragraph2')
a.link.text-xlarge(href="https://startinblox.com/fr/" target="_blank") https://startinblox.com/fr/
- div.segment.lg-third.margin-top-small
- div.segment.shadow.padding-top-xlarge.padding-right-xxlarge.padding-bottom-xxlarge.padding-left-xxlarge.text-center
- div.segment.center.icon.icon-xlarge.rounded-third.rounded.rounded-large.icon-envelope.icon-secondary
+ div.segment.lg-third.margin-top-small.text-top
+ div.segment.whitespace-normal.shadow.padding-top-xlarge.padding-right-xxlarge.padding-bottom-xxlarge.padding-left-xxlarge.text-center
+ div.segment.margin-top-small
+ div.segment.center.icon.icon-xlarge.rounded-third.rounded.rounded-large.icon-envelope.icon-secondary
h3.text-color-heading.text-semibold.text-medium(data-trans='about.card2.subTitle')
- div
- p.segment.float-left(data-trans='about.card2.paragraph1')
- a.button.text-bold.text-uppercase.color-secondary.bordered(href="https://startinblox.com/fr/#home-contact" target="_blank" data-trans='about.card2.link').main-cta
\ No newline at end of file
+ p(data-trans='about.card2.paragraph1')
+ a.button.text-bold.text-uppercase.color-secondary.bordered(href="https://startinblox.com/fr/#home-contact" target="_blank" data-trans='about.card2.link').main-cta
--
GitLab