Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improv landing #637

Merged
merged 7 commits into from
Aug 2, 2023
Merged

Improv landing #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8ed5527
wording and link update
Jul 27, 2023
90b5ce1
New landing
Aug 1, 2023
fc370d8
wip
Aug 1, 2023
6f2be97
improv design
Aug 2, 2023
a7cc167
add english translation
odelcroi Aug 2, 2023
2cb424f
revert background
odelcroi Aug 2, 2023
8a02c22
Merge branch 'develop_tchap' into custom_landing
odelcroi Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added res/themes/tchap/img/logos/tchap-logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 33 additions & 11 deletions res/welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -30,13 +26,21 @@
color: #2e2f32;
}


.mx_AuthPage_modal {
margin-top: 25px
}

h2 {
font-size: 1.6rem;
}
.mx_Logo {
height: 54px;
margin-top: 2px;
}

.mx_ButtonGroup {
margin-top: 10px;
margin-bottom: 10px;
}

.mx_ButtonRow {
Expand All @@ -55,6 +59,11 @@
margin: 12px 0 0;
}

.mx_Center_content {
justify-content:center;
-webkit-justify-content:center;
}

.mx_ButtonRow > * {
margin: 0 10px;
}
Expand Down Expand Up @@ -104,14 +113,19 @@
margin: 20px 0 0;
}

.mx_Header_title_no_bold {
font-weight: normal;
font-size: 18px;
}

.mx_Header_subtitle {
font-size: 12px;
font-weight: normal;
margin: 8px 0 0;
}

.mx_ButtonSignIn {
background-color: #368bd6;
background-color: #000091;
color: white !important;
}

Expand All @@ -122,7 +136,9 @@

.mx_SecondaryButton {
background-color: #ffffff;
color: #2e2f32;
outline: 1px solid #2e2f32;
outline-offset: -2px;
margin-bottom: 18px;
}

.mx_Button_iconSignIn {
Expand Down Expand Up @@ -166,13 +182,18 @@
</style>

<div class="mx_Parent">
<a href="https://element.io" target="_blank" rel="noopener">
<img src="themes/tchap/img/logos/tchap-logo.svg" alt="" class="mx_Logo" />
<a href="https://tchap.beta.gouv.fr?mtm_camapaign=TchapWebConnectLogo" target="_blank" rel="noopener">
<img src="themes/tchap/img/logos/tchap-logo.svg" alt="Logo Tchap" class="mx_Logo" />
</a>
<h1 class="mx_Header_title">_t("Welcome to Tchap")</h1>
<h1 class="mx_Header_title">_t("Welcome to Tchap")<br/><span class="mx_Header_title_no_bold">_t("la messagerie instantanée de l'Administration")</span></h1>
<!-- XXX: Our translations system isn't smart enough to recognize variables in the HTML, so we manually do it -->
<h4 class="mx_Header_subtitle">_t("Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo")</h4>
<h2>_t("Conçue et gérée par l'Administration française")
</h2>
<div class="mx_ButtonGroup">
<div class="mx_ButtonRow mx_Center_content">
<a href="https://tchap.beta.gouv.fr?mtm_campaign=TchapWebConnectLogo" class="mx_ButtonParent mx_SecondaryButton "><div>_t("En savoir plus")</div>
</a>
</div>
<div class="mx_ButtonRow">
<a href="#/login" class="mx_ButtonParent mx_ButtonSignIn mx_Button_iconSignIn">
<div class="mx_ButtonLabel">_t("Sign In")</div>
Expand All @@ -181,6 +202,7 @@ <h4 class="mx_Header_subtitle">_t("Decentralised, encrypted chat &amp; collabora
<div class="mx_ButtonLabel">_t("Create Account")</div>
</a>
</div>

<!-- The comments below are meant to be used by Ansible as a quick way
to strip out the marked content when desired.
See https://github.com/vector-im/element-web/issues/8622.
Expand Down
14 changes: 11 additions & 3 deletions src/tchap/i18n/strings/tchap_translations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -959,9 +959,17 @@
"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, <br/>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, <br/>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"
},
"Your %(brand)s is misconfigured": {
"fr": "",
Expand Down
Loading