From 8ed5527faa165d9e08dc58d79952bdae8d0e4c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cha=C3=AFb=20Martinez?= Date: Thu, 27 Jul 2023 12:39:09 +0200 Subject: [PATCH 1/6] wording and link update --- res/welcome.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/res/welcome.html b/res/welcome.html index d599afb431..720cdedb42 100644 --- a/res/welcome.html +++ b/res/welcome.html @@ -166,12 +166,14 @@
- + -

_t("Welcome to Tchap")

+

_t("Welcome to Tchap")
la messagerie instantanée de l'Administration

-

_t("Decentralised, encrypted chat & collaboration powered by $matrixLogo")

+

Conçue et gérée par l'Administration française, pour les agents des trois fonctions publiques,
pour communiquer facilement en toute sécurité. + Utilisée par plus de 400 000 agents publics. +

From 90b5ce1a2097140631d6d9cd1eae67ad18965a1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cha=C3=AFb=20Martinez?= Date: Tue, 1 Aug 2023 15:08:13 +0200 Subject: [PATCH 2/6] New landing --- res/welcome.html | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/res/welcome.html b/res/welcome.html index 720cdedb42..8ba31b8585 100644 --- a/res/welcome.html +++ b/res/welcome.html @@ -44,17 +44,23 @@ display: -webkit-flex; display: -ms-flexbox; display: flex; + justify-content: space-between; -webkit-justify-content: space-around; -ms-flex-pack: distribute; -webkit-box-align: center; -webkit-align-items: center; -ms-flex-align: center; align-items: center; - justify-content: space-between; box-sizing: border-box; margin: 12px 0 0; } + .mx_Center_content { + justify-content:center; + -webkit-justify-content:center; + } + + .mx_ButtonRow > * { margin: 0 10px; } @@ -94,10 +100,13 @@ color: #2e2f32 !important; } + + .mx_ButtonLabel { margin-left: 20px; } + .mx_Header_title { font-size: 24px; font-weight: 600; @@ -122,7 +131,8 @@ .mx_SecondaryButton { background-color: #ffffff; - color: #2e2f32; + outline: 1px solid #2e2f32; + outline-offset: -2px; } .mx_Button_iconSignIn { @@ -171,9 +181,9 @@

_t("Welcome to Tchap")
la messagerie instantanée de l'Administration

-

Conçue et gérée par l'Administration française, pour les agents des trois fonctions publiques,
pour communiquer facilement en toute sécurité. +

Conçue et gérée par l'Administration française, pour les agents des trois fonctions publiques,
pour communiquer facilement en toute sécurité. Utilisée par plus de 400 000 agents publics. -

+
@@ -183,6 +193,10 @@

Conçue et gérée par l'Administration français
_t("Create Account")

+
+
En savoir plus
+ +
+ From fc370d8c213f2cbfd840bf0294c1b8e74f943026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cha=C3=AFb=20Martinez?= Date: Tue, 1 Aug 2023 15:42:34 +0200 Subject: [PATCH 3/6] wip --- res/welcome.html | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/res/welcome.html b/res/welcome.html index 8ba31b8585..0d2e61a187 100644 --- a/res/welcome.html +++ b/res/welcome.html @@ -3,10 +3,6 @@ * voodoo where we have to set display: none by default */ - h1::after { - content: "!"; - } - .mx_Parent { display: -webkit-box; display: -webkit-flex; @@ -44,13 +40,13 @@ display: -webkit-flex; display: -ms-flexbox; display: flex; - justify-content: space-between; -webkit-justify-content: space-around; -ms-flex-pack: distribute; -webkit-box-align: center; -webkit-align-items: center; -ms-flex-align: center; align-items: center; + justify-content: space-between; box-sizing: border-box; margin: 12px 0 0; } @@ -60,7 +56,6 @@ -webkit-justify-content:center; } - .mx_ButtonRow > * { margin: 0 10px; } @@ -100,19 +95,20 @@ color: #2e2f32 !important; } - - .mx_ButtonLabel { margin-left: 20px; } - .mx_Header_title { font-size: 24px; font-weight: 600; margin: 20px 0 0; } + .mx_Header_title_no_bold { + font-weight: normal; + } + .mx_Header_subtitle { font-size: 12px; font-weight: normal; @@ -120,7 +116,7 @@ } .mx_ButtonSignIn { - background-color: #368bd6; + background-color: #000091; color: white !important; } @@ -133,6 +129,7 @@ background-color: #ffffff; outline: 1px solid #2e2f32; outline-offset: -2px; + margin-top: 28px; } .mx_Button_iconSignIn { @@ -179,7 +176,7 @@ -

_t("Welcome to Tchap")
la messagerie instantanée de l'Administration

+

_t("Welcome to Tchap")
la messagerie instantanée de l'Administration

Conçue et gérée par l'Administration française, pour les agents des trois fonctions publiques,
pour communiquer facilement en toute sécurité. Utilisée par plus de 400 000 agents publics. @@ -212,4 +209,3 @@

Conçue et gérée par l'Administration française, pour les agents des tro

- From 6f2be9783432912424e0de7e726d7cda55e0181c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cha=C3=AFb=20Martinez?= Date: Wed, 2 Aug 2023 13:55:39 +0200 Subject: [PATCH 4/6] improv design --- res/themes/tchap/img/backgrounds/tchap-bg.svg | 1952 +---------------- res/themes/tchap/img/logos/tchap-logo.png | Bin 0 -> 18433 bytes res/welcome.html | 25 +- 3 files changed, 18 insertions(+), 1959 deletions(-) create mode 100644 res/themes/tchap/img/logos/tchap-logo.png diff --git a/res/themes/tchap/img/backgrounds/tchap-bg.svg b/res/themes/tchap/img/backgrounds/tchap-bg.svg index 7e1977d221..1c0f59e873 100644 --- a/res/themes/tchap/img/backgrounds/tchap-bg.svg +++ b/res/themes/tchap/img/backgrounds/tchap-bg.svg @@ -1,1951 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/res/themes/tchap/img/logos/tchap-logo.png b/res/themes/tchap/img/logos/tchap-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..2f1440145cdefe5416dc7917d0587a1ba6f8c8bd GIT binary patch literal 18433 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Ã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 B&%^)# literal 0 HcmV?d00001 diff --git a/res/welcome.html b/res/welcome.html index 0d2e61a187..c59beefdb4 100644 --- a/res/welcome.html +++ b/res/welcome.html @@ -26,13 +26,21 @@ color: #2e2f32; } + + .mx_AuthPage_modal { + margin-top: 25px + } + + h2 { + font-size: 1.6rem; + } .mx_Logo { - height: 54px; + height: 109px; margin-top: 2px; } .mx_ButtonGroup { - margin-top: 10px; + margin-bottom: 10px; } .mx_ButtonRow { @@ -129,7 +137,7 @@ background-color: #ffffff; outline: 1px solid #2e2f32; outline-offset: -2px; - margin-top: 28px; + margin-bottom: 18px; } .mx_Button_iconSignIn { @@ -174,7 +182,7 @@
- +

_t("Welcome to Tchap")
la messagerie instantanée de l'Administration

@@ -182,6 +190,10 @@

Conçue et gérée par l'Administration française, pour les agents des tro Utilisée par plus de 400 000 agents publics.

+
+
En savoir plus
+ +
_t("Sign In")
@@ -190,10 +202,7 @@

Conçue et gérée par l'Administration française, pour les agents des tro
_t("Create Account")

-
-
En savoir plus
- -
+ -

Conçue et gérée par l'Administration française, pour les agents des trois fonctions publiques,
pour communiquer facilement en toute sécurité. - Utilisée par plus de 400 000 agents publics. +

_t("Conçue et gérée par l'Administration française")

-
En savoir plus
+
_t("En savoir plus")
diff --git a/src/tchap/i18n/strings/tchap_translations.json b/src/tchap/i18n/strings/tchap_translations.json index 21d1349bba..fc0b4af142 100644 --- a/src/tchap/i18n/strings/tchap_translations.json +++ b/src/tchap/i18n/strings/tchap_translations.json @@ -959,8 +959,16 @@ "en": "Privacy Policy", "fr": "Politique de Confidentialité" }, - "Read the Privacy Policy": { - "en": "Read the Privacy Policy", - "fr": "Consultez la Politique de Confidentialité" + "la messagerie instantanée de l'Administration": { + "en": "The instant messaging app of the French Administration", + "fr": "la messagerie instantanée de l'Administration" + }, + "Conçue et gérée par l'Administration française": { + "en": "Designed and managed by the French Administration, for agents of the three public functions,
to communicate easily with high security standards. Used by over 400,000 public officials.", + "fr": "Conçue et gérée par l'Administration française, pour les agents des trois fonctions publiques,
pour communiquer facilement en toute sécurité. Utilisée par plus de 400 000 agents publics." + }, + "En savoir plus" : { + "en": "Learn more", + "fr": "En savoir plus" } } From 2cb424f060022974a17868c807aeb51f4bd9e578 Mon Sep 17 00:00:00 2001 From: olivier Date: Wed, 2 Aug 2023 15:40:33 +0200 Subject: [PATCH 6/6] revert background --- res/themes/tchap/img/backgrounds/tchap-bg.svg | 1952 ++++++++++++++++- 1 file changed, 1951 insertions(+), 1 deletion(-) diff --git a/res/themes/tchap/img/backgrounds/tchap-bg.svg b/res/themes/tchap/img/backgrounds/tchap-bg.svg index 1c0f59e873..7e1977d221 100644 --- a/res/themes/tchap/img/backgrounds/tchap-bg.svg +++ b/res/themes/tchap/img/backgrounds/tchap-bg.svg @@ -1 +1,1951 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +