42CTF/website
42CTF
/
website
13
5
Fork 10
Code Issues 10 Pull Requests 1 Projects 9 Releases Wiki Activity

Merge branch 'home-refacto' into main

This commit is contained in:
Danhia 2022-01-30 21:43:20 +01:00
parent 52893b17d0 37525bb50a
commit 2495de137b
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/home/templates/home/home.html
View File

@ -62,7 +62,8 @@
{% if ctfs %} {% if ctfs %}
{% for ctf in ctfs %} {% for ctf in ctfs %}
<li class="list-group-item"> <li class="list-group-item">
<a href="{% url 'ctf' cat_slug=ctf.category.slug ctf_slug=ctf.slug %}">{{ ctf.name }}</a> - {{ctf.points}} {% trans "points" %} <a class="ctf-link" href="{% url 'ctf' cat_slug=ctf.category.slug ctf_slug=ctf.slug %}">{{ ctf.name }}</a>
<span style="position:absolute;right: 15px;">{{ctf.points}} {% trans "points" %}</span>
</li> </li>
{% endfor %} {% endfor %}
{% else %} {% else %}
@ -74,8 +75,11 @@
{% for f in latest_flags %} {% for f in latest_flags %}
{% ismember f.user.userprofileinfo as is_member %} {% ismember f.user.userprofileinfo as is_member %}
<li class="list-group-item text-truncate"> <li class="list-group-item text-truncate">
<a class="profile_link {{is_member}}" href="{% url 'accounts:profile' user_name=f.user.username %}"> <a class="ctf-link" href="{% url 'ctf' cat_slug=f.ctf.category.slug ctf_slug=f.ctf.slug %}"> {{f.ctf}}</a>
{{ f.user.username }}</a> - {{f.ctf}} <span style="position:absolute;right: 15px;">
<a class="profile_link {{is_member}}" href="{% url 'accounts:profile' user_name=f.user.username %}">{{ f.user.username }}</a>
</span>
</li>
{% endfor %} {% endfor %}
</ul> </ul>
<div class="row flex-nowrap"> <div class="row flex-nowrap">

17
src/statics/css/style.css
View File

@ -77,14 +77,7 @@ pre {
.table-dark thead th { .table-dark thead th {
border: none; border: none;
} }
.list-group a {
text-decoration: none;
/* color: #4375aa; */
}
.list-group a:hover {
text-decoration: none;
color: #fff;
}
.ctf-block { .ctf-block {
background-color: #1d1d1d; background-color: #1d1d1d;
min-height: 235px; min-height: 235px;
@ -373,3 +366,11 @@ footer {
.middle-sm { order: 2; } .middle-sm { order: 2; }
.bottom-sm { order: 3 } .bottom-sm { order: 3 }
} }
.ctf-link {
color: #fff;
}
.ctf-link:hover {
color: #a9a9a9;
text-decoration: none;
}