diff --git a/_config.yml b/_config.yml index 6376c11..8bef3a2 100644 --- a/_config.yml +++ b/_config.yml @@ -9,7 +9,7 @@ # 'bundle exec jekyll serve'. If you change this file, please restart the server process. # -# If you need help with YAML syntax, here are some quick references for you: +# If you need help with YAML syntax, here are some quick references for you: # https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml # https://learnxinyminutes.com/docs/yaml/ # @@ -86,3 +86,9 @@ defaults: values: layout: post read_time: true + +# Collections +collections: + leffat: + output: true + permalink: /:collection/:path/ diff --git a/_includes/entry.html b/_includes/entry.html index 77465ab..29297cd 100644 --- a/_includes/entry.html +++ b/_includes/entry.html @@ -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 %}

- {{ title }} + {{ title }}

- {% if post.image.thumbnail %} - {% assign entry_image = post.image.thumbnail | relative_url | escape %} - + {% if post.image.thumbnail %} {% assign entry_image = post.image.thumbnail | + relative_url | escape %} + + + {% endif %}
-
- {% if post.excerpt %} - {{ post.excerpt | markdownify }} -

{{ site.data.theme.t.read_more | default: 'Read More' }} {% include icon-arrow-right.svg %}

+ {% if post.excerpt and page.show_excerpts != false %} {{ post.excerpt | + markdownify }} +

+ {{ site.data.theme.t.read_more | default: 'Read More' }} + {% include icon-arrow-right.svg %} +

{% endif %}
diff --git a/_leffat/2013.md b/_leffat/2013.md new file mode 100644 index 0000000..663bf1b --- /dev/null +++ b/_leffat/2013.md @@ -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 +--- diff --git a/_leffat/2014.md b/_leffat/2014.md new file mode 100644 index 0000000..eb678d8 --- /dev/null +++ b/_leffat/2014.md @@ -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 +--- diff --git a/_leffat/2015.md b/_leffat/2015.md new file mode 100644 index 0000000..45c6a91 --- /dev/null +++ b/_leffat/2015.md @@ -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 +--- diff --git a/_leffat/2016.md b/_leffat/2016.md new file mode 100644 index 0000000..e48ea1b --- /dev/null +++ b/_leffat/2016.md @@ -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 +--- diff --git a/_leffat/2017.md b/_leffat/2017.md new file mode 100644 index 0000000..7e518a6 --- /dev/null +++ b/_leffat/2017.md @@ -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 +--- diff --git a/_leffat/2018.md b/_leffat/2018.md new file mode 100644 index 0000000..493e9f1 --- /dev/null +++ b/_leffat/2018.md @@ -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 +--- diff --git a/_leffat/2019.md b/_leffat/2019.md new file mode 100644 index 0000000..80bfd01 --- /dev/null +++ b/_leffat/2019.md @@ -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 +--- diff --git a/_leffat/2020.md b/_leffat/2020.md new file mode 100644 index 0000000..a706af1 --- /dev/null +++ b/_leffat/2020.md @@ -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 +--- diff --git a/_leffat/2021.md b/_leffat/2021.md new file mode 100644 index 0000000..3d61816 --- /dev/null +++ b/_leffat/2021.md @@ -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 +--- diff --git a/_posts/2022-08-16-welcome-to-jekyll.markdown b/_posts/2022-08-16-welcome-to-jekyll.markdown deleted file mode 100644 index 6c92600..0000000 --- a/_posts/2022-08-16-welcome-to-jekyll.markdown +++ /dev/null @@ -1,29 +0,0 @@ ---- -layout: post -title: "Welcome to Jekyll!" -date: 2022-08-16 12:55:28 +0300 -categories: jekyll update ---- -You’ll 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 [Jekyll’s 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/ diff --git a/_sass/basically-basic/_entries.scss b/_sass/basically-basic/_entries.scss index 7f9665e..c66f505 100644 --- a/_sass/basically-basic/_entries.scss +++ b/_sass/basically-basic/_entries.scss @@ -129,74 +129,73 @@ Entries Grid Layout ========================================================================== */ - .entries-grid { - display: grid; - grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); - grid-gap: 2em; +.entries-grid { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(calc(max(300px, 25%)), 1fr)); + grid-gap: 2em; - .entry { - display: -webkit-box; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -ms-flex-direction: column; - flex-direction: column; + .entry { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + margin-bottom: 0; + padding-bottom: 2rem; + border-bottom: none; + } + + .entry-title { + @include fluid-type($min-vw, $max-vw, 18px, 24px); + -webkit-box-ordinal-group: 2; + -ms-flex-order: 1; + order: 1; + } + + .entry-excerpt, + .entry-content { + -webkit-box-ordinal-group: 4; + -ms-flex-order: 3; + order: 3; + + /* remove space after last child element */ + > *:last-child { margin-bottom: 0; - padding-bottom: 2rem; - border-bottom: none; } + } - .entry-title { - @include fluid-type($min-vw, $max-vw, 18px, 24px); - -webkit-box-ordinal-group: 2; - -ms-flex-order: 1; - order: 1; + .entry-excerpt { + /* normalize font sizes */ + > * { + font-size: 1em; } + } - .entry-excerpt, - .entry-content { - -webkit-box-ordinal-group: 4; - -ms-flex-order: 3; - order: 3; + .entry-meta { + -webkit-box-ordinal-group: 3; + -ms-flex-order: 2; + order: 2; + margin-bottom: 1em; + font-size: 0.75em; - /* remove space after last child element */ - > *:last-child { - margin-bottom: 0; - } - } - - .entry-excerpt { - /* normalize font sizes */ - > * { - font-size: 1em; - } - } - - .entry-meta { - -webkit-box-ordinal-group: 3; - -ms-flex-order: 2; - order: 2; - margin-bottom: 1em; - font-size: 0.75em; - - ul { - li { - display: inline-block; - margin-right: 1.5rem; - } - } - } - - .more-link { - margin-top: -1em; - - a { - text-decoration: none; + ul { + li { + display: inline-block; + margin-right: 1.5rem; } } } + .more-link { + margin-top: -1em; + + a { + text-decoration: none; + } + } +} .entry-content { > p:first-child { diff --git a/_sass/basically-basic/_layout.scss b/_sass/basically-basic/_layout.scss index 777445d..2bbd9c5 100644 --- a/_sass/basically-basic/_layout.scss +++ b/_sass/basically-basic/_layout.scss @@ -56,10 +56,6 @@ main { } } -.inner { - max-width: $large; -} - /* Layout specific adjustments ========================================================================== */ diff --git a/assets/images/banner.png b/assets/images/banner.png new file mode 100644 index 0000000..bd197bc Binary files /dev/null and b/assets/images/banner.png differ diff --git a/assets/images/leffat/2013.jpg b/assets/images/leffat/2013.jpg new file mode 100644 index 0000000..81407b6 Binary files /dev/null and b/assets/images/leffat/2013.jpg differ diff --git a/assets/images/leffat/2014.jpg b/assets/images/leffat/2014.jpg new file mode 100644 index 0000000..8f0a6d9 Binary files /dev/null and b/assets/images/leffat/2014.jpg differ diff --git a/assets/images/leffat/2015.jpg b/assets/images/leffat/2015.jpg new file mode 100644 index 0000000..ca98fef Binary files /dev/null and b/assets/images/leffat/2015.jpg differ diff --git a/assets/images/leffat/2016.jpg b/assets/images/leffat/2016.jpg new file mode 100644 index 0000000..e731780 Binary files /dev/null and b/assets/images/leffat/2016.jpg differ diff --git a/assets/images/leffat/2017.jpg b/assets/images/leffat/2017.jpg new file mode 100644 index 0000000..5f5d246 Binary files /dev/null and b/assets/images/leffat/2017.jpg differ diff --git a/assets/images/leffat/2018.jpg b/assets/images/leffat/2018.jpg new file mode 100644 index 0000000..1819043 Binary files /dev/null and b/assets/images/leffat/2018.jpg differ diff --git a/assets/images/leffat/2019.jpg b/assets/images/leffat/2019.jpg new file mode 100644 index 0000000..26c1b07 Binary files /dev/null and b/assets/images/leffat/2019.jpg differ diff --git a/assets/images/leffat/2020.jpg b/assets/images/leffat/2020.jpg new file mode 100644 index 0000000..a94eb71 Binary files /dev/null and b/assets/images/leffat/2020.jpg differ diff --git a/assets/images/leffat/2021.jpg b/assets/images/leffat/2021.jpg new file mode 100644 index 0000000..1020b9e Binary files /dev/null and b/assets/images/leffat/2021.jpg differ diff --git a/index.md b/index.md index eb433ce..7e769e7 100644 --- a/index.md +++ b/index.md @@ -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). -actions: - - label: "Telegram-ryhmä" - url: '/telegram' - - label: "Uusin dataleffa" - url: '/leffa' ---- \ No newline at end of file + 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" + - label: "Uusin dataleffa" + url: "/leffa" +--- diff --git a/leffat.md b/leffat.md index c9752a1..21ed283 100644 --- a/leffat.md +++ b/leffat.md @@ -3,4 +3,9 @@ title: Dataleffat layout: collection collection: leffat permalink: /leffat/ ---- \ No newline at end of file +entries_layout: grid +show_excerpts: false +show_dates: false +sort_by: title +sort_order: reverse +--- diff --git a/yhdistys.md b/yhdistys.md new file mode 100644 index 0000000..fcffdd5 --- /dev/null +++ b/yhdistys.md @@ -0,0 +1,7 @@ +--- +layout: page +title: Yhdistys +permalink: /yhdistys/ +--- + +Datat Ry on datojen yhdistys. \ No newline at end of file