databook-theme 0.1.1 → 0.1.2

data/_includes/js/scrollspy.js

@@ -1,16 +1,16 @@
-{
-  if (!!window.databookConfig?.scrollspy) {
-    window.addEventListener('load', () => {
-      let links = Array.from(document.querySelectorAll('.c-toc__link'));
-      let headers = links.map(x => decodeURI(x.href).split('#', 2)[1]).map(x => document.getElementById(x));
-      if (links.length <= 1) return;
-      window.onscroll = () => {
-        let scrollPosition = document.documentElement.scrollTop;
-        let offsets = headers.map(x => x.offsetTop);
-        offsets = offsets.map((x, i) => x - (x - ((i == 0) ? 0 : offsets[i - 1])) * .33);
-        let target = offsets.findIndex(x => x > scrollPosition);
-        links.forEach((link, i) => link.classList.toggle('is-active', i == target - 1));
-      };
-    });
-  }
-}
+{
+  if (!!window.databookConfig?.scrollspy) {
+    window.addEventListener('load', () => {
+      let links = Array.from(document.querySelectorAll('.c-toc__link'));
+      let headers = links.map(x => decodeURI(x.href).split('#', 2)[1]).map(x => document.getElementById(x));
+      if (links.length <= 1) return;
+      window.onscroll = () => {
+        let scrollPosition = document.documentElement.scrollTop;
+        let offsets = headers.map(x => x.offsetTop);
+        offsets = offsets.map((x, i) => x - (x - ((i == 0) ? 0 : offsets[i - 1])) * .33);
+        let target = offsets.findIndex(x => x > scrollPosition);
+        links.forEach((link, i) => link.classList.toggle('is-active', i == target - 1));
+      };
+    });
+  }
+}

data/_includes/layout/article.liquid

@@ -1,71 +1,74 @@
-{%- assign pageitem = include.page | default: page -%}
-{%- assign html_content = include.content | default: pageitem.content -%}
-
-{%- assign typography = pageitem.typography | default: layout.typography | default: site.typography | default: "article" -%}
-{%- assign hide_title = pageitem.hide_title -%}
-
-{%- capture page_title -%}
-  {%- include functions/get_page_title.liquid page=pageitem -%}
-{%- endcapture -%}
-
-{%- capture page_meta -%}
-  {%- include functions/get_page_meta.liquid
-    page = pageitem
-    tags = true
-    authors = true
-    details = true
-  -%}
-{%- endcapture -%}
-
-{%- capture breadcrumb -%}
-  <div class="c-breadcrumb">
-    <span class="c-breadcrumb__item">
-      <a href="{{- '/' | relative_url -}}">{%- include localize key="title_home" default="Home" -%}</a>
-    </span>
-    {%- for category in pageitem.categories -%}
-      <span class="c-breadcrumb__item">
-        <a href="{%- include functions/get_taxonomy_link.liquid category=category -%}">{{- category -}}</a>
-      </span>
-    {%- endfor -%}
-  </div>
-{%- endcapture -%}
-
-{%- capture page_header -%}
-{%- unless hide_title -%}
-  {%- include components/title.liquid
-    breadcrumb = breadcrumb
-    title = page_title
-    url = pageitem.url
-    meta = page_meta
-  -%}
-{%- endunless -%}
-{%- endcapture -%}
-
-{%- assign has_side = include.has_side -%}
-{%- assign page_side = false -%}
-{%- if has_side -%}
-  {%- capture page_side -%}
-    {%- include components/toc.liquid html=html_content -%}
-  {%- endcapture -%}
-{%- endif -%}
-
-{%- capture page_content -%}
-  {%- if pageitem.thumbnail -%}
-    <img class="c-thumbnail" src="{{- pageitem.thumbnail -}}" />
-  {%- endif -%}
-  {{- html_content -}}
-{%- endcapture -%}
-
-{%- capture page_footer -%}
-  {%- include components/prevnext.liquid -%}
-{%- endcapture -%}
-
-{%- include layout/page.liquid
-  type = "article"
-  src = pageitem.url
-  header = page_header
-  content = page_content
-  side = page_side
-  footer = page_footer
-  typography = typography
--%}
+{%- assign pageitem = include.page | default: page -%}
+{%- assign html_content = include.content | default: pageitem.content | markdownify -%}
+
+{%- assign typography = include.typography | default: pageitem.typography | default: layout.typography | default: site.typography | default: "article" -%}
+{%- assign hide_title = include.hide_title | default: pageitem.hide_title -%}
+
+{%- capture page_title -%}
+  {%- include functions/get_page_title.liquid page=pageitem -%}
+{%- endcapture -%}
+
+{%- capture page_meta -%}
+  {%- include functions/get_page_meta.liquid
+    page = pageitem
+    tags = true
+    authors = true
+    details = true
+  -%}
+{%- endcapture -%}
+
+{%- capture breadcrumb -%}
+  <div class="c-breadcrumb">
+    <span class="c-breadcrumb__item">
+      <a href="{{- '/' | relative_url -}}">{%- include localize key="title_home" default="Home" -%}</a>
+    </span>
+    {%- for category in pageitem.categories -%}
+      <span class="c-breadcrumb__item">
+        <a href="{%- include functions/get_taxonomy_link.liquid category=category -%}">{{- category -}}</a>
+      </span>
+    {%- endfor -%}
+  </div>
+{%- endcapture -%}
+
+{%- capture page_header -%}
+{%- unless hide_title -%}
+  {%- include components/title.liquid
+    breadcrumb = breadcrumb
+    title = page_title
+    url = pageitem.url
+    meta = page_meta
+  -%}
+{%- endunless -%}
+{%- endcapture -%}
+
+{%- assign has_side = include.has_side -%}
+{%- assign page_side = false -%}
+{%- if has_side -%}
+  {%- capture page_side -%}
+    {%- include components/toc.liquid html=html_content -%}
+  {%- endcapture -%}
+{%- endif -%}
+
+{%- capture page_content -%}
+  {%- assign thumbnail_src = pageitem.thumbnail | default: pageitem.image.path | default: pageitem.image -%}
+  {%- if thumbnail_src -%}
+    <div class="c-thumbnail">
+      <img src="{{- thumbnail_src -}}" />
+    </div>
+  {%- endif -%}
+  {{- html_content -}}
+{%- endcapture -%}
+
+{%- capture page_footer -%}
+  {%- include components/prevnext.liquid -%}
+{%- endcapture -%}
+
+{%- include layout/page.liquid
+  type = "article"
+  src = pageitem.url
+  header = page_header
+  content = page_content
+  side = page_side
+  footer = page_footer
+  typography = typography
+-%}

data/_includes/layout/footer.liquid

@@ -1,53 +1,53 @@
-{%- assign footer_data = include.data -%}
-
-{%- comment -%}todo: existence check{%- endcomment -%}
-{%- assign custom_footer_file = footer_data.custom_file | default: "custom/footer.liquid" -%}
-{%- capture custom_footer -%}
-  {%- include {{custom_footer_file}} -%}
-{%- endcapture -%}
-{%- assign custom_size = custom_footer | strip | strip_newlines | size -%}
-
-<footer class="l-footer">
-  {%- if custom_size > 0 -%}
-  <div class="l-footer__custom">
-    {{- custom_footer -}}
-  </div>
-  {%- endif -%}
-
-  {%- if footer_data.text -%}
-  <div class="l-footer__text">
-    {{- footer_data.text -}}
-  </div>
-  {%- endif -%}
-
-  <div class="l-footer__left">
-    <div class="c-footer-list">
-      {%- if footer_data.copyright or site.copyright -%}
-        <div class="c-footer-list__item">
-          {{- footer_data.copyright | default: site.copyright | markdownify | remove: "<p>" | remove: "</p>" -}}
-        </div>
-      {%- endif -%}
-      {%- if footer_data.links -%}
-      {%- for item in footer_data.links -%}
-        <div class="c-footer-list__item">
-        {%- if item.url -%}<a href="{{ item.url }}">{%- endif -%}
-          {{- item.text -}}
-        {%- if item.url -%}</a>{%- endif -%}
-        </div>
-      {%- endfor -%}
-      {%- endif -%}
-    </div>
-  </div>
-
-  <div class="l-footer__middle">
-  </div>
-
-  <div class="l-footer__right">
-    {%- if footer_data.provider or site.provider -%}
-      {{- footer_data.provider | default: site.provider | markdownify | remove: "<p>" | remove: "</p>" -}}
-    {%- else -%}
-      Powered by <a href="https://jekyllrb.com" rel="nofollow">Jekyll</a> &amp; <a href="https://github.com/fortelle/databook-theme" rel="nofollow">Databook</a>
-    {%- endif -%}
-  </div>
-
-</footer>
+{%- assign footer_data = include.data -%}
+
+{%- comment -%}todo: existence check{%- endcomment -%}
+{%- assign custom_footer_file = footer_data.custom_file | default: "custom/footer.liquid" -%}
+{%- capture custom_footer -%}
+  {%- include {{custom_footer_file}} -%}
+{%- endcapture -%}
+{%- assign custom_size = custom_footer | strip | strip_newlines | size -%}
+
+<footer class="l-footer">
+  {%- if custom_size > 0 -%}
+  <div class="l-footer__custom">
+    {{- custom_footer -}}
+  </div>
+  {%- endif -%}
+
+  {%- if footer_data.text -%}
+  <div class="l-footer__text">
+    {{- footer_data.text -}}
+  </div>
+  {%- endif -%}
+
+  <div class="l-footer__left">
+    <div class="c-footer-list">
+      {%- if footer_data.copyright or site.copyright -%}
+        <div class="c-footer-list__item">
+          {{- footer_data.copyright | default: site.copyright | markdownify | remove: "<p>" | remove: "</p>" -}}
+        </div>
+      {%- endif -%}
+      {%- if footer_data.links -%}
+      {%- for item in footer_data.links -%}
+        <div class="c-footer-list__item">
+        {%- if item.url -%}<a href="{{ item.url }}">{%- endif -%}
+          {{- item.text -}}
+        {%- if item.url -%}</a>{%- endif -%}
+        </div>
+      {%- endfor -%}
+      {%- endif -%}
+    </div>
+  </div>
+
+  <div class="l-footer__middle">
+  </div>
+
+  <div class="l-footer__right">
+    {%- if footer_data.provider or site.provider -%}
+      {{- footer_data.provider | default: site.provider | markdownify | remove: "<p>" | remove: "</p>" -}}
+    {%- else -%}
+      Powered by <a href="https://jekyllrb.com" rel="nofollow">Jekyll</a> &amp; <a href="https://github.com/fortelle/databook-theme" rel="nofollow">Databook</a>
+    {%- endif -%}
+  </div>
+
+</footer>

data/_includes/layout/header.liquid

@@ -1,31 +1,31 @@
-{%- assign header_data = include.data -%}
-
-<header class="l-header {%- if header_data.sticky %} l-header--sticky{%- endif -%}">
-
-  <div class="l-header__left">
-    {%- if include.has_sidebar -%}
-      <label class="c-navbutton c-navbutton--sidebar" for="sidebar-toggler"></label>
-    {%- endif -%}
-
-    {%- if header_data.left_menu -%}
-      {%- include components/navmenu.liquid data=header_data.left_menu -%}
-    {%- endif -%}
-  </div>
-
-  <div class="l-header__logo">
-    <a class="c-logo" href="{{- '/' | relative_url -}}">
-      <img class="c-logo__image" src="{{- header_data.logo_url | default: site.logo | relative_url -}}" alt="Logo" />
-      <span class="c-logo__text">{{- header_data.logo_text | default: site.title | escape -}}</span>
-    </a>
-  </div>
-
-  <div class="l-header__right">
-    {%- if site.search -%}
-      {%- include components/search.liquid -%}
-    {%- endif -%}
-    {%- if header_data.right_menu -%}
-      {%- include components/navmenu.liquid data=header_data.right_menu is_right=true -%}
-    {%- endif -%}
-  </div>
-
-</header>
+{%- assign header_data = include.data -%}
+
+<header class="l-header {%- if header_data.sticky %} l-header--sticky{%- endif -%}">
+
+  <div class="l-header__left">
+    {%- if include.has_sidebar -%}
+      <label class="c-navbutton c-navbutton--sidebar" for="sidebar-toggler"></label>
+    {%- endif -%}
+
+    {%- if header_data.left_menu -%}
+      {%- include components/navmenu.liquid data=header_data.left_menu -%}
+    {%- endif -%}
+  </div>
+
+  <div class="l-header__logo">
+    <a class="c-logo" href="{{- '/' | relative_url -}}">
+      <img class="c-logo__image" src="{{- header_data.logo_url | default: site.logo | relative_url -}}" alt="Logo" />
+      <span class="c-logo__text">{{- header_data.logo_text | default: site.title | escape -}}</span>
+    </a>
+  </div>
+
+  <div class="l-header__right">
+    {%- if site.search -%}
+      {%- include components/search.liquid -%}
+    {%- endif -%}
+    {%- if header_data.right_menu -%}
+      {%- include components/navmenu.liquid data=header_data.right_menu is_right=true -%}
+    {%- endif -%}
+  </div>
+
+</header>

data/_includes/layout/hero.liquid

@@ -1,29 +1,29 @@
-{%- assign hero_data = include.data -%}
-
-{%- assign hero_style = "" -%}
-{%- if hero_data.image -%}
-  {%- assign hero_style = hero_style | append: "background-image: url(" | append: hero_data.image | append: ");" -%}
-{%- endif -%}
-{%- if hero_data.height -%}
-  {%- assign hero_style = hero_style | append: "height: " | append: hero_data.height | append: ";" -%}
-{%- endif -%}
-
-<div class="l-hero {%- if hero_data.overflow %} l-hero--overflow{%- endif -%}">
-  <div class="c-hero" style="{{- hero_style -}}">
-    {%- if hero_data.title -%}
-      <div class="c-hero__title">
-        {{- hero_data.title -}}
-      </div>
-    {%- endif -%}
-    {%- if hero_data.description -%}
-      <div class="c-hero__description">
-        {{- hero_data.description -}}
-      </div>
-    {%- endif -%}
-    {%- if hero_data.links -%}
-      <div class="c-hero__links">
-        {{- hero_data.links -}}
-      </div>
-    {%- endif -%}
-  </div>
-</div>
+{%- assign hero_data = include.data -%}
+
+{%- assign hero_style = "" -%}
+{%- if hero_data.image -%}
+  {%- assign hero_style = hero_style | append: "background-image: url(" | append: hero_data.image | append: ");" -%}
+{%- endif -%}
+{%- if hero_data.height -%}
+  {%- assign hero_style = hero_style | append: "height: " | append: hero_data.height | append: ";" -%}
+{%- endif -%}
+
+<div class="l-hero {%- if hero_data.overflow %} l-hero--overflow{%- endif -%}">
+  <div class="c-hero" style="{{- hero_style -}}">
+    {%- if hero_data.title -%}
+      <div class="c-hero__title">
+        {{- hero_data.title -}}
+      </div>
+    {%- endif -%}
+    {%- if hero_data.description -%}
+      <div class="c-hero__description">
+        {{- hero_data.description -}}
+      </div>
+    {%- endif -%}
+    {%- if hero_data.links -%}
+      <div class="c-hero__links">
+        {{- hero_data.links -}}
+      </div>
+    {%- endif -%}
+  </div>
+</div>

data/_includes/layout/page.liquid

@@ -1,33 +1,33 @@
-{%- capture page_header -%}
-  {%- unless include.hide_title -%}
-    <div class="l-page__header">
-      {%- if include.header -%}
-        {{- include.header -}}
-      {%- elsif include.title -%}
-        {%- include components/title.liquid
-          title = include.title
-        -%}
-      {%- endif -%}
-    </div>
-  {%- endunless -%}
-{%- endcapture -%}
-
-<div class="l-page" {%- if include.type %} data-type="{{include.type}}"{%- endif -%} {%- if include.src %} data-src="{{include.src}}"{%- endif -%}>
-
-  {{- page_header | strip_newlines -}}
-
-  {%- if include.side -%}
-    <div class="l-page__side" >
-      {{- include.side | strip_newlines -}}
-    </div>
-  {%- endif -%}
-
-  <div class="l-page__content {%- if include.typography %} l-typography l-typography--{{include.typography}}{%- endif -%}" >
-    {{- include.content -}}
-  </div>
-
-  <div class="l-page__footer">
-    {{- include.footer | strip_newlines -}}
-  </div>
-
-</div>
+{%- capture page_header -%}
+  {%- unless include.hide_title -%}
+    <div class="l-page__header">
+      {%- if include.header -%}
+        {{- include.header -}}
+      {%- elsif include.title -%}
+        {%- include components/title.liquid
+          title = include.title
+        -%}
+      {%- endif -%}
+    </div>
+  {%- endunless -%}
+{%- endcapture -%}
+
+<div class="l-page" {%- if include.type %} data-type="{{include.type}}"{%- endif -%} {%- if include.src %} data-src="{{include.src}}"{%- endif -%}>
+
+  {{- page_header | strip_newlines -}}
+
+  {%- if include.side -%}
+    <div class="l-page__side" >
+      {{- include.side | strip_newlines -}}
+    </div>
+  {%- endif -%}
+
+  <div class="l-page__content {%- if include.typography %} l-typography l-typography--{{include.typography}}{%- endif -%}" >
+    {{- include.content -}}
+  </div>
+
+  <div class="l-page__footer">
+    {{- include.footer | strip_newlines -}}
+  </div>
+
+</div>

data/_includes/layout/pagehead.liquid

@@ -1,17 +1,17 @@
-<div class="c-pagehead">
-  <div class="c-pagehead__breadcrumb">{{- include.breadcrumb -}}</div>
-  
-  <h1 class="c-pagehead__title">
-    <a href="{{ include.url | relative_url }}">
-      {{- include.title -}}
-    </a>
-  </h1>
-
-  <div class="c-pagehead__right">
-  </div>
-  <div class="c-pagehead__tagline">{{- include.tagline | markdownify -}}</div>
-
-  <div class="c-pagehead__divider"></div>
-  <div class="c-pagehead__meta">{{- include.meta -}}</div>
-  <div class="c-pagehead__indicator">{{- include.indicator -}}</div>
-</div>
+<div class="c-pagehead">
+  <div class="c-pagehead__breadcrumb">{{- include.breadcrumb -}}</div>
+  
+  <h1 class="c-pagehead__title">
+    <a href="{{ include.url | relative_url }}">
+      {{- include.title -}}
+    </a>
+  </h1>
+
+  <div class="c-pagehead__right">
+  </div>
+  <div class="c-pagehead__tagline">{{- include.tagline | markdownify -}}</div>
+
+  <div class="c-pagehead__divider"></div>
+  <div class="c-pagehead__meta">{{- include.meta -}}</div>
+  <div class="c-pagehead__indicator">{{- include.indicator -}}</div>
+</div>