diff options
-rw-r--r-- | pydis_site/static/css/events/base.css | 30 | ||||
-rw-r--r-- | pydis_site/static/images/events/icons/adventofcode.png | bin | 0 -> 18455 bytes | |||
-rw-r--r-- | pydis_site/static/images/events/icons/codejam.svg | 264 | ||||
-rw-r--r-- | pydis_site/static/images/events/icons/pixels.png | bin | 0 -> 4426 bytes | |||
-rw-r--r-- | pydis_site/static/images/events/icons/pyweek.png | bin | 0 -> 4369 bytes | |||
-rw-r--r-- | pydis_site/templates/events/current_event.html | 19 | ||||
-rw-r--r-- | pydis_site/templates/events/index.html | 145 | ||||
-rw-r--r-- | pydis_site/templates/events/sidebar/events_list.html | 62 | ||||
-rw-r--r-- | pydis_site/templates/events/upcoming_event.html | 15 |
9 files changed, 450 insertions, 85 deletions
diff --git a/pydis_site/static/css/events/base.css b/pydis_site/static/css/events/base.css index 604b81cc..80be4338 100644 --- a/pydis_site/static/css/events/base.css +++ b/pydis_site/static/css/events/base.css @@ -19,20 +19,8 @@ pre { margin-bottom: 0 !important } - -.event-gallery .box { - padding: 0; -} - -.event-gallery .box-content { - padding: 1.25rem; -} - -.event-gallery img { - object-fit: cover; - /* Same as that of box */ - border-top-left-radius: 6px; - border-top-right-radius: 6px; +.event-gallery .card { + border-radius: 6px; } /* CSS-only Masonry layout: @@ -57,15 +45,15 @@ pre { height: 60rem; } - .event-gallery .box { + .event-gallery .card { width: calc(33% - 1rem); margin-bottom: 1rem; } /* Reorder vertically */ - .event-gallery .box:nth-child(3n+1) { order: 1; } - .event-gallery .box:nth-child(3n+2) { order: 2; } - .event-gallery .box:nth-child(3n) { order: 3; } + .event-gallery .card:nth-child(3n+1) { order: 1; } + .event-gallery .card:nth-child(3n+2) { order: 2; } + .event-gallery .card:nth-child(3n) { order: 3; } /* 2 line breaks to force new columns, for each gap between the three columns. */ .event-gallery::before, .event-gallery::after { @@ -82,13 +70,13 @@ pre { height: 80rem; } - .event-gallery .box { + .event-gallery .card { width: calc(50% - 1rem); margin-bottom: 1rem; } - .event-gallery .box:nth-child(2n+1) { order: 1; } - .event-gallery .box:nth-child(2n) { order: 2; } + .event-gallery .card:nth-child(2n+1) { order: 1; } + .event-gallery .card:nth-child(2n) { order: 2; } /* 1 line break to force a new column, for the gap between the two columns. */ .event-gallery::before { diff --git a/pydis_site/static/images/events/icons/adventofcode.png b/pydis_site/static/images/events/icons/adventofcode.png Binary files differnew file mode 100644 index 00000000..e9501737 --- /dev/null +++ b/pydis_site/static/images/events/icons/adventofcode.png diff --git a/pydis_site/static/images/events/icons/codejam.svg b/pydis_site/static/images/events/icons/codejam.svg new file mode 100644 index 00000000..b6a8a1db --- /dev/null +++ b/pydis_site/static/images/events/icons/codejam.svg @@ -0,0 +1,264 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + inkscape:export-ydpi="1024" + inkscape:export-xdpi="1024" + inkscape:export-filename="logo.png" + sodipodi:docname="logo.svg" + inkscape:version="1.2 (dc2aedaf03, 2022-05-15)" + id="svg1206" + version="1.1" + viewBox="0 0 12.7 12.7" + height="48" + width="48" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> + <sodipodi:namedview + id="namedview1208" + pagecolor="#ffffff" + bordercolor="#868686" + borderopacity="1" + inkscape:pageshadow="0" + inkscape:pageopacity="0" + inkscape:pagecheckerboard="true" + inkscape:document-units="mm" + showgrid="false" + units="px" + inkscape:zoom="2.5906005" + inkscape:cx="75.658134" + inkscape:cy="34.547974" + inkscape:window-width="1920" + inkscape:window-height="1040" + inkscape:window-x="1280" + inkscape:window-y="40" + inkscape:window-maximized="1" + inkscape:current-layer="layer1" + borderlayer="false" + inkscape:showpageshadow="0" + inkscape:deskcolor="#d1d1d1" /> + <defs + id="defs1203"> + <linearGradient + inkscape:collect="always" + id="linearGradient5744"> + <stop + style="stop-color:#fcc747;stop-opacity:1;" + offset="0" + id="stop5740" /> + <stop + style="stop-color:#fafaed;stop-opacity:1;" + offset="1" + id="stop5742" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5696"> + <stop + style="stop-color:#e13b91;stop-opacity:1;" + offset="0" + id="stop5692" /> + <stop + style="stop-color:#fe6dff;stop-opacity:1;" + offset="1" + id="stop5694" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient1646"> + <stop + style="stop-color:#fcd88b;stop-opacity:1;" + offset="0" + id="stop1642" /> + <stop + style="stop-color:#c44cd8;stop-opacity:1;" + offset="1" + id="stop1644" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5696" + id="linearGradient2243" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.06879599,0,0,0.06879599,-0.2490493,-2.0717465)" + x1="-1.5663104" + y1="1.2413522" + x2="122.3921" + y2="203.21013" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5744" + id="linearGradient2245" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.06879599,0,0,0.06879599,-0.2490493,-2.0717465)" + x1="140.36624" + y1="281.61649" + x2="61.302074" + y2="62.665607" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient7250" + id="linearGradient9126" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.05319008,0,0,0.07754268,22.485567,-8.7102966)" + x1="107.46832" + y1="73.777969" + x2="88.601158" + y2="340.92719" /> + <linearGradient + inkscape:collect="always" + id="linearGradient7250"> + <stop + style="stop-color:#fcc38b;stop-opacity:1" + offset="0" + id="stop5608" /> + <stop + style="stop-color:#d76dd8;stop-opacity:1" + offset="0.5" + id="stop5610" /> + <stop + style="stop-color:#4999f4;stop-opacity:1" + offset="1" + id="stop5612" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient8359" + id="linearGradient9128" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.04911352,0,0,0.06088132,-34.478709,8.6904634)" + x1="1434.8317" + y1="54.945419" + x2="1440.8918" + y2="-205.26265" /> + <linearGradient + inkscape:collect="always" + id="linearGradient8359"> + <stop + style="stop-color:#53e8df;stop-opacity:0.60336429" + offset="0" + id="stop5615" /> + <stop + style="stop-color:#26209b;stop-opacity:0.48974407" + offset="1" + id="stop5617" /> + </linearGradient> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath6062"> + <path + id="path6064" + style="display:inline;fill:url(#linearGradient6066);fill-opacity:1;stroke:#303136;stroke-width:0;stroke-linecap:square;stroke-linejoin:bevel" + d="m 42.345844,5.0325671 a 6.3499992,6.3499992 0 0 1 -6.349997,6.3500059 6.3499992,6.3499992 0 0 1 -6.35,-6.3500059 6.3499992,6.3499992 0 0 1 6.35,-6.3499942 6.3499992,6.3499992 0 0 1 6.349997,6.3499942 z" /> + </clipPath> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1646" + id="linearGradient6066" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.09459327,0,0,0.09459327,-20.470237,-6.3964402)" + x1="547.07745" + y1="34.764702" + x2="667.21497" + y2="269.6705" /> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath7381"> + <path + id="path7383" + style="display:inline;fill:url(#linearGradient7385);fill-opacity:1;stroke:#303136;stroke-width:0;stroke-linecap:square;stroke-linejoin:bevel" + d="m 42.345845,5.0325671 a 6.3499992,6.3499992 0 0 1 -6.35,6.3500059 6.3499992,6.3499992 0 0 1 -6.349997,-6.3500059 6.3499992,6.3499992 0 0 1 6.349997,-6.3499939 6.3499992,6.3499992 0 0 1 6.35,6.3499939 z" /> + </clipPath> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1646" + id="linearGradient7385" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.09459327,0,0,0.09459327,-20.470237,-6.3964407)" + x1="547.07745" + y1="34.764702" + x2="667.21497" + y2="269.6705" /> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath7387"> + <path + id="path7389" + style="display:inline;fill:url(#linearGradient7391);fill-opacity:1;stroke:#303136;stroke-width:0;stroke-linecap:square;stroke-linejoin:bevel" + d="m 42.345845,5.0325671 a 6.3499992,6.3499992 0 0 1 -6.35,6.3500059 6.3499992,6.3499992 0 0 1 -6.349997,-6.3500059 6.3499992,6.3499992 0 0 1 6.349997,-6.3499939 6.3499992,6.3499992 0 0 1 6.35,6.3499939 z" /> + </clipPath> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1646" + id="linearGradient7391" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.09459327,0,0,0.09459327,-20.470237,-6.3964407)" + x1="547.07745" + y1="34.764702" + x2="667.21497" + y2="269.6705" /> + </defs> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <g + id="g7395" + transform="translate(-30.925963,0.33530437)"> + <rect + style="display:inline;fill:url(#linearGradient9126);fill-opacity:1;stroke-width:0.104527;stroke-linecap:square;stroke-linejoin:bevel" + id="rect1064-9-6-7" + width="24.949669" + height="14.034189" + x="23.521011" + y="-1.9845216" + inkscape:export-filename="/home/kosa/Documents/code/python/PythonDiscord/branding/events/summer_code_jam_2021/site_banner.png" + inkscape:export-xdpi="150" + inkscape:export-ydpi="150" + clip-path="url(#clipPath7387)" + transform="translate(1.2801165,0.98212331)" /> + <rect + style="display:inline;fill:url(#linearGradient9128);fill-opacity:1;stroke:#ebddbc;stroke-width:0;stroke-dasharray:none;stroke-opacity:0.00473543" + id="rect16083-1-7" + width="24.949669" + height="7.0169988" + x="23.521011" + y="5.0326681" + clip-path="url(#clipPath7381)" + transform="translate(1.2801165,0.98212331)" /> + </g> + <g + id="g1629" + transform="translate(-0.50852755,-0.7204563)"> + <path + id="path5041-2-9-5-1-7-0" + d="M 8.6150329,2.9362086 8.3000165,3.0267936 C 7.9653672,2.9773715 7.6221913,2.9556897 7.289887,2.9581335 6.9202733,2.9608733 6.5643916,2.9909667 6.2522735,3.0457238 6.1509773,3.063564 6.059325,3.0836698 5.9755437,3.1059365 H 4.9928473 v 0.5147424 h 0.1232049 v 0.2107963 h 0.076201 C 5.1747486,3.9331658 5.1680297,4.0450205 5.1680297,4.1682557 V 4.2777711 H 4.7464385 l -0.060266,0.3011671 0.4818572,0.411056 v 0.00236 h 2.168434 V 5.26614 H 5.1680293 4.3548998 c -0.629713,0 -1.182765,0.3778283 -1.3552521,1.0951537 -0.1998652,0.8213639 -0.2080787,1.3361177 0,2.1958126 0.013617,0.056897 0.029036,0.1122114 0.046095,0.1659839 l -0.032406,0.2857672 0.3653902,0.316194 c 0.1925274,0.2056231 0.4482215,0.3272087 0.773559,0.3272087 H 4.8970214 V 8.6666163 c 0,-0.7118493 0.6187611,-1.3415615 1.3552521,-1.3415615 h 2.1683806 c 0.6023332,0 1.0841905,-0.4955998 1.0841905,-1.0979328 V 4.1682557 c 0,-0.3531772 -0.1802061,-0.6524693 -0.4521788,-0.8562299 z M 10.717746,5.0607944 10.326209,5.2634085 H 9.7759056 v 0.00272 0.2820233 0.676235 c 0,0.7447046 -0.6324511,1.3689416 -1.3552515,1.3689416 H 6.2550006 c -0.5941205,0 -1.0841913,0.5064969 -1.0841913,1.097879 V 10.7474 c 0,0.585907 0.5119739,0.930868 1.0841913,1.097879 0.6872079,0.199867 1.3442888,0.238196 2.1656535,0 0.5448384,-0.15606 1.0841905,-0.473641 1.0841905,-1.097879 V 9.9835235 9.9260346 9.923255 h -0.0033 L 9.1806818,9.6494698 h 0.3241611 1.0841901 c 0.629713,0 0.865214,-0.4380615 1.084244,-1.0951536 0.227244,-0.6762559 0.216292,-1.3278503 0,-2.1957588 C 11.574098,5.9618237 11.417215,5.6272549 11.154524,5.4359125 Z M 7.3391909,9.6494736 H 8.9134727 V 9.9232617 H 7.3391909 Z" + style="display:inline;fill:#6d52c6;fill-opacity:1;stroke:none;stroke-width:0.034398;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + inkscape:connector-curvature="0" + inkscape:label="shadow" + inkscape:export-xdpi="128" + inkscape:export-ydpi="128" /> + <path + style="display:inline;fill:url(#linearGradient2243);fill-opacity:1;stroke:none;stroke-width:0.0756757;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 6.8053046,2.5446738 C 6.4356908,2.5474075 6.0797666,2.5775279 5.7676475,2.6322861 4.850457,2.7938211 4.6834469,3.1305807 4.6834469,3.7548179 v 0.8241022 h 2.1684023 v 0.273788 H 4.6834469 3.8702956 c -0.6297132,0 -1.1827649,0.3778283 -1.3552512,1.0951528 -0.1998651,0.8213647 -0.2080796,1.3360865 0,2.1957814 0.1533216,0.6406641 0.5229353,1.0951518 1.1526485,1.0951518 H 4.4123964 V 8.2531567 c 0,-0.7118494 0.6187611,-1.3415616 1.3552511,-1.3415616 h 2.165664 c 0.6023349,0 1.0842015,-0.4955572 1.0842015,-1.0978902 v -2.058887 c 0,-0.585907 -0.495557,-1.0239686 -1.0842015,-1.1225318 C 7.5636977,2.5693144 7.1776568,2.5419362 6.8053046,2.5446738 Z M 5.6334916,3.207241 c 0.2245058,0 0.4079439,0.1861757 0.4079439,0.4134199 0,0.2272444 -0.1834381,0.4106824 -0.4079439,0.4106824 -0.2245068,0 -0.4079449,-0.183438 -0.4079449,-0.4106824 0,-0.2299817 0.1834381,-0.4134199 0.4079449,-0.4134199 z" + class="st2" + id="path1948-2-9-9-7-8" + inkscape:connector-curvature="0" + inkscape:label="upper_snake" + inkscape:export-xdpi="128" + inkscape:export-ydpi="128" /> + <path + style="display:inline;fill:url(#linearGradient2245);fill-opacity:1;stroke:none;stroke-width:0.0756757;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 9.291301,4.8527081 v 0.9582583 c 0,0.7447045 -0.6324506,1.3689416 -1.3552511,1.3689416 H 5.7703851 c -0.5941196,0 -1.0842008,0.5065073 -1.0842008,1.0978893 v 2.0561497 c 0,0.585907 0.5119843,0.93088 1.0842008,1.097891 0.6872089,0.199866 1.3443,0.238196 2.1656648,0 0.5448383,-0.15606 1.0842007,-0.473653 1.0842007,-1.097891 V 9.5098445 H 6.8545857 v -0.273788 h 2.1656649 1.0842014 c 0.629712,0 0.86517,-0.4380614 1.0842,-1.0951527 0.227245,-0.6762568 0.216293,-1.327873 0,-2.1957805 -0.156058,-0.6242372 -0.454488,-1.0951536 -1.0842,-1.0951536 H 9.291301 Z M 8.0729444,10.060159 c 0.2245057,0 0.4079438,0.183437 0.4079438,0.410682 0,0.227245 -0.1834381,0.41342 -0.4079438,0.41342 -0.2245067,0 -0.407945,-0.186175 -0.407945,-0.41342 0,-0.227245 0.1834383,-0.410682 0.407945,-0.410682 z" + class="st3" + id="path1950-28-2-4-1-8" + inkscape:connector-curvature="0" + inkscape:label="lower_snake" + inkscape:export-xdpi="128" + inkscape:export-ydpi="128" /> + </g> + </g> +</svg> diff --git a/pydis_site/static/images/events/icons/pixels.png b/pydis_site/static/images/events/icons/pixels.png Binary files differnew file mode 100644 index 00000000..8b5bd841 --- /dev/null +++ b/pydis_site/static/images/events/icons/pixels.png diff --git a/pydis_site/static/images/events/icons/pyweek.png b/pydis_site/static/images/events/icons/pyweek.png Binary files differnew file mode 100644 index 00000000..f74bc43b --- /dev/null +++ b/pydis_site/static/images/events/icons/pyweek.png diff --git a/pydis_site/templates/events/current_event.html b/pydis_site/templates/events/current_event.html index dd94fb3f..dd59b040 100644 --- a/pydis_site/templates/events/current_event.html +++ b/pydis_site/templates/events/current_event.html @@ -1 +1,20 @@ +{% load static %} + {# Current or ongoing event #} +{# (n/a) #} + +{# Next event to promote #} +<div class="box has-background-warning-light" style="padding: 2rem; padding-top: 1.25rem;"> + <div class="columns is-3" style="--columnGap: 0.75rem;"> + <div class="column"> + <p class="subtitle is-6 has-text-grey" style="padding-bottom: 1rem;">Upcoming event</p> + <h2 class="title is-4"><a href="https://pyweek.org/">PyWeek 37</a></h2> + <p><strong>March 17-24</strong></p> + </div> + <div class="column"> + <img src="https://pyweek.readthedocs.io/en/latest/_static/pyweek.svg" style="border-radius: 10px;" alt="PyWeek logo"> + </div> + </div> + <p>PyWeek has been running a bi-annual game jam for the Python language. As of 2020, we are excited to say we are officially partnered with PyWeek to co-run these events.</p> + <a class="button is-link" href="https://pyweek.org/">Learn more</a> +</div> diff --git a/pydis_site/templates/events/index.html b/pydis_site/templates/events/index.html index f51576fa..df83d895 100644 --- a/pydis_site/templates/events/index.html +++ b/pydis_site/templates/events/index.html @@ -10,34 +10,87 @@ <div class="columns is-variable is-8"> <div class="column is-two-thirds"> <p>Briefly describe events. Explain how to subscribe to updates from the <code>#roles</code> channel.</p> - {% include "events/current_event.html" %} - {% include "events/upcoming_event.html" %} - - <h2 class="title is-4">Scheduled events</h2> - <div class="columns is-3" style="--columnGap: 0.75rem;"> - <div class="column"> - <div class="box"> - <h2 class="title is-6">January-June</h2> - <ul> - <li>March: <a href="{% url "events:page" path="pyweek" %}">PyWeek</a></li> - </ul> - </div> - </div> - <div class="column"> - <div class="box"> - <h2 class="title is-6">July-December</h2> - <ul> - <li>TBD: <a href="{% url "events:page" path="revivalofcode" %}">Revival of Code</a></li> - <li>TBD: <a href="{% url "events:page" path="code-jams" %}">Code Jam</a></li> - <li>September: <a href="{% url "events:page" path="pyweek" %}">PyWeek</a></li> - <li>December 1-25: <a href="{% url "events:page" path="adventofcode" %}">Advent of Code</a></li> - </ul> - </div> + <div class="box"> + <h2 class="title is-5" style="margin-bottom: 2rem;">Scheduled events for 2024</h2> + <article class="media"> + <figure class="media-left"> + <p class="image is-64x64"> + <img class="is-rounded" src="/static/images/events/icons/pyweek.png"> + </p> + </figure> + <div class="media-content"> + <div class="content"> + <h5 class="title is-4"><a href="{% url "events:page" path="pyweek" %}">PyWeek 37</a></h5> + <p class="subtitle is-6">March 17-24</p> + <p>The bi-annual game-jam where you are allowed one week to write a game from scratch, either as an individual or as a team.</p> + </div> + <a class="button is-small is-link is-outlined" href="https://pyweek.org/">Learn more</a> + </div> + </article> + <article class="media"> + <figure class="media-left"> + <p class="image is-64x64"> + <img class="is-rounded" src="/static/images/events/icons/adventofcode.png"> + </p> + </figure> + <div class="media-content"> + <div class="content"> + <h5 class="title is-4"><a href="{% url "events:page" path="revivalofcode" %}">Revival of Code</a></h5> + <p class="subtitle is-6">TBD</p> + <p>Revisit past years' Advent of Code problems! Puzzles are relased every other day and there will be dedicated solution threads for you to discuss with other participants.</p> + </div> + <a class="button is-small is-link is-outlined" href="{% url "events:page" path="revivalofcode" %}">Learn more</a> + </div> + </article> + <article class="media"> + <figure class="media-left"> + <p class="image is-64x64"> + <img class="is-rounded" src="/static/images/events/icons/codejam.svg"> + </p> + </figure> + <div class="media-content"> + <div class="content"> + <h5 class="title is-4"><a href="{% url "events:page" path="codejams" %}">Code Jam</a></h5> + <p class="subtitle is-6">TBD</p> + <p>Our annual code-jam where we place you in a team of five and you have 11 days to code some sort of application or program in Python based on a selected technology or framework.</p> + </div> + <a class="button is-small is-link is-outlined" href="{% url "events:page" path="codejams" %}">Learn more</a> + </div> + </article> + <article class="media"> + <figure class="media-left"> + <p class="image is-64x64"> + <img class="is-rounded" src="/static/images/events/icons/pyweek.png"> + </p> + </figure> + <div class="media-content"> + <div class="content"> + <h5 class="title is-4"><a href="{% url "events:page" path="pyweek" %}">PyWeek 38</a></h5> + <p class="subtitle is-6">September</p> + <p>The bi-annual game-jam where you are allowed one week to write a game from scratch, either as an individual or as a team.</p> + </div> + <a class="button is-small is-link is-outlined" href="https://pyweek.org/">Learn more</a> + </div> + </article> + <article class="media"> + <figure class="media-left"> + <p class="image is-64x64"> + <img class="is-rounded" src="/static/images/events/icons/adventofcode.png"> + </p> + </figure> + <div class="media-content"> + <div class="content"> + <h5 class="title is-4"><a href="{% url "events:page" path="adventofcode" %}">Advent of Code</a></h5> + <p class="subtitle is-6">December 1-25</p> + <p>Daily programming puzzles with increasing difficulties where each puzzle has a little story and you can discuss solutions with other participants. You are allowed to use any programming language you like.</p> + </div> + <a class="button is-small is-link is-outlined" href="{% url "events:page" path="adventofcode" %}">Learn more</a> + </div> + </article> </div> </div> - </div> <div class="column"> {% include "events/sidebar/events_list.html" %} </div> @@ -46,45 +99,55 @@ <h2 class="title is-4">All events</h2> <div class="event-gallery"> - <div class="box"> - <div class="box-content"> + <div class="card"> + <div class="card-content"> <h2 class="title is-4"><a href="{% url "events:page" path="code-jams" %}">Code Jams</a></h2> <p>Once a year we host a code jam for members of our server to participate in. The code jam is an event where we place you in a team with 5 other random server members. You then have 11 days to code some sort of application or program in Python. Your program must use the specified technology/framework and incorporate the theme chosen by the server.</p> </div> </div> - <div class="box"> - <img src="/static/images/events/gallery/pyweek.png" alt="PyWeek logo"> - <div class="box-content"> + <div class="card"> + <div class="card-image"> + <img src="/static/images/events/gallery/pyweek.png" alt="PyWeek logo"> + </div> + <div class="card-content"> <h2 class="title is-4"><a href="{% url "events:page" path="pyweek" %}">PyWeek</a></h2> <p>For the past 15 years, PyWeek has been running a bi-annual game jam for the Python language. As of 2020, we are excited to say we are officially partnered with PyWeek to co-run these events.</p> </div> </div> - <div class="box"> - <img src="/static/images/events/gallery/pixels.png" alt="Logo for pixels"> - <div class="box-content"> + <div class="card"> + <div class="card-image"> + <img src="/static/images/events/gallery/pixels.png" alt="Logo for pixels"> + </div> + <div class="card-content"> <h2 class="title is-4"><a href="{% url "events:page" path="pixels" %}">Pixels</a></h2> <p>A collaborative canvas where users paint pixel by pixel, by POSTing co-ordinates and a color code to an API.</p> </div> </div> - <div class="box"> - <img src="/static/images/events/gallery/adventofcode.png" alt="Server icon for AoC"> - <div class="box-content"> + <div class="card"> + <div class="card-image"> + <img src="/static/images/events/gallery/adventofcode.png" alt="Server icon for AoC"> + </div> + <div class="card-content"> <h2 class="title is-4"><a href="{% url "events:page" path="adventofcode" %}">Advent of code</a></h2> <p>An advent calendar of small programming puzzles for a variety of skill sets and skill levels that can be solved in any programming language you like, including Python.</p> </div> </div> - <div class="box"> - <img src="/static/images/events/gallery/adventofcode.png" alt="Server icon for AoC"> - <div class="box-content"> + <div class="card"> + <div class="card-image"> + <img src="/static/images/events/gallery/adventofcode.png" alt="Server icon for AoC"> + </div> + <div class="card-content"> <h2 class="title is-4"><a href="{% url "events:page" path="revivalofcode" %}">Revival of Code</a></h2> <p> Revival of Code is a Python Discord hosted event where we release old Advent of Code puzzles from a previous year. The puzzles start off easy and gradually get more difficult, all while revealing a fun little story that is appropriate for some seasons more than others. Questions will be posted every other day, and you'll be able to discuss your solutions in dedicated threads. </p> </div> </div> - <div class="box"> - <img src="/static/images/events/gallery/gamejam.png" alt="Game Jam 2020"> - <div class="box-content"> + <div class="card"> + <div class="card-image"> + <img src="/static/images/events/gallery/gamejam.png" alt="Game Jam 2020"> + </div> + <div class="card-content"> <h2 class="title is-4"><a href="{% url "events:page" path="game-jams" %}">Game Jams</a></h2> <p>The Game Jam is similar to our Code Jams, but smaller in scope. Instead of having to complete a qualifier and being teamed up with random strangers, members of our community can just sign-up individually or pair up diff --git a/pydis_site/templates/events/sidebar/events_list.html b/pydis_site/templates/events/sidebar/events_list.html index 0d3493e4..df443e8d 100644 --- a/pydis_site/templates/events/sidebar/events_list.html +++ b/pydis_site/templates/events/sidebar/events_list.html @@ -1,16 +1,62 @@ -<h4 class="title is-4">Recent events</h4> <div class="box"> - <ul class="menu-list" style="margin-top: 0;"> - <li><a class="has-text-link" href="https://pyweek.org/35/">March: PyWeek 35</a></li> - <li><a class="has-text-link" href="{% url "events:page" path="code-jams/10" %}">August: Code Jam 2023</a></li> - <li><a class="has-text-link" href="https://pyweek.org/36/">September: PyWeek 36</a></li> - <li><a class="has-text-link" href="https://adventofcode.com/2023">December: Advent of Code</a></li> - </ul> + <h2 class="title is-5">Previous events from 2023</h2> + <article class="media"> + <figure class="media-left"> + <p class="image is-32x32"> + <img class="is-rounded" src="/static/images/events/icons/pyweek.png"> + </p> + </figure> + <div class="media-content"> + <div class="content"> + <h5 class="title is-5"><a href="https://pyweek/35/">PyWeek 35</a></h5> + <p class="subtitle is-6">March</p> + </div> + </div> + </article> + <article class="media"> + <figure class="media-left"> + <p class="image is-32x32"> + <img class="is-rounded" src="/static/images/events/icons/codejam.svg"> + </p> + </figure> + <div class="media-content"> + <div class="content"> + <h5 class="title is-5"><a href="{% url "events:page" path="code-jams/10" %}">Summer Code Jam 2023</a></h5> + <p class="subtitle is-6">August</p> + </div> + </div> + </article> + <article class="media"> + <figure class="media-left"> + <p class="image is-32x32"> + <img class="is-rounded" src="/static/images/events/icons/pyweek.png"> + </p> + </figure> + <div class="media-content"> + <div class="content"> + <h5 class="title is-5"><a href="https://pyweek/36/">PyWeek 36</a></h5> + <p class="subtitle is-6">September</p> + </div> + </div> + </article> + <article class="media"> + <figure class="media-left"> + <p class="image is-32x32"> + <img class="is-rounded" src="/static/images/events/icons/adventofcode.png"> + </p> + </figure> + <div class="media-content"> + <div class="content"> + <h5 class="title is-5"><a href="https://adventofcode.com/2023">Advent of Code 2023</a></h5> + <p class="subtitle is-6">December</p> + </div> + </div> + </article> </div> <div class="is-hidden-mobile"> - <h4 class="title is-4">All events</h4> <div class="box"> + <h4 class="title is-5">All events</h4> <ul class="menu-list" style="margin-top: 0;"> <li><a class="has-text-link" href="{% url "events:page" path="code-jams" %}">Code Jams</a></li> <li><a class="has-text-link" href="{% url "events:page" path="pyweek" %}">PyWeek</a></li> diff --git a/pydis_site/templates/events/upcoming_event.html b/pydis_site/templates/events/upcoming_event.html deleted file mode 100644 index 10165bae..00000000 --- a/pydis_site/templates/events/upcoming_event.html +++ /dev/null @@ -1,15 +0,0 @@ -{% load static %} - -<h2 class="title is-4">Upcoming event</h2> -<div class="box"> - <h2 class="title is-4"><a href="https://pyweek.org/">PyWeek 37</a></h2> - <p><strong>March 17-24</strong></p> - <div class="columns is-3" style="--columnGap: 0.75rem;"> - <div class="column"> - <p>PyWeek has been running a bi-annual game jam for the Python language. As of 2020, we are excited to say we are officially partnered with PyWeek to co-run these events.</p> - </div> - <div class="column"> - <img src="https://pyweek.readthedocs.io/en/latest/_static/pyweek.svg" style="border-radius: 10px;" alt="PyWeek logo"> - </div> - </div> -</div> |