From febd9eeb2391e8496352d9f223c38a0278755843 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Tue, 9 May 2017 21:45:16 +0100 Subject: [PATCH] make boxes better, again --- content/robotics/_index.md | 1 + layouts/partials/box.html | 2 +- layouts/partials/box_image.html | 4 ++-- static/src/scss/style.scss | 9 +++++++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/content/robotics/_index.md b/content/robotics/_index.md index 2e340d0..b0353ed 100644 --- a/content/robotics/_index.md +++ b/content/robotics/_index.md @@ -3,6 +3,7 @@ title: Student Robotics linktitle: Robotics image: https://farm4.staticflickr.com/3849/33683313131_6ba584094a_k_d.jpg hide_pages: false +show_images: true --- Student Robotics is the the place where my development knowledge really started to grow. Thanks to the other people in my team teaching me. I had never done anything robotics related, and so when my computing teacher initially told us about it, I wasn't really interested. After I found out that my friend was also doing it, I signed up, and went along to the kickstart. From then on I was hooked, getting involved with all aspects of the development and design, as well as helping out other teams on the IRC room. diff --git a/layouts/partials/box.html b/layouts/partials/box.html index 73e87fb..c1fcab3 100644 --- a/layouts/partials/box.html +++ b/layouts/partials/box.html @@ -3,7 +3,7 @@

{{ title .LinkTitle }}

-

{{ .Summary | truncate .Site.Params.summary_length "..." }}

+

{{ .Params.summary | default .Summary | truncate .Site.Params.summary_length "..." }}

diff --git a/layouts/partials/box_image.html b/layouts/partials/box_image.html index e548a91..0d2dc20 100644 --- a/layouts/partials/box_image.html +++ b/layouts/partials/box_image.html @@ -1,12 +1,12 @@
{{ if .Params.image }} - {{ .Title }} featured image + {{ end }}

{{ title .LinkTitle }}

-

{{ .Summary | truncate .Site.Params.summary_length "..." }}

+

{{ .Params.summary | default .Summary | truncate .Site.Params.summary_length "..." }}

diff --git a/static/src/scss/style.scss b/static/src/scss/style.scss index d4b35d1..ee7907b 100644 --- a/static/src/scss/style.scss +++ b/static/src/scss/style.scss @@ -37,7 +37,12 @@ pre code { background-position: center; background-size: cover; - &.featured.main { - height: 40vh; + &.featured { + margin-bottom: 2em !important; + height: 13em; + + &.main { + height: 40vh; + } } }