Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: flamecon 6 #60

Merged
merged 1 commit into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@ GEM
eventmachine (1.2.7)
ffi (1.15.5)
forwardable-extended (2.6.0)
google-protobuf (3.23.4-arm64-darwin)
google-protobuf (3.23.4-x86_64-darwin)
google-protobuf (3.23.4-x86_64-linux)
http_parser.rb (0.8.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (4.3.2)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand Down Expand Up @@ -58,22 +59,23 @@ GEM
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (5.0.3)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rouge (4.1.2)
rouge (3.30.0)
safe_yaml (1.0.5)
sass-embedded (1.64.1-x86_64-darwin)
google-protobuf (~> 3.23)
sass-embedded (1.64.1-x86_64-linux-gnu)
google-protobuf (~> 3.23)
sass-embedded (1.58.3)
google-protobuf (~> 3.21)
rake (>= 10.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.4.2)
webrick (1.8.1)

PLATFORMS
arm64-darwin-23
x86_64-darwin-23
x86_64-linux

Expand Down
6 changes: 3 additions & 3 deletions _includes/callout.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="main-border w-full">
<div class="main-border-inner p-4">
<p class="text-center">
Our <a href="https://itch.io/jam/flame-jam-3">Flame Game Jam 3.0</a> is happening on 8-10th of December on
itch.io! You
do not want to miss it!
Flamecon is back!!
Join un on Febrary 26th to talk about 3D, flame_riverpod, games & more!
Live on <a href="https://www.youtube.com/watch?v=Mznf-FnDzfM" target="_blank">YouTube</a>
</p>
</div>
</div>
4 changes: 1 addition & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@

<div class="flex flex-col items-stretch text-white pt-4 md:pt-6 lg:pt-4 space-y-16 md:space-y-24 lg:space-y-32">
<div class="hero flex flex-col items-center space-y-8 py-16 md:py-18 lg:py-28">
{% comment %}
Uncomment this to add a callout to the top of the page

{% include callout.html %}
{% endcomment %}

<div class="flame-demo h-28 md:h-40"></div>

Expand Down
5 changes: 5 additions & 0 deletions pages/flamecon.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
permalink: /flamecon
redirect_to:
- https://www.youtube.com/watch?v=Mznf-FnDzfM
---
Loading