Skip to content

Commit 79f3261

Browse files
committed
copilot suggestions and remove inline css
1 parent 6827661 commit 79f3261

File tree

7 files changed

+96
-65
lines changed

7 files changed

+96
-65
lines changed

app/eventyay/cfp/templates/cfp/event/user_profile.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
{% endcompress %}
1515
{% endblock cfp_header %}
1616

17-
1817
{% block content %}
1918
{% html_signal "eventyay.cfp.signals.html_above_profile_page" sender=request.event request=request %}
2019

app/eventyay/common/templates/common/base.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@
8181
{% endblocktranslate %}
8282
</div>
8383
{% endif %}
84-
<div class="container{% block container_width %}{% endblock container_width %}" id="main-container" style="margin-top: 3.8rem">
84+
<div class="container{% block container_width %}{% endblock container_width %}" id="main-container">
8585
<header>
8686
<h1 class="public-event-header">
8787
<div class="event-logo">
8888
<a href="{% block nav_link %}{% endblock nav_link %}">
8989
{% if request.event and request.event.logo %}
90-
<img loading="lazy" src="{{ request.event.logo.url }}" id="event-logo" alt="{% translate "The event’s logo" %}" style="border-radius: 10px;">
90+
<img loading="lazy" src="{{ request.event.logo.url }}" id="event-logo" alt="{% translate "The event’s logo" %}">
9191
{% endif %}
9292
</a>
9393
</div>

app/eventyay/presale/templates/pretixpresale/base.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
<title>{% block thetitle %}{% endblock %}</title>
1414
{% if css_file %}
1515
<link rel="stylesheet" type="text/css" href="{{ css_file }}" />
16+
{% compress css %}
17+
<link rel="stylesheet" type="text/css" href="{% static "pretixpresale/scss/custom.css" %}" />
18+
{% endcompress %}
1619
{% else %}
1720
{% compress css %}
1821
<link rel="stylesheet" type="text/x-scss" href="{% static "pretixpresale/scss/main.scss" %}"/>
@@ -59,7 +62,7 @@
5962
<img id="header-image" src="{{ MEDIA_PREFIX }}{{ event_logo }}" alt="{{ event.name }}" class="event-logo" />
6063
{% endif %}
6164
</div>
62-
<header {% if event_logo %} class="custom-header" {% endif %} style="margin-top: -3.8rem;">
65+
<header {% if event_logo %} class="custom-header" {% endif %} >
6366
{% block above %}
6467
{% endblock %}
6568
</header>

app/eventyay/presale/templates/pretixpresale/event/fragment_nav.html

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
{% load eventurl %}
44
{% load event_tags %}
55

6-
<nav style="margin-top: 10px; margin-bottom: 3rem; overflow: scroll;">
7-
<div class="navigation" style="font-size: 1.65rem; display: flex; gap: 2rem;">
8-
<a class="header-tab underline">
6+
<nav id='header-nav-bar'>
7+
<div class="navigation">
8+
<a href="#" class="header-tab underline">
99
<i class="fa fa-ticket"></i> {% translate "Tickets" %}
1010
</a>
1111

@@ -36,52 +36,11 @@
3636
{% endif %}
3737
{% endwith %}
3838

39-
<div class="video-link" >
39+
<div class="video-link">
4040
<a join-event-link class="header-tab join-event {% if request.path_info == '/onlinevideo' %}underline{% endif %}"
4141
href='{% eventurl request.event "presale:event.onlinevideo.join" %}'>
4242
<i class="fa fa-video-camera"></i> {% translate "Join online video" %}
4343
</a>
4444
</div>
4545
</div>
4646
</nav>
47-
48-
<style>
49-
.navigation a {
50-
cursor: pointer;
51-
position: relative;
52-
text-decoration: none;
53-
padding-bottom: 4px;
54-
}
55-
56-
.navigation a.underline::after {
57-
content: '';
58-
position: absolute;
59-
bottom: 0;
60-
left: -10px;
61-
width: calc(100% + 20px);
62-
height: 2px;
63-
background-color: currentColor;
64-
}
65-
66-
.navigation a:not(.underline):hover {
67-
border-bottom: 2px dotted currentColor;
68-
}
69-
70-
@media (min-width: 375px) {
71-
.video-link {
72-
margin-left: 0;
73-
}
74-
}
75-
76-
@media (min-width: 1000px) {
77-
.video-link {
78-
margin-left: 20rem;
79-
}
80-
}
81-
82-
@media (min-width: 1200px) {
83-
.video-link {
84-
margin-left: 40rem;
85-
}
86-
}
87-
</style>

app/eventyay/static/cfp/css/_layout.css

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ header {
3737

3838
#event-logo {
3939
max-height: 140px;
40+
border-radius: 10px;
4041
}
4142

4243
.header-wrapper {
@@ -136,6 +137,10 @@ header {
136137
}
137138
}
138139

140+
#join-event-link {
141+
margin-left: auto;
142+
}
143+
139144
.public-event-header {
140145
display: flex;
141146
margin-bottom: 14px;
@@ -184,6 +189,7 @@ footer {
184189
margin-right: auto;
185190
margin-left: auto;
186191
max-width: 1140px;
192+
margin-top: 3.8rem !important;
187193
}
188194

189195
.url-links {
@@ -217,46 +223,36 @@ footer {
217223
}
218224
}
219225

220-
.video-link {
221-
margin-left: 24rem;
222-
}
223-
224226
@media (max-width: 1200px) {
225227
.user-logs {
226228
display: none;
227229
}
228-
.video-link {
229-
margin-left: 20rem;
230-
}
231230
}
232231

233232
@media (max-width: 992px) {
234233
#main-container {
235234
max-width: 960px;
236-
}
237-
.video-link {
238-
margin-left: 10rem;
235+
margin-top: 3.8rem !important;
239236
}
240237
}
241238

242239
@media (max-width: 768px) {
243240
#main-container {
244241
max-width: 720px;
242+
margin-top: 3.8rem !important;
245243
header .header-wrapper {
246244
flex-direction: column-reverse;
247245
align-items: flex-start;
248246
}
249247
}
250-
.video-link {
251-
margin-left: 0rem;
252-
}
253248
}
254249

255250
@media (max-width: 576px) {
256251
#main-container {
257252
padding: 0;
258253
padding-top: 20px;
259254
width: 100%;
255+
margin-top: 3.8rem !important;
260256

261257
main {
262258
width: 100%;
@@ -267,6 +263,7 @@ footer {
267263
padding: 0;
268264
#event-logo {
269265
max-height: 120px;
266+
border-radius: 10px;
270267
}
271268
}
272269

@@ -338,7 +335,4 @@ footer {
338335
}
339336
}
340337
}
341-
.video-link {
342-
margin-left: 0;
343-
}
344338
}

app/eventyay/static/pretixpresale/scss/custom.css

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,44 @@
1717
height: 220px;
1818
align-items: flex-end;
1919
display: flex;
20+
margin-top: -3.8rem;
21+
}
22+
23+
.video-link {
24+
margin-left: auto;
25+
}
26+
27+
#header-nav-bar {
28+
margin-top: 10px;
29+
margin-bottom: 3rem;
30+
overflow: auto;
31+
32+
div {
33+
font-size: 1.65rem;
34+
display: flex;
35+
gap: 2rem;
36+
}
37+
38+
a {
39+
cursor: pointer;
40+
position: relative;
41+
text-decoration: none;
42+
padding-bottom: 4px;
43+
}
44+
45+
a.underline::after {
46+
content: '';
47+
position: absolute;
48+
bottom: 0;
49+
left: -10px;
50+
width: calc(100% + 20px);
51+
height: 2px;
52+
background-color: currentColor;
53+
}
54+
55+
a:not(.underline):hover {
56+
border-bottom: 2px dotted currentColor;
57+
}
2058
}
2159

2260
#schedule-nav {

app/eventyay/static/pretixpresale/scss/custom.scss

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,44 @@
1717
height: 220px;
1818
align-items: flex-end;
1919
display: flex;
20+
margin-top: -3.8rem;
21+
}
22+
23+
.video-link {
24+
margin-left: auto;
25+
}
26+
27+
#header-nav-bar {
28+
margin-top: 10px;
29+
margin-bottom: 3rem;
30+
overflow: auto;
31+
32+
div {
33+
font-size: 1.65rem;
34+
display: flex;
35+
gap: 2rem;
36+
}
37+
38+
a {
39+
cursor: pointer;
40+
position: relative;
41+
text-decoration: none;
42+
padding-bottom: 4px;
43+
}
44+
45+
a.underline::after {
46+
content: '';
47+
position: absolute;
48+
bottom: 0;
49+
left: -10px;
50+
width: calc(100% + 20px);
51+
height: 2px;
52+
background-color: currentColor;
53+
}
54+
55+
a:not(.underline):hover {
56+
border-bottom: 2px dotted currentColor;
57+
}
2058
}
2159

2260
#schedule-nav {

0 commit comments

Comments
 (0)