Skip to content

feat: use latest Renku theme #38

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

Merged
leafty merged 10 commits into from
Jun 24, 2025
Merged

feat: use latest Renku theme #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fa8d7f3
wip: upgrade to keycloak 26
ciyer Apr 25, 2025
d77ceaa
feat: Update terms and condition text and styles in login form
andre-code Jun 3, 2025
db42a9c
Revert "wip: upgrade to keycloak 26"
rokroskar Jun 6, 2025
d03cfa7
Apply suggestions from code review
rokroskar Jun 6, 2025
c9e6d70
add icon to terms and conditions banner and fix styles
andre-code Jun 9, 2025
5eb0c36
Merge branch 'master' into andrea/term-conditions-banner
andre-code Jun 18, 2025
9f9bf7b
Remove kcSanitize in termsText
andre-code Jun 18, 2025
97daa55
quick fix
leafty Jun 24, 2025
4de0621
use original message
leafty Jun 24, 2025
d633f1e
Merge branch 'master' into leafty/fix-published-theme
leafty Jun 24, 2025
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
7 changes: 6 additions & 1 deletion renku_theme/login/login.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
${msg("loginAccountTitle")}
<div id="renku-login-terms-container">
<div id="renku-login-terms-text">
${kcSanitize(msg("termsText"))?no_esc}
<div id="renku-login-terms-icon">
<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>
</div>
<div>
${msg("termsText")?no_esc}
</div>
</div>
</div>
<#elseif section = "socialProviders" >
Expand Down
7 changes: 6 additions & 1 deletion renku_theme/login/register.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
${msg("registerTitle")}
<div id="renku-login-terms-container">
<div id="renku-login-terms-text">
${kcSanitize(msg("termsText"))?no_esc}
<div id="renku-login-terms-icon">
<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>
</div>
<div>
${msg("termsText")?no_esc}
</div>
</div>
</div>
<#elseif section = "form">
Expand Down
16 changes: 15 additions & 1 deletion renku_theme/login/resources/css/login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,18 @@ div#renku-login-terms-container {
}

div#renku-login-terms-text {
max-width: 400px;
max-width: 600px;
font-size: 16px;
background-color: rgb(209, 236, 241);
border-color: #a2dae3;
border-width: 1px;
border-radius: 5px;
color: rgb(9, 65, 74);
padding: 16px;
line-height: 24px;
column-gap: 20px;
display: flex;
text-align: justify;
}

@media only screen and (max-width: 1080px) {
Expand All @@ -388,4 +399,7 @@ div#renku-login-terms-text {
div#kc-social-providers ul a {
margin: 0;
}
div#renku-login-terms-icon {
display: none;
}
}
2 changes: 1 addition & 1 deletion renku_theme/login/terms.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<#elseif section = "form">
<div id="renku-terms-wrapper">
<div id="kc-terms-text">
${kcSanitize(msg("termsText"))?no_esc}
${msg("termsText")?no_esc}
</div>
<form class="form-actions" action="${url.loginAction}" method="POST">
<input class="${properties.kcButtonClass!} ${properties.kcButtonDefaultClass!} ${properties.kcButtonLargeClass!}" name="cancel" id="kc-decline" type="submit" value="${msg("doDecline")}"/>
Expand Down