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

[TASK-1058] Fix registration links #5089 #5090

Open
wants to merge 5 commits into
base: beta
Choose a base branch
from
+55 −33
Open

[TASK-1058] Fix registration links #5089 #5090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3b91b2
Moving legal links out of base template
tinok Aug 30, 2024
40f28d7
Adding legal links to signup template
tinok Aug 30, 2024
1b172e8
Update login template to include legal links
tinok Aug 30, 2024
4a9517a
fix spacing
pauloamorimbr Sep 24, 2024
f698626
fix font size
pauloamorimbr Sep 26, 2024
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
49 changes: 30 additions & 19 deletions jsapp/scss/stylesheets/partials/_registration.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,36 +331,47 @@ form.registration--login > p > span.helptext{
}

.registration__create-or-forgot {
margin: 20px 0;
margin: 20px 0 0;
display: flex;
flex-direction: row;
justify-content: space-between;
flex-wrap: wrap;
gap: 10px;
}

.registration__legal {
width: 100%;
display: flex;
flex-direction: row;
justify-content: center;
flex-wrap: wrap;
gap: 20px;
}

.registration__legal::before {
content: '';
display: block;
width: 100%;
margin-top: 20px;
border-top: 1px solid colors.$kobo-light-storm;
opacity: 0.4;
}

.registration__legal a {
text-decoration: none !important;
font-size: 14px;
opacity: 0.75;
}

.registration__legal a:hover {
text-decoration: underline !important;
opacity: 1;
}

.registration__footer {
clear: both;
text-align: center;
margin: 20px 10px 10px 10px;
text-shadow: colors.$kobo-gray-900 0 0 2px; // contrast against photo background

a {
color: colors.$kobo-white;

&:hover {
color: colors.$kobo-light-storm;
}
}

.registration__legal {
margin: 0 20px;
display: flex;
flex-direction: row;
justify-content: center;
flex-wrap: wrap;
gap: 20px;
}
}

.error-message {
Expand Down
13 changes: 12 additions & 1 deletion kobo/apps/accounts/templates/account/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,17 @@ <h2>{% trans "Log in using SSO" %}</h2>
</div>
<script src="{% static 'js/sso_buttons.js' %}"></script>
{% endif %}

<div class="registration__legal">
{% if config.TERMS_OF_SERVICE_URL %}
<a href="{{config.TERMS_OF_SERVICE_URL}}" target="_blank">
{% trans "Terms of Service" %}
</a>
{% endif %}
{% if config.PRIVACY_POLICY_URL %}
<a href="{{config.PRIVACY_POLICY_URL}}" target="_blank">
{% trans "Privacy Policy" %}
</a>
{% endif %}
</div>
</form>
{% endblock %}
13 changes: 13 additions & 0 deletions kobo/apps/accounts/templates/account/signup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,18 @@ <h2>{% trans "Register using SSO" %}</h2>
{% endif %}
</div>
<div style="clear:both;"></div>
<div class="registration__legal">
{% if config.TERMS_OF_SERVICE_URL %}
<a href="{{config.TERMS_OF_SERVICE_URL}}" target="_blank">
{% trans "Terms of Service" %}
</a>
{% endif %}
{% if config.PRIVACY_POLICY_URL %}
<a href="{{config.PRIVACY_POLICY_URL}}" target="_blank">
{% trans "Privacy Policy" %}
</a>
{% endif %}
</div>
</div>
</form>
{% endblock %}
13 changes: 0 additions & 13 deletions kpi/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,6 @@
{% endif %}

<div class="registration__footer">
<div class="registration__legal">
{% if config.TERMS_OF_SERVICE_URL %}
<a href="{{config.TERMS_OF_SERVICE_URL}}" target="_blank">
{% trans "Terms of Service" %}
</a>
{% endif %}
{% if config.PRIVACY_POLICY_URL %}
<a href="{{config.PRIVACY_POLICY_URL}}" target="_blank">
{% trans "Privacy Policy" %}
</a>
{% endif %}
</div>

{% block background_credit %}
{{ block.super }}
{% endblock %}
Expand Down
Loading