Skip to content

Commit 67402fe

Browse files
authored
Merge pull request #128 from djangocon/fix-youtube-layout
:nail_polish: Re-adds layout changes
2 parents 75de4f9 + a2b7768 commit 67402fe

File tree

3 files changed

+28
-19
lines changed

3 files changed

+28
-19
lines changed

src/_data/site.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"flickr": "https://flickr.com/photos/djangocon/albums/",
2626
"github": "https://github.com/djangocon/",
2727
"mastodon": "https://fosstodon.org/@djangocon",
28-
"twitter": "https://twitter.com/djangocon",
28+
"twitter": "https://x.com/djangocon",
29+
"x": "https://x.com/djangocon",
2930
"facebook": "https://www.facebook.com/djangoconus/",
3031
"instagram": "https://www.instagram.com/djangocon/"
3132
},

src/_includes/youtube-copy-and-paste.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
Follow {{ presenter.name }} 👇
77
{% if presenter.social.github %}On GitHub: https://github.com/{{ presenter.social.github }}
88
{% endif %}{% if presenter.social.mastodon %}On Mastodon: {{ presenter.social.mastodon }}
9-
{% endif %}{% if presenter.social.twitter %}On Twitter: https://twitter.com/{{ presenter.social.twitter }}
9+
{% endif %}{% if presenter.social.twitter %}On X: https://x.com/{{ presenter.social.twitter }}
1010
{% endif %}{% if presenter.social.website %}Website: {{ presenter.social.website }}
1111
{% endif %}
1212
{% endfor %}{% endif %}
1313

1414
Follow DjangoCon US 👇
1515
{{ site.social.mastodon }}
16-
{{ site.social.twitter }}
16+
{{ site.social.x }}
1717

1818
Follow DEFNA 👇
1919
https://www.defna.org/

src/youtube-talks.html

+24-16
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,44 @@
1010
permalink: /speaking/youtube/
1111
---
1212

13-
<script src="https://cdn.tailwindcss.com"></script>
14-
1513
<div class="pb-2 hero">
1614
<div class="wrapper">
1715
<h1 class="text-center pageheading">{{ title }}</h1>
1816
</div>
1917
</div>
2018

2119
<div class="pt-6 block-container">
22-
<div class="wrapper">
20+
<div class="wrapper grid grid-cols-1 gap-4">
2321

2422
{% for day in collections.sessionsByDateAndTime %}
2523
{% if forloop.index0 > 0 %}
2624
{% for slot in day[1] %}
2725
{% for session in slot.sessions %}
2826
{% if session.presenter_slugs %}
29-
<div class="event-byline mt-2 mb-2">
30-
<h4>{{ day[0] | formatDateTime: "LLL d " }}{{ slot.start | formatDateTime: "h:mm aaa" }} EDT - {{ session.title }}</h4>
31-
32-
<div>
33-
<a href="{{ post.video_url }}">On YouTube</a>
34-
</div>
35-
36-
<textarea rows="10" id="copy-{{ session.fileSlug }}">
37-
{% include "youtube-copy-and-paste.html", session:session %}
38-
</textarea>
27+
<div class="event-byline grid grid-cols-1 gap-2">
28+
<div class="flex items-center justify-between gap-2 mx-2">
29+
<h4 class="flex-grow mr-2">
30+
<span>{{ day[0] | formatDateTime: "LLL d " }}{{ slot.start | formatDateTime: "h:mm aaa" }} EDT -</span>
31+
<span id="copy-{{ session.title|slugify }}-title">{{ session.title }}</span>
32+
</h4>
33+
{% if post.video_url %}
34+
<div class="btn bg-blue-200 border-solid border-2 border-grey-800 rounded-lg px-2 py-1 whitespace-nowrap" >
35+
<a href="{{ post.video_url }}">View on YouTube</a>
36+
</div>
37+
{% endif %}
38+
<button class="btn bg-blue-200 border-solid border-2 border-grey-800 rounded-lg px-2 py-1 whitespace-nowrap" data-clipboard-action="copy" data-clipboard-target="#copy-{{ session.title|slugify }}-title">
39+
Copy to clipboard
40+
</button>
41+
</div>
3942

40-
<button class="btn bg-blue-200 border-solid border-2 border-grey-800 rounded-lg px-2 py-1" data-clipboard-action="copy" data-clipboard-target="#copy-{{ session.fileSlug }}">
41-
Copy to clipboard
42-
</button>
43+
<div class="relative">
44+
<textarea rows="10" id="copy-{{ session.title|slugify }}" class="w-full pr-32">
45+
{% include "youtube-copy-and-paste.html", session:session %}
46+
</textarea>
47+
<button class="btn bg-blue-200 border-solid border-2 border-grey-800 rounded-lg px-2 py-1 absolute top-2 right-2" data-clipboard-action="copy" data-clipboard-target="#copy-{{ session.title|slugify }}">
48+
Copy to clipboard
49+
</button>
50+
</div>
4351
</div>
4452
<hr>
4553
{% endif %}

0 commit comments

Comments
 (0)