Skip to content

Commit f44ace0

Browse files
igennovaigennova
authored
Merge branch 'main' into contributors
2 parents 6b975a8 + 0173112 commit f44ace0

File tree

3 files changed

+28
-25
lines changed

3 files changed

+28
-25
lines changed

‎website/templates/domain.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,14 @@
206206
<div class="flex items-center justify-center gap-4 mt-6">
207207
{% if opened.has_previous %}
208208
<a href="?open={{ opened.previous_page_number }}"
209-
class="px-4 py-2 text-white bg-red-500 rounded-lg hover:bg-red-600 transition duration-200">
209+
class="px-4 py-2 text-white hover:text-white bg-red-500 rounded-lg hover:bg-red-600 transition duration-200">
210210
Previous
211211
</a>
212212
{% endif %}
213213
<span class="text-gray-700 font-medium">Page {{ opened.number }} of {{ opened.paginator.num_pages }}</span>
214214
{% if opened.has_next %}
215215
<a href="?open={{ opened.next_page_number }}"
216-
class="px-4 py-2 text-white bg-red-500 rounded-lg hover:bg-red-600 transition duration-200">
216+
class="px-4 py-2 text-white hover:text-white bg-red-500 rounded-lg hover:bg-red-600 transition duration-200">
217217
Next
218218
</a>
219219
{% endif %}

‎website/templates/includes/_new_activity.html

+13-10
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
{% load gravatar %}
33
<div class="bg-gray-100 rounded-lg p-4">
44
<div class="w-full flex flex-col gap-3 ">
5-
<div class=" rounded-lg w-full">
5+
<div class=" rounded-lg w-full border-2 hover:border-red-500 transition-all duration-200">
66
{% for screenshot_activity,screenshot in activity_screenshots.items %}
77
{% if activity == screenshot_activity %}
88
<a href="{{ activity.get_absolute_url }}">
99
<img src="{{ screenshot.image.url }}"
1010
loading="lazy"
11-
class="w-full rounded-lg object-cover"
11+
class="w-full rounded-lg object-cover lg:max-h-[300px] h-full "
1212
alt="screenshot"
1313
width="50%"
1414
height="50%">
@@ -19,14 +19,15 @@
1919
<a href="{{ activity.get_absolute_url }}">
2020
<img src="{{ activity.screenshot.url }}"
2121
loading="lazy"
22-
class="w-full rounded-lg object-cover"
22+
class="w-full rounded-lg object-cover lg:max-h-[300px] h-full "
2323
alt="screenshot"
2424
width="50%"
2525
height="50%">
2626
</a>
2727
{% endif %}
2828
</div>
29-
<a href="{{ activity.get_absolute_url }}" class="text-xl font-medium">
29+
<a href="{{ activity.get_absolute_url }}"
30+
class="text-xl font-semibold hover:text-red-500">
3031
<div class="mb-3 text-xl">{{ activity.description|truncatechars:20 }}</div>
3132
</a>
3233
<div class="flex items-start gap-1">
@@ -61,17 +62,19 @@
6162
alt="user avatar">
6263
{% endif %}
6364
</a>
64-
<div class="w-full">
65+
<div class="w-full flex flex-col gap-2">
6566
<div class="mb-2 text-lg">
66-
<a href="{{ activity.user.get_absolute_url }}">{{ activity.user|default:"Anonymous" }}</a>
67-
found a bug on <a href="{% url 'domain' slug=activity.domain_name %}">{{ activity.domain_title }}</a> - {{ activity.created|timesince }}
68-
ago
67+
<a href="{{ activity.user.get_absolute_url }}"
68+
class="hover:text-red-500">@{{ activity.user|default:"Anonymous" }}</a>
69+
found a bug on <a href="{% url 'domain' slug=activity.domain_name %}"
70+
class="hover:text-red-500">{{ activity.domain_title }}</a>
6971
</div>
70-
<a class="text-lg"
72+
<p class="text-sm text-gray-600">{{ activity.created|timesince }} ago.</p>
73+
<a class=" font-medium hover:text-red-500"
7174
href="{{ activity.url }}"
7275
target="_blank"
7376
rel="noopener noreferrer">
74-
<div>{{ activity.url|truncatechars:30 }}</div>
77+
<div>URL: {{ activity.url|truncatechars:30 }}</div>
7578
</a>
7679
<a class="whitespace-nowrap mb-1 text-xl"
7780
href="{{ activity.get_absolute_url }}#comments">

‎website/templates/profile.html

+13-13
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626
{% include "includes/sidenav.html" %}
2727
<div class="flex md:flex-row flex-col w-full mt-10 lg:max-w-[1700px] lg:mx-auto mx-2 border rounded-lg min-h-[500px]">
2828
<div class="flex flex-col gap-6 lg:w-[25%] w-full border-r border-gray-300/80 500 p-4">
29-
<div class="w-full rounded-lg select-none">
29+
<div class="w-full rounded-lg select-none ">
3030
{% if user.userprofile.avatar %}
3131
<img src="{{ user.userprofile.avatar }}"
32-
class="object-cover w-full h-full rounded-lg"
32+
class="object-cover w-full rounded-lg max-h-[400px] md:max-h-[500px] h-full"
3333
alt="avatar"
3434
width="200"
3535
height="200">
3636
{% else %}
3737
<img src="{% gravatar_url user.email 200 %}"
38-
class="object-cover w-full h-full rounded-lg"
38+
class="object-cover w-full rounded-lg max-h-[400px] md:max-h-[500px] h-full"
3939
alt="avatar"
4040
width="200"
4141
height="200">
@@ -244,16 +244,16 @@ <h1 class="font-bold text-black/90 mb-3">{% trans "Recent Activity" %}</h1>
244244
{% if activities %}
245245
{% load gravatar %}
246246
{% load static %}
247-
<div class=" flex flex-col gap-3 items-center justify-center">
247+
<div class=" flex flex-col gap-3 items-center justify-center w-full">
248248
{% for activity in activities %}
249-
<div class=" bg-gray-100 rounded-lg flex flex-col gap-3 items-start justify-between p-5 ">
250-
<div class="rounded-lg w-full hover:shadow-[0_0_10px_rgba(75,85,99,0.5)] transition-all duration-200">
249+
<div class=" bg-gray-100 rounded-lg flex flex-col gap-3 items-start justify-between p-5 w-full">
250+
<div class="rounded-lg w-full border-2 hover:border-red-500 transition-all duration-200 ">
251251
{% for screenshot_activity,screenshot in activity_screenshots.items %}
252-
{% if activity == screenshot_activity and screenshot.image.url %}
252+
{% if activity == screenshot_activity and screenshot.image and screenshot.image.url %}
253253
<a href="{{ activity.get_absolute_url }}">
254-
<img src="https://www.{{ activity.domain_name }}/favicon.ico"
254+
<img src="{{ screenshot.image.url }}"
255255
loading="lazy"
256-
class="rounded-lg w-full object-cover h-[200px]"
256+
class="rounded-lg w-full object-cover lg:max-h-[300px] h-full "
257257
alt="screenshot"
258258
width="50%"
259259
height="50%">
@@ -264,7 +264,7 @@ <h1 class="font-bold text-black/90 mb-3">{% trans "Recent Activity" %}</h1>
264264
<a href="{{ activity.get_absolute_url }}">
265265
<img src="{{ activity.screenshot.url }}"
266266
loading="lazy"
267-
class="rounded-lg w-full object-cover h-[200px]"
267+
class="rounded-lg w-full object-cover lg:max-h-[300px] h-full"
268268
alt="screenshot"
269269
width="50%"
270270
height="50%">
@@ -280,7 +280,7 @@ <h1 class="font-bold text-black/90 mb-3">{% trans "Recent Activity" %}</h1>
280280
<img src="https://www.{{ activity.domain_name }}/favicon.ico"
281281
height="30"
282282
width="30"
283-
class=" border border-gray-300 rounded-full size-[32px] "
283+
class=" rounded-full size-[32px] "
284284
alt="Organization logo"
285285
onerror="this.onerror=null; this.src='{% static 'images/dummy-user.png' %}';">
286286
</a>
@@ -290,9 +290,9 @@ <h1 class="font-bold text-black/90 mb-3">{% trans "Recent Activity" %}</h1>
290290
class="hover:text-red-600">{{ activity.domain_title }}</a>
291291
</div>
292292
</div>
293-
<p class="text-gray-600 text-start w-full">Time: {{ activity.created|timesince }} ago.</p>
293+
<p class="text-gray-600 text-sm text-start w-full">{{ activity.created|timesince }} ago.</p>
294294
<div class="flex flex-row gap-2 items-center">
295-
Org:
295+
URL:
296296
<a class="hover:text-red-600"
297297
href="{{ activity.url }}"
298298
target="_blank"

0 commit comments

Comments
 (0)