Skip to content

Commit e25529f

Browse files
ihalaij1ihalaij1
committed
Fix login page issues
1 parent c6b8e31 commit e25529f

7 files changed

Lines changed: 41 additions & 78 deletions

File tree

‎assets/css/main.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/main.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/sass/main.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ $gray-650: #5B636A;
155155
@import 'components/sidebar';
156156
@import 'components/table';
157157
@import 'pages/assessment';
158-
@import 'pages/login';
159158
@import 'pages/menu-items';
160159
@import 'pages/profile-page';
161160

‎assets/sass/pages/_login.scss‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎userprofile/static/userprofile/extra_logins.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
if (normal.length % 2 === 0) {
2626
const clearfix = document.createElement('div');
27-
clearfix.className = 'clearfix visible-sm-block';
27+
clearfix.className = 'clearfix d-block d-md-none';
2828
normal[normal.length - 1].after(clearfix);
2929
}
3030
}

‎userprofile/static/userprofile/login.css‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎userprofile/templates/userprofile/login.html‎

Lines changed: 38 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717
<h1>{% blocktranslate trimmed %}LOG_IN_TO -- {{ brand_name }}{% endblocktranslate %}</h1>
1818
</div>
1919

20-
<div id="login-box-row" class="row">
20+
<div id="login-box-row" class="row mb-3">
2121

2222
{% if shibboleth_login %}
23-
<section aria-labelledby="login-shibboleth-users" class="col-sm-6 col-md-4 login-box">
24-
<div class="login-section">
25-
{% if shibboleth_title_text %}
26-
<h2 id="login-shibboleth-users">
27-
{{ shibboleth_title_text|safe }}
28-
</h2>
29-
{% endif %}
30-
<div class="login-section-body">
23+
<section aria-labelledby="login-shibboleth-users" class="col-sm-12 col-md-6 col-lg-4 mb-3 login-box">
24+
<div class="card">
25+
<div class="card-body">
26+
{% if shibboleth_title_text %}
27+
<h2 class="card-title mt-0 mb-2" id="login-shibboleth-users">
28+
{{ shibboleth_title_text|safe }}
29+
</h2>
30+
{% endif %}
3131
{% if shibboleth_body_text %}
3232
<p>
3333
{{ shibboleth_body_text|safe }}
3434
</p>
3535
{% endif %}
36-
<p>
36+
<p class="mb-0">
3737
<a class="aplus-button--secondary aplus-button--lg" role="button"
3838
href="{% url 'shibboleth-login' %}?next={{ next|iriencode }}">
3939
{{ shibboleth_button_text|safe }}
@@ -44,20 +44,20 @@ <h2 id="login-shibboleth-users">
4444
</section>
4545

4646
{% if haka_login %}
47-
<section aria-labelledby="login-haka-users" class="col-sm-6 col-md-4 login-box">
48-
<div class="login-section">
49-
{% if haka_title_text %}
50-
<h2 id="login-haka-users">
51-
{{ haka_title_text|safe }}
52-
</h2>
53-
{% endif %}
54-
<div class="login-section-body">
47+
<section aria-labelledby="login-haka-users" class="col-sm-12 col-md-6 col-lg-4 mb-3 login-box">
48+
<div class="card">
49+
<div class="card-body">
50+
{% if haka_title_text %}
51+
<h2 class="card-title mt-0 mb-2" id="login-haka-users">
52+
{{ haka_title_text|safe }}
53+
</h2>
54+
{% endif %}
5555
{% if haka_body_text %}
5656
<p>
5757
{{ haka_body_text|safe }}
5858
</p>
5959
{% endif %}
60-
<p>
60+
<p class="mb-0">
6161
<a class="aplus-button--secondary aplus-button--lg" role="button"
6262
href="{% url 'haka-login' %}?target={% url 'shibboleth-login' %}">
6363
{{ haka_button_text|safe }}
@@ -66,49 +66,39 @@ <h2 id="login-haka-users">
6666
</div>
6767
</div>
6868
</section>
69-
70-
<div class="clearfix visible-sm-block"></div>
7169
{% endif %}
7270

7371
{% endif %}
7472

75-
7673
{% if mooc_login %}
77-
<section aria-labelledby="login-google-users" class="col-sm-6 col-md-4 login-box">
78-
<div class="login-section">
79-
{% if mooc_title_text %}
80-
<h2 id="login-google-users">
81-
{{ mooc_title_text|safe }}
82-
</h2>
83-
{% endif %}
84-
<div class="login-section-body">
74+
<section aria-labelledby="login-google-users" class="col-sm-12 col-md-6 col-lg-4 mb-3 login-box">
75+
<div class="card">
76+
<div class="card-body">
77+
{% if mooc_title_text %}
78+
<h2 class="card-title mt-0 mb-2" id="login-google-users">
79+
{{ mooc_title_text|safe }}
80+
</h2>
81+
{% endif %}
8582
{% if mooc_body_text %}
8683
<p>
8784
{{ mooc_body_text|safe }}
8885
</p>
8986
{% endif %}
90-
<p>
87+
<p class="mb-0">
9188
<a class="aplus-button--secondary aplus-button--lg" role="button"
9289
href="{% url 'social:begin' 'google-oauth2' %}?next={{ next|iriencode }}">{% translate "LOG_IN_USING_GOOGLE" %}</a>
9390
</p>
9491
</div>
9592
</div>
9693
</section>
97-
{% if shibboleth_login and haka_login %}
98-
<div class="clearfix visible-md-block visible-lg-block"></div>
99-
{% elif shibboleth_login and not haka_login %}
100-
<div class="clearfix visible-sm-block"></div>
101-
{% endif %}
102-
10394
{% endif %}
10495

105-
106-
<section aria-labelledby="login-local-users" class="col-sm-6 col-md-4 login-box extra-login">
107-
<div class="login-section">
108-
<h2 id="login-local-users">
109-
{% translate "LOCAL_USERS" %}
110-
</h2>
111-
<div class="login-section-body">
96+
<section aria-labelledby="login-local-users" class="col-sm-12 col-md-6 col-lg-4 mb-3 login-box extra-login">
97+
<div class="card">
98+
<div class="card-body">
99+
<h2 class="card-title mt-0 mb-2" id="login-local-users">
100+
{% translate "LOCAL_USERS" %}
101+
</h2>
112102
<p>
113103
{% blocktranslate trimmed %}
114104
LOCAL_USER_LOGIN_DESCRIPTION -- {{ brand_name }}
@@ -142,7 +132,7 @@ <h2 id="login-local-users">
142132
<span class="help-block">{{ error }}</span>
143133
{% endfor %}
144134
</div>
145-
<div class="form-group mt-2">
135+
<div class="form-group mt-3">
146136
<button type="submit"
147137
class="aplus-button--secondary aplus-button--lg">{% translate "LOG_IN" %}</button>
148138
</div>
@@ -151,13 +141,13 @@ <h2 id="login-local-users">
151141
</div>
152142
</section>
153143

154-
<div class="col-sm-1">
144+
<div class="col-sm-4">
155145
<button class="btn show-extra-login-btn"
156146
aria-label="{% translate 'SHOW_MORE_LOGIN_OPTIONS' %}"
157147
title="{% translate 'SHOW_MORE_LOGIN_OPTIONS' %}"
158148
>
159-
<i class="bi-caret-right-fill d-none d-sm-block" focusable="false"></i>
160-
<i class="bi-caret-down-fill d-block d-sm-none-inline" focusable="false"></i>
149+
<i class="bi bi-caret-right-fill d-none d-md-block" focusable="false"></i>
150+
<i class="bi bi-caret-down-fill d-block d-md-none" focusable="false"></i>
161151
</button>
162152
</div>
163153
</div>

0 commit comments

Comments
 (0)