Merge branch 'main' of datat.fi:/srv/datat.fi/datat.fi into main

This commit is contained in:
jusola 2022-10-24 09:31:46 +03:00
commit 4471814c04
27 changed files with 166 additions and 121 deletions

View File

@ -86,3 +86,9 @@ defaults:
values:
layout: post
read_time: true
# Collections
collections:
leffat:
output: true
permalink: /:collection/:path/

View File

@ -1,33 +1,30 @@
{% if post.id %}
{% assign title = post.title | markdownify | strip_html %}
{% else %}
{% assign title = post.title %}
{% endif %}
{% if post.id %} {% assign title = post.title | markdownify | strip_html %} {%
else %} {% assign title = post.title %} {% endif %} {% assign url =
post.external_url | post.url | relative_url %}
<article class="entry">
<header class="entry-header">
<h3 class="entry-title">
<a href="{{ post.url | relative_url }}" rel="bookmark">{{ title }}</a>
<a href="{{ url }}" rel="bookmark">{{ title }}</a>
</h3>
{% if post.image.thumbnail %}
{% assign entry_image = post.image.thumbnail | relative_url | escape %}
<img class="entry-image u-photo" src="{{ entry_image }}" alt="">
{% if post.image.thumbnail %} {% assign entry_image = post.image.thumbnail |
relative_url | escape %}
<a href="{{ url }}">
<img class="entry-image u-photo" src="{{ entry_image }}" zalt="" />
</a>
{% endif %}
</header>
<footer class="entry-meta">
<ul>
{% if post.date %}
<li><span class="icon">{% include icon-calendar.svg %}</span><time class="entry-time" datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: "%B %-d, %Y" }}</time></li>
{% endif %}
{% if post.read_time %}
<li><span class="icon">{% include icon-stopwatch.svg %}</span>{% capture read_time %}{% include read-time.html %}{% endcapture %}{{ read_time | strip }}</li>
{% endif %}
</ul>
</footer>
<div class="entry-excerpt">
{% if post.excerpt %}
{{ post.excerpt | markdownify }}
<p><a href="{{ post.url | relative_url }}" class="more-link">{{ site.data.theme.t.read_more | default: 'Read More' }} <span class="icon icon--arrow-right">{% include icon-arrow-right.svg %}</span></a></p>
{% if post.excerpt and page.show_excerpts != false %} {{ post.excerpt |
markdownify }}
<p>
<a href="{{ url }}" class="more-link"
>{{ site.data.theme.t.read_more | default: 'Read More' }}
<span class="icon icon--arrow-right"
>{% include icon-arrow-right.svg %}</span
></a
>
</p>
{% endif %}
</div>
</article>

7
_leffat/2013.md Normal file
View File

@ -0,0 +1,7 @@
---
title: "Dataleffa 2013"
image:
path: /assets/images/leffat/2013.jpg
thumbnail: /assets/images/leffat/2013.jpg
external_url: https://www.youtube.com/watch?v=XVBgjSE9_GE
---

7
_leffat/2014.md Normal file
View File

@ -0,0 +1,7 @@
---
title: "Dataleffa 2014"
image:
path: /assets/images/leffat/2014.jpg
thumbnail: /assets/images/leffat/2014.jpg
external_url: https://www.youtube.com/watch?v=fIAg76bmQ4s
---

7
_leffat/2015.md Normal file
View File

@ -0,0 +1,7 @@
---
title: "Dataleffa 2015: Kymmenen pientä dataa"
image:
path: /assets/images/leffat/2015.jpg
thumbnail: /assets/images/leffat/2015.jpg
external_url: https://www.youtube.com/watch?v=PzsdcF8EIJg
---

7
_leffat/2016.md Normal file
View File

@ -0,0 +1,7 @@
---
title: "Dataleffa 2016: Datakid"
image:
path: /assets/images/leffat/2016.jpg
thumbnail: /assets/images/leffat/2016.jpg
external_url: https://www.youtube.com/watch?v=63Yg1BW1Vi4
---

7
_leffat/2017.md Normal file
View File

@ -0,0 +1,7 @@
---
title: "Dataleffa 2017: Kultaisen MAOLin metsästys"
image:
path: /assets/images/leffat/2017.jpg
thumbnail: /assets/images/leffat/2017.jpg
external_url: https://www.youtube.com/watch?v=AqKfGdPVYWc
---

7
_leffat/2018.md Normal file
View File

@ -0,0 +1,7 @@
---
title: "Dataleffa 2018: Datatar, Viimeinen Fysiikantaitaja"
image:
path: /assets/images/leffat/2018.jpg
thumbnail: /assets/images/leffat/2018.jpg
external_url: https://www.youtube.com/watch?v=LngGoC5MiZc
---

7
_leffat/2019.md Normal file
View File

@ -0,0 +1,7 @@
---
title: "Dataleffa 2019: Suorakulmaisen pöydän ritarit"
image:
path: /assets/images/leffat/2019.jpg
thumbnail: /assets/images/leffat/2019.jpg
external_url: https://www.youtube.com/watch?v=q218vbS7Evw
---

7
_leffat/2020.md Normal file
View File

@ -0,0 +1,7 @@
---
title: "Dataleffa 2020"
image:
path: /assets/images/leffat/2020.jpg
thumbnail: /assets/images/leffat/2020.jpg
external_url: https://www.youtube.com/watch?v=0swUUIMR2Fc
---

7
_leffat/2021.md Normal file
View File

@ -0,0 +1,7 @@
---
title: "Dataleffa 2021: Kultatikku"
image:
path: /assets/images/leffat/2021.jpg
thumbnail: /assets/images/leffat/2021.jpg
external_url: https://www.youtube.com/watch?v=C9NY2IAmQqE
---

View File

@ -1,29 +0,0 @@
---
layout: post
title: "Welcome to Jekyll!"
date: 2022-08-16 12:55:28 +0300
categories: jekyll update
---
Youll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
Jekyll requires blog post files to be named according to the following format:
`YEAR-MONTH-DAY-title.MARKUP`
Where `YEAR` is a four-digit number, `MONTH` and `DAY` are both two-digit numbers, and `MARKUP` is the file extension representing the format used in the file. After that, include the necessary front matter. Take a look at the source for this post to get an idea about how it works.
Jekyll also offers powerful support for code snippets:
{% highlight ruby %}
def print_hi(name)
puts "Hi, #{name}"
end
print_hi('Tom')
#=> prints 'Hi, Tom' to STDOUT.
{% endhighlight %}
Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekylls GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk].
[jekyll-docs]: https://jekyllrb.com/docs/home
[jekyll-gh]: https://github.com/jekyll/jekyll
[jekyll-talk]: https://talk.jekyllrb.com/

View File

@ -131,7 +131,7 @@
.entries-grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
grid-template-columns: repeat(auto-fill, minmax(calc(max(300px, 25%)), 1fr));
grid-gap: 2em;
.entry {
@ -197,7 +197,6 @@
}
}
.entry-content {
> p:first-child {
font-size: 1.125em;

View File

@ -56,10 +56,6 @@ main {
}
}
.inner {
max-width: $large;
}
/*
Layout specific adjustments
========================================================================== */

BIN
assets/images/banner.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 119 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

View File

@ -4,11 +4,12 @@
layout: home
hide_posts: true
image: /assets/images/banner.png
introduction: |
Otaniemen datojen oma sivu. Täältä löydät [tietoa datoista](/about), datojen [telegram-ryhmän](/telegram) sekä tietenkin [Dataleffat](/leffat).
Otaniemen datojen oma sivu. Täältä löydät [tietoa datoista](/about), datojen [telegram-ryhmän](/telegram) sekä tietenkin [dataleffat](/leffat).
actions:
- label: "Telegram-ryhmä"
url: '/telegram'
url: "/telegram"
- label: "Uusin dataleffa"
url: '/leffa'
url: "/leffa"
---

View File

@ -3,4 +3,9 @@ title: Dataleffat
layout: collection
collection: leffat
permalink: /leffat/
entries_layout: grid
show_excerpts: false
show_dates: false
sort_by: title
sort_order: reverse
---

7
yhdistys.md Normal file
View File

@ -0,0 +1,7 @@
---
layout: page
title: Yhdistys
permalink: /yhdistys/
---
Datat Ry on datojen yhdistys.