Skip to content

Commit

Permalink
Merge pull request #10 from Nerban/contentupdate
Browse files Browse the repository at this point in the history 
Contentupdate
  • Loading branch information
@Nerban
Nerban authored Jan 1, 2024
2 parents 75d7ede + 48d5e35 commit 70af353
Show file tree
Hide file tree
Showing 16 changed files with 795 additions and 283 deletions.
10 changes: 6 additions & 4 deletions dist/theme/moon.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ section.has-light-background, section.has-light-background h1, section.has-light
--r-main-font: Lato, sans-serif;
--r-main-font-size: 40px;
--r-main-color: #93a1a1;
--r-block-margin: 20px;
--r-block-margin: 0px;
--r-heading-margin: 0 0 20px 0;
--r-heading-font: League Gothic, Impact, sans-serif;
--r-heading-color: #eee8d5;
Expand Down Expand Up @@ -132,11 +132,13 @@ section.has-light-background, section.has-light-background h1, section.has-light
}

/* Ensure certain elements are never larger than the slide itself */
.reveal img,
.reveal img{
max-width: 100%;
}
.reveal video,
.reveal iframe {
max-width: 95%;
max-height: 95%;
max-width: 95%;
max-height: 95%;
}

.reveal strong,
Expand Down
730 changes: 488 additions & 242 deletions src/_data/packs.json
View file

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions src/_includes/revealEvents.njk
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<script>
Reveal.addEventListener( 'fragmentshown', function( event ) {
//Artimages
if(event.fragment.parentNode.id.includes("art")){
buildFancyArt(event.fragment.parentNode.id, event.fragment.parentNode.getAttribute("srcy"))
Expand Down
37 changes: 29 additions & 8 deletions src/_includes/slides/commons.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,39 @@
<h4>{{pack.commons.head}}</h4>
<div class="my-5">
<hr class="mx-5">
<div class="w-full grid grid-cols-4 px-24 grid-rows-2">
<div class="w-full grid grid-cols-4 mt-5 px-24 gap-4 grid-rows-2">

{%for card in pack.commons.cards%}
<div class="grid place-items-center r-stack shiny">
<img data-fragment-index="{{loop.index + 1}}" class="fragment fade-out shadow-xl opacity-100 rounded-xl" data-src="images/card_back.jpg">
<div id ="{{key + "-com" + "_" + loop.index}}" scry="{{card.id}}" class="fragment fade-down " data-fragment-index="{{loop.index + 1}}">
<div class="FlipButton bg-gray-900 cursor-pointer drop-shadow-sm hover:text-blue-200 text-white text-md rounded-lg rounded-tr-3xl z-10 font-bold px-3 bg-opacity-50 absolute bottom-4 left-0"
onclick="toggleImg('{{ key + '-com' + '_' + loop.index }}')" >&#10227;</div>
<a class="grid place-items-center p-0 r-stack" target="_blank" href="#">
<img data-fragment-index="{{loop.index + 1}}" class="fragment fade-out shadow-xl aspect-card opacity-100 rounded-xl" data-src="images/card_back.jpg">
<div
id ="{{key + "-com" + "_" + loop.index}}"
scry="{{card.id}}"
class="fragment fade-down aspect-card" data-fragment-index="{{loop.index + 1}}">

<div class="FlipButton
bg-gray-900 cursor-pointer drop-shadow-sm
hover:text-blue-200 text-white text-md rounded-lg
rounded-tr-3xl z-10 font-bold px-3 bg-opacity-50 absolute bottom-4 left-0"
onclick="toggleImg('{{ key + '-com' + '_' + loop.index }}')" >&#10227;
</div>

{%if card.new %}
<div
class="newBadge drop-shadow-lg animate-bounce absolute font-serif font-semibold z-20
text-xs p-1 bg-gray-800/0 text-white rounded-md -top-1 -left-2
">
<span class="absolute z-10 grayscale animate-ping">&#10024;</span>
<span class="absolute z-20 drop-shadow-sm grayscale">&#10024;</span>

</div>
{% endif %}

<a class="grid place-items-center aspect-card r-stack" target="_blank" href="#">
<div class="
{% if card.foil%}foil-image {% endif %} p-0 w-full grid place-items-center h-full rounded-3xl">
<img class="card-image shadow-md w-full opacity-100 rounded-xl" data-src onerror="populateFoilCard('{{key + '-com' + '_' + loop.index}}')">
{% if card.foil%}foil-image {% endif %}
aspect-card w-full grid place-items-center rounded-xl">
<img class="card-image aspect-card shadow-md w-full opacity-100 rounded-xl" data-src onerror="populateFoilCard('{{key + '-com' + '_' + loop.index}}')">
</div>
</a>

Expand Down
17 changes: 15 additions & 2 deletions src/_includes/slides/focus.njk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,25 @@
<hr class="mx-5">

<div class="r-stack my-5">
<img data-fragment-index="1" class="fragment fade-out w-1/3 shadow-xl opacity-100 rounded-3xl"data-src="images/card_back.jpg">
<img
data-fragment-index="1"
class="fragment fade-out w-1/3 shadow-xl opacity-100 rounded-3xl"
data-src="images/card_back.jpg">

<div data-fragment-index="1" class="fragment fade-down m-auto">
<div class="FlipButton w-1/3 cursor-pointer drop-shadow-sm hover:text-blue-200 text-white text-md rounded-full z-10 font-bold px-2 absolute top-0 right-0" >
<h2 onclick="toggleImg('{{key + '-foc' + '_' + loop.index}}')">&#10227;</h2>
</div>
</div>
{%if card.card.new %}
<div
class="newBadge drop-shadow-lg animate-bounce absolute font-serif font-semibold z-20
p-1 bg-gray-800/0 text-white rounded-md -top-6 left-40
">
<span class="absolute z-10 grayscale animate-ping">&#10024;</span>
<span class="absolute z-20 drop-shadow-sm grayscale">&#10024;</span>

</div>
{% endif %}

<a class=" mx-auto grid place-items-center r-stack" target="_blank" href="#">
<div class=" {% if card.card.foil%}foil-image {% endif %} h-max w-1/2 aspect-[63/88] grid place-items-center rounded-3xl">
Expand Down
32 changes: 29 additions & 3 deletions src/_includes/slides/start.njk
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<!-- start page -->
<section data-background-image="images/theme.jpg" data-transition="zoom" data-background-opacity="0.5">
<section >
<h1 class="r-fit-text">Adventskalender</h1>
<hr class="mx-5">
<br>
<div class="w-full bg-opacity-25 rounded-md p-5 bg-gray-900 grid grid-cols-8 grid-rows-3 gap-5">

{% for key,value in packs %}
{%if loop.index <= 24%}
<a href="#{{key}}">
<div class="font-semi-bold hover:outline outline-2 outline-offset-4 bg-cover bg-center bg-blue-300 outline-yellow-500 shadow-blue-900 aspect-square
{% if loop.index < packs|length %}
{% if loop.index <= packs|length %}
hover:bg-[url({{ '../images/art/art'+key+'.png' | url }})]
hover:text-transparent
{% else %}
Expand All @@ -19,8 +21,7 @@
<div class="group-hover:drop-shadow-lg shadow-black font-semibold drop-shadow-md">{{key}}</div>
</div>
</a>
{%else%}
keine Daten
{%endif%}
{% endfor %}
{% for i in range(packs|length ,24) %}
<a href="#"><div class="font-semi-bold hover:outline outline-2 outline-offset-4 bg-cover bg-center bg-blue-200 hover:text-yellow-500 outline-yellow-500 shadow-blue-900 aspect-square hover:bg-[url({{ '../images/theme.jpg' | url }})] grid place-content-center rounded-md">
Expand All @@ -29,3 +30,28 @@
{% endfor %}
</div>
</section>
<section>

<div class="w-full aspect-video bg-gray-800/50 flex rounded-md flex-col h-1/4">
<span class=" text-yellow-100 mt-10 text-8xl font-mono uppercase">Silvester Packs</span>
<hr class="mx-5 mt-10">
<div class="w-10/12 mx-auto gap-10 flex-wrap my-auto place-content-center flex justify-center p-5">

{%for pack in range(1,7)%}
<a href="#{{loop.index + 24}}" class="w-1/4">
<div class=" w-full aspect-square shrink bg-radial-gradient-blue hover:bg-radial-gradient-yellow rounded-full">
<svg version="1.1" xmlns="http://www.w3.org/2000/svg"
class="fill-yellow-700 stroke-[.5] hover:fill-yellow-600 stroke-yellow-900
hover:scale-110 duration-100 hover:drop-shadow-lg"
viewBox="0 0 32 32">
{% include "svg/mom.njk" %}
</svg>
</div>
</a>
{%endfor%}

</div>

</div>
</section>
</section>
3 changes: 3 additions & 0 deletions src/_includes/svg/mom.njk
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<!-- Generated by IcoMoon.io -->
<path d="M19.571 23.762c0.952 0.642 1.882 1.314 2.833 1.96-2.593 1.674-5.808 2.414-8.853 1.808 0.019-1.045 0.012-2.092-0.074-3.134 2.025 0.525 4.217 0.291 6.094-0.634zM15.737 14.524c0.786 0 1.423 0.637 1.423 1.423s-0.637 1.423-1.423 1.423c-0.786 0-1.423-0.637-1.423-1.423s0.637-1.423 1.423-1.423zM13.494 11.632c-0.575 0.243-1.154 0.479-1.734 0.711 0.196 0.286 0.389 0.572 0.582 0.859 0.092-0.054 0.125-0.070 0.2-0.108 0.265-0.135 0.441-0.207 0.74-0.211 0.774 0 1.401 0.627 1.401 1.401s-0.627 1.401-1.401 1.401c-0.774 0-1.401-0.627-1.401-1.401 0.009-0.188 0.028-0.38 0.119-0.548-0.666-0.172-0.331-0.086-1.005-0.257-0.052 0.63-0.079 1.259-0.079 1.889 1.712 1.126 3.272 2.526 5.247 3.184 3.163 2.135 6.261 4.365 9.4 6.537 0.673 0.439 1.281 1.045 2.099 1.197 1.448 0.343 2.898 0.682 4.338 1.061-0.818-1.271-1.684-2.509-2.509-3.776-0.363-0.599-0.99-0.94-1.546-1.331-2.812-1.96-5.617-3.928-8.429-5.889-0.553-0.391-1.154-0.739-1.605-1.257-1.181-1.488-2.941-2.316-4.417-3.463zM10.165 22.68c-0.363 0.549-0.737 1.088-1.128 1.615-0.165-0.107-0.489-0.324-0.651-0.434-0.1 0.365-0.198 0.732-0.296 1.1 0.942 0.77 1.999 1.381 3.093 1.908-0.024-1.159-0.021-2.318-0.041-3.477-0.327-0.236-0.653-0.472-0.978-0.711zM7.205 17.912c-0.761 0.971-1.488 1.968-2.237 2.948 0.377 0.687 0.761 1.369 1.188 2.027 0.16-0.785 0.332-1.569 0.544-2.342 0.508 0.272 1.016 0.551 1.557 0.751 0.072-0.081 0.219-0.243 0.291-0.324-0.584-0.956-1.080-1.965-1.343-3.060zM26.867 12.066c-0.446 0.539-0.894 1.073-1.348 1.605-0.453 0.031-0.909 0.062-1.362 0.091 0.248 1.026 0.301 2.082 0.224 3.132 0.925 0.658 1.86 1.302 2.783 1.965 0.549-2.242 0.379-4.598-0.298-6.793zM13.754 4.322c-0.401 0.083-0.801 0.167-1.202 0.253-1.095 1.651-2.123 3.346-3.198 5.011-0.384-0.112-0.768-0.222-1.152-0.334-0.3 0.742-0.737 1.417-1.374 1.915 0.207 0.351 0.611 0.653 0.675 1.059-1.176 1.56-2.385 3.096-3.568 4.651 0.062 0.415 0.117 0.832 0.181 1.25 1.476-1.972 2.974-3.928 4.474-5.882 0.866 0.186 1.732 0.372 2.6 0.546-0.458-0.768-0.947-1.522-1.419-2.283 1.359-2.042 2.612-4.152 3.983-6.187zM8.92 13.080c-0.217 0.265-0.436 0.53-0.653 0.794 0.644 1.142 1.15 2.356 1.82 3.485 0.062-1.331 0.091-2.664 0.124-3.995-0.429-0.093-0.861-0.188-1.29-0.284zM11.195 9.698c-0.174 0.277-0.351 0.551-0.525 0.825 0.243 0.384 0.489 0.77 0.732 1.157 1.231-0.53 2.5-0.961 3.714-1.524-1.305-0.174-2.612-0.322-3.921-0.458zM21.372 5.598c-0.322 0.973-0.744 1.908-1.157 2.848 1.226 0.785 2.271 1.829 3.036 3.067 0.365-0.055 0.751-0.031 1.102-0.165 0.506-0.496 0.916-1.083 1.381-1.617-1.116-1.693-2.604-3.117-4.362-4.133zM2.552 5.762c-0.305 0.472-0.627 0.933-0.971 1.379 1.622 1.090 3.232 2.201 4.827 3.334 0.415-0.393 0.747-0.861 0.983-1.383-1.638-1.071-3.248-2.189-4.839-3.33zM16.585 4.26c-0.661 1.014-1.309 2.034-2.001 3.027 1.159-0.126 2.337-0.076 3.463 0.248 0.37-0.954 0.706-1.92 1.135-2.85-0.854-0.217-1.72-0.367-2.597-0.425zM1.736 4.367c-0.57 0.215-1.135 0.436-1.703 0.651-0.026 0.62-0.038 1.243-0.031 1.865 0.198-0.002 0.596-0.005 0.794-0.007 0.417-0.575 0.825-1.159 1.24-1.739-0.103-0.255-0.203-0.513-0.3-0.77zM15.737 16.547c0.332 0 0.6-0.269 0.6-0.6s-0.269-0.6-0.6-0.6c-0.332 0-0.6 0.269-0.6 0.6s0.269 0.6 0.6 0.6zM13.282 14.884c0.332 0 0.6-0.269 0.6-0.6s-0.269-0.6-0.6-0.6c-0.332 0-0.6 0.269-0.6 0.6s0.269 0.6 0.6 0.6z"></path>

Binary file added src/images/art/art25.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/art/art26.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/art/art27.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/art/art28.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/art/art29.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/art/art30.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<!doctype html>
<header>
<link rel="stylesheet" href="{{ 'assets/reveal/reveal.css' | url }}" />
<link rel="stylesheet" href="{{ 'assets/reveal/theme/moon.css' | url }}" />
<link rel="stylesheet" href="{{ 'assets/reveal/theme/magic.css' | url }}" />

<link rel="stylesheet" href="style/style.css" />
<link href="//cdn.jsdelivr.net/npm/keyrune@latest/css/keyrune.css" rel="stylesheet" type="text/css" />
</header>
<title>MTG Advent 2023</title>

Expand Down
Loading

0 comments on commit 70af353

Please sign in to comment.