Skip to content

fixed the global and monthly leaderboard alignment issues #1656

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
DonnieBLT merged 3 commits into from
Jan 6, 2024
Merged

fixed the global and monthly leaderboard alignment issues #1656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86653ec
fixed the global and monthly leaderboard alignment issues
Deus1704 Dec 20, 2023
62ccfc5
Merge branch 'main' into main
Deus1704 Jan 4, 2024
8c0f266
Merge branch 'main' into main
DonnieBLT Jan 6, 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
6 changes: 3 additions & 3 deletions website/templates/leaderboard_eachmonth.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<h1 class="page-header">Monthly Leaderboard</h1>
</div>
</div>
<div class="row">
<div class="row" style="display: flex;justify-content: center; align-items: center;">
<div class="col-lg-9">
<div class="list-group">
{%if not leaderboard%}
Expand All @@ -67,9 +67,9 @@ <h1 class="page-header">Monthly Leaderboard</h1>
{% if month.user.userprofile.avatar %}
<img src="{{ month.user.userprofile.avatar }}" class="img-responsive img-thumbnail profileimage">
{% elif user.socialaccount_set.all.0.get_avatar_url %}
<img src="{{ month.user.socialaccount_set.all.0.get_avatar_url }}" class="profileimage">
<img src="{{ month.user.socialaccount_set.all.0.get_avatar_url }}" class="img-responsive img-thumbnail profileimage">
{% else %}
<img src="{% gravatar_url month.user.email 50 %}" class="profileimage">
<img src="{% gravatar_url month.user.email 50 %}" class="img-responsive img-thumbnail profileimage">
{% endif %}
<a href="/profile/{{ month.user.username }}">{{ month.user.username }}</a>
<span class="pull-right badge">{{ month.user.total_score }} Points</span>
Expand Down
20 changes: 15 additions & 5 deletions website/templates/leaderboard_global.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@
margin-left: 10px;
}

@media (min-height: 800px) and (min-width: 992px) {
.col-md-8 {
width: 66.66666667%;
}}
@media (min-height: 800px) and (min-width: 360px) {
.col-md-8 {
width: 90%;
font-size: small;
}}

.silver {
background-color: lightblue;
color: #333;
Expand Down Expand Up @@ -48,13 +58,13 @@
{% endblock %}

{% block content %}
<div class="row container-min-height">
<div class="row container-min-height" style="display:flex;justify-content:center">
<div class="col-lg-6" style="display: flex; justify-content: center; align-items: center;">
<h1 class="page-header">Global Leaderboard</h1>
</div>
</div>
<div class="row">
<div class="col-lg-9">
<div class="row" style="display:flex;justify-content:center">
<div class="col-md-8">
<div class="list-group">
{%if not leaderboard%}
<p style="color: red;">No data for this month</p>
Expand All @@ -64,9 +74,9 @@ <h1 class="page-header">Global Leaderboard</h1>
{% if leader.userprofile.avatar %}
<img src="{{ leader.userprofile.avatar }}" class="img-responsive img-thumbnail profileimage">
{% elif leader.socialaccount_set.all.0.get_avatar_url %}
<img src="{{ leader.socialaccount_set.all.0.get_avatar_url }}" class="profileimage">
<img src="{{ leader.socialaccount_set.all.0.get_avatar_url }}" class="img-responsive img-thumbnail profileimage">
{% else %}
<img src="{% gravatar_url leader.email 50 %}" class="profileimage">
<img src="{% gravatar_url leader.email 50 %}" class="img-responsive img-thumbnail profileimage">
{% endif %}
<a href="/profile/{{ leader.username }}">{{ leader.username }}</a>
<span class="pull-right badge">{{ leader.total_score }} Points</span>
Expand Down