Skip to content

Commit 15335d2

Browse files
leaftyciyerrokroskarandre-code
authored
feat: use latest Renku theme (#38)
* feat: Update terms and condition text and styles in login form --------- Co-authored-by: Chandrasekhar Ramakrishnan <ciyer@users.noreply.github.com> Co-authored-by: Rok Roškar <rok.roskar@sdsc.ethz.ch> Co-authored-by: Andrea Cordoba <43388408+andre-code@users.noreply.github.com>
1 parent 3435d78 commit 15335d2

4 files changed

Lines changed: 28 additions & 4 deletions

File tree

renku_theme/login/login.ftl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
${msg("loginAccountTitle")}
55
<div id="renku-login-terms-container">
66
<div id="renku-login-terms-text">
7-
${kcSanitize(msg("termsText"))?no_esc}
7+
<div id="renku-login-terms-icon">
8+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="32" height="32" fill="currentColor"><path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"></path><path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z"></path></svg>
9+
</div>
10+
<div>
11+
${msg("termsText")?no_esc}
12+
</div>
813
</div>
914
</div>
1015
<#elseif section = "socialProviders" >

renku_theme/login/register.ftl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
${msg("registerTitle")}
55
<div id="renku-login-terms-container">
66
<div id="renku-login-terms-text">
7-
${kcSanitize(msg("termsText"))?no_esc}
7+
<div id="renku-login-terms-icon">
8+
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="32" height="32" fill="currentColor"><path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z"></path><path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.808 1.319.545 0 1.178-.252 1.465-.598l.088-.416c-.2.176-.492.246-.686.246-.275 0-.375-.193-.304-.533L8.93 6.588zM9 4.5a1 1 0 1 1-2 0 1 1 0 0 1 2 0z"></path></svg>
9+
</div>
10+
<div>
11+
${msg("termsText")?no_esc}
12+
</div>
813
</div>
914
</div>
1015
<#elseif section = "form">

renku_theme/login/resources/css/login.css

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,18 @@ div#renku-login-terms-container {
365365
}
366366

367367
div#renku-login-terms-text {
368-
max-width: 400px;
368+
max-width: 600px;
369+
font-size: 16px;
370+
background-color: rgb(209, 236, 241);
371+
border-color: #a2dae3;
372+
border-width: 1px;
373+
border-radius: 5px;
374+
color: rgb(9, 65, 74);
375+
padding: 16px;
376+
line-height: 24px;
377+
column-gap: 20px;
378+
display: flex;
379+
text-align: justify;
369380
}
370381

371382
@media only screen and (max-width: 1080px) {
@@ -388,4 +399,7 @@ div#renku-login-terms-text {
388399
div#kc-social-providers ul a {
389400
margin: 0;
390401
}
402+
div#renku-login-terms-icon {
403+
display: none;
404+
}
391405
}

renku_theme/login/terms.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<#elseif section = "form">
66
<div id="renku-terms-wrapper">
77
<div id="kc-terms-text">
8-
${kcSanitize(msg("termsText"))?no_esc}
8+
${msg("termsText")?no_esc}
99
</div>
1010
<form class="form-actions" action="${url.loginAction}" method="POST">
1111
<input class="${properties.kcButtonClass!} ${properties.kcButtonDefaultClass!} ${properties.kcButtonLargeClass!}" name="cancel" id="kc-decline" type="submit" value="${msg("doDecline")}"/>

0 commit comments

Comments
 (0)