Skip to content

Commit 9526646

Browse files
errorassassinDonnieBLT
errorassassin
authored and
DonnieBLT
committed
minor fixes
1 parent 718b7b2 commit 9526646

File tree

2 files changed

+39
-35
lines changed

2 files changed

+39
-35
lines changed

‎website/templates/includes/header.html‎

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
{% load i18n %}
77
{% load custom_tags %}
88

9+
<style>
10+
a {
11+
color: black;
12+
}
13+
</style>
14+
915
<nav class="fixed top-0 z-50 w-full bg-white border-b border-[#F7F7F7] border-b-2">
1016
<div class="px-3 py-3 lg:px-5 lg:pl-3">
1117
<div class="flex items-center justify-between">
@@ -19,15 +25,15 @@
1925
<!-- Logo -->
2026
<a href="/newhome" class="flex flex-col ms-2 md:me-24 items-center">
2127
<img src="{% logo 'TRANSPARENT' %}" class="!max-w-[130px] lg:max-w-[200px]" />
22-
<p class="text-center inline-block text-xl pl-1">
28+
<p class="text-center inline-block text-xl pl-1 mb-0">
2329
{% trans 'Report Issues, Win Prizes' %}
2430
</p>
2531
</a>
2632
</div>
2733

2834
<!-- Search Bar -->
29-
<div class="column items-center gap-[8px] invisible lg:visible lg:flex w-0 h-0 lg:w-[auto] lg:h-[auto]">
30-
<form class="relative px-[34px]" action="/search" method="get">
35+
<div class="column items-center gap-[8px] w-0 overflow-clip lg:w-fit lg:flex w-0 h-0 lg:w-[auto] lg:h-[auto]">
36+
<form class="relative px-[34px] mb-0" action="/search" method="get">
3137
<i class="fa fa-search absolute left-[13px] top-[6.4px] text-[#9CA3AF] z-10"></i>
3238
<input type="text" name="query" placeholder="Search"
3339
class="text-base ps-9 scale-[1.4] placeholder-[#9CA3AF] bg-[#EDEDED] outline-none p-2.5 font-semibold rounded-lg">
@@ -43,38 +49,36 @@
4349
</div>
4450

4551
<!-- User Avatar -->
46-
{% if request.user.is_authenticated %}
47-
<li class="flex justify-center items-center ">
48-
<a href="/accounts/logout" id="user" class="relative flex items-center sm:gap-3 mr-[30px] hover:no-underline">
49-
{% if request.user.userprofile.avatar %}
50-
<img src="{{ request.user.userprofile.avatar }}" class="h-[30px] w-[30px] rounded-full ">
51-
{% elif request.user.socialaccount_set.all.0.get_avatar_url %}
52-
<img src="{{ request.user.socialaccount_set.all.0.get_avatar_url }}"
53-
class="h-[30px] w-[30px] rounded-full ">
54-
{% else %}
55-
{% gravatar request.user.email 30 '' 'gravatar rounded-full' %}
56-
{% endif %}
57-
<span
58-
class="absolute -right-[17px] -bottom-[25px] lg:-right-[25px] lg:-bottom-[25px] sm:static whitespace-nowrap text-[1.6rem] font-[600]"><span
52+
{% if request.user.is_authenticated %}
53+
<a href="/accounts/logout" id="user" class="relative flex row items-center gap-3 mr-[30px] hover:no-underline inline-block">
54+
{% if request.user.userprofile.avatar %}
55+
<img src="{{ request.user.userprofile.avatar }}" class="h-[30px] w-[30px] rounded-full ">
56+
{% elif request.user.socialaccount_set.all.0.get_avatar_url %}
57+
<img src="{{ request.user.socialaccount_set.all.0.get_avatar_url }}"
58+
class="h-[30px] w-[30px] rounded-full ">
59+
{% else %}
60+
{% gravatar request.user.email 30 '' 'gravatar rounded-full' %}
61+
{% endif %}
62+
<span
63+
class="text-[1.6rem] font-[600]"><span
5964
class="">{{ request.user.username }}</span> ({{ request.user|score|default:"0" }} Pts)
60-
</span>
61-
</a>
62-
</li>
63-
{% else %}
65+
</span>
66+
</a>
67+
{% else %}
6468

6569

66-
<!-- Sign up and Log in Buttons -->
67-
<div class="flex column items-center gap-[8px]">
68-
<a href="/accounts/signup"
69-
class="lg:!inline-block bg-red-500 hover:bg-red-600 h-[38px] py-[8px] px-[25px] whitespace-nowrap !text-2xl font-bold text-white leading-[21px] cursor-pointer hover:text-white hover:no-underline rounded-xl tracking-wide">
70-
{% trans "Signup" %}
71-
</a>
72-
<a href="/accounts/login"
73-
class="lg:!inline-block bg-red-500 hover:bg-red-600 h-[38px] py-[8px] px-[25px] whitespace-nowrap !text-2xl font-bold text-white leading-[21px] cursor-pointer hover:text-white hover:no-underline rounded-xl tracking-wide">
74-
{% trans "Login" %}
75-
</a>
76-
</div>
77-
{% endif %}
70+
<!-- Sign up and Log in Buttons -->
71+
<div class="flex column items-center gap-[8px]">
72+
<a href="/accounts/signup"
73+
class="lg:!inline-block bg-red-500 hover:bg-red-600 h-[38px] py-[8px] px-[25px] whitespace-nowrap !text-2xl font-bold text-white leading-[21px] cursor-pointer hover:text-white hover:no-underline rounded-xl tracking-wide">
74+
{% trans "Signup" %}
75+
</a>
76+
<a href="/accounts/login"
77+
class="lg:!inline-block bg-red-500 hover:bg-red-600 h-[38px] py-[8px] px-[25px] whitespace-nowrap !text-2xl font-bold text-white leading-[21px] cursor-pointer hover:text-white hover:no-underline rounded-xl tracking-wide">
78+
{% trans "Login" %}
79+
</a>
80+
</div>
81+
{% endif %}
7882

7983

8084
</div>

‎website/templates/includes/sidenav.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</style>
1515
<div class="h-full px-11 overflow-y-auto bg-white flex flex-col justify-between no-scrollbar">
1616
<div>
17-
<ul class="space-y-3 font-medium text-3xl mt-6">
17+
<ul class="space-y-3 font-medium text-3xl mt-6 mb-0">
1818
<li>
1919
<a href="/all_activity" class=""><span class="">Issues</span></a>
2020
</li>
@@ -38,7 +38,7 @@
3838
</li>
3939
</ul>
4040

41-
<ul class="space-y-3 font-medium text-3xl mt-8">
41+
<ul class="space-y-3 font-medium text-3xl mt-8 mb-0">
4242
<li class="mb-[-6px] ms-[1px]">
4343
<span class="font-bold text-[#AAA] text-[1.2rem] tracking-wide">EXPERIMENTAL</span>
4444
</li>
@@ -83,7 +83,7 @@
8383
<ul class="space-y-3 font-semibold text-3xl flex-end mb-[20px] mt-[30px]">
8484
<li class="opacity-90 transition hover:opacity-100">
8585
<a class="bg-gray-100 w-full inline-flex py-3 px-5 rounded-2xl items-center transition hover:bg-gray-200 focus:outline-none cursor-pointer hover:text-black">
86-
<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="w-9 h-9" viewBox="0 0 512 512">
86+
<svg xml ns="http://www.w3.org/2000/svg" fill="currentColor" class="w-9 h-9" viewBox="0 0 512 512">
8787
<path d="M99.617 8.057a50.191 50.191 0 00-38.815-6.713l230.932 230.933 74.846-74.846L99.617 8.057zM32.139 20.116c-6.441 8.563-10.148 19.077-10.148 30.199v411.358c0 11.123 3.708 21.636 10.148 30.199l235.877-235.877L32.139 20.116zM464.261 212.087l-67.266-37.637-81.544 81.544 81.548 81.548 67.273-37.64c16.117-9.03 25.738-25.442 25.738-43.908s-9.621-34.877-25.749-43.907zM291.733 279.711L60.815 510.629c3.786.891 7.639 1.371 11.492 1.371a50.275 50.275 0 0027.31-8.07l266.965-149.372-74.849-74.847z"></path>
8888
</svg>
8989
<span class="ml-4 flex items-start flex-col leading-none">

0 commit comments

Comments
 (0)