futuro 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23ddf8984048583ad72ea0b0f82ea4c4231638da8bf36703d503876bc0db52e2
-  data.tar.gz: bfb4b334eb1e028167816dc3b306e6818fda336e56fa7dd4d153ff335f31a3aa
+  metadata.gz: 56e914dc8b31e6e68f8a3bb23c26644307ddbe9fbf001ec6f626449ac9bbde86
+  data.tar.gz: 53a2cd0896e48f4ed5d3381878dc4c3808b9ede2cb85e1619ee3c70b6c427f08
 SHA512:
-  metadata.gz: 27195219bb3f06d115a9067e3bc7a1b3be0181a474f1e264edbf392e48cfed2de63f0f2ba510ac1d2d20a1878673e9440634ec25a263c1c719acd76bd282fc61
-  data.tar.gz: 270ae68ccb040a30c84b6184b4acdb87d2332c93e2df0b4eeeed8fda3f3734c886f88db476997a80c9658b69943853d4ec73a88f04162e8afeb2feb7d25e9d61
+  metadata.gz: 128279741361e8599620d2de2fafac1e9f35f6e5a9b28afeb042b10f94be01219d2bf07c3b3ee34ea876c59e8135caa0e2ce73870fda3b7e5e1d2e85fe50e2e8
+  data.tar.gz: 6a6a429e2aa606412821ea915ccbd645583917767d56a7e4ec721e0312bfaa323381e99a19d3efc59c447fdedc5c974f4ef0b2aa2deee08b33447cd1e5394e6f

data/_includes/html/head.liquid

@@ -3,10 +3,10 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="format-detection" content="telephone=no">
-  <link rel="icon" href="{{ "/assets/img/favicon.png?v=1579598899554" | relative_url }}">
+  <link rel="icon" href="{{ "/assets/img/favicon.png?v=1579785584441" | relative_url }}">
   {% seo %}
   {% feed_meta %}
-  <link rel="stylesheet" href="{{ "/assets/css/styles.css?v=1579598899554" | relative_url }}">
+  <link rel="stylesheet" href="{{ "/assets/css/styles.css?v=1579785584441" | relative_url }}">
   {% include html/analytics.liquid %}
-  <script src="{{ "/assets/js/header.min.js?v=1579598899554" | relative_url }}"></script>
+  <script src="{{ "/assets/js/header.min.js?v=1579785584441" | relative_url }}"></script>
 </head>

data/_includes/html/loop/artwork/docs.liquid

@@ -1,38 +1,26 @@
 
 <div class="code-wrap">
 
-{% for thing in loop %}
-
-  {% if thing.html %}
-
   <div class="code-html">
-    {% include {{ artwork }} %}
-  </div>
 
-  {% elsif thing.scss %}
+    {{ page.content }}
 
-  <div class="code-scss">
-    {% include {{ artwork | replace: '.html','.scss' }} %}
   </div>
 
-  {% endif %}
-
-{% endfor %}
-
-</div>
+  <div class="code-scss">
 
-<div class="output-html">
+    {% if page.collection %}
 
-{% for thing in loop %}
+      {% include {{ artwork | replace: '.html','.scss' }} %}
 
-  {% if thing.html %}
+    {% endif %}
 
-  <div class="code-html">
-    {% include {{ artwork }} %}
   </div>
 
-  {% endif %}
+</div>
+
+<div class="output-html {{ chapChap }} {{ titlTitl }}">
 
-{% endfor %}
+  {{ page.content }}
 
 </div>

data/_includes/html/page/artwork.liquid

@@ -3,14 +3,14 @@
 {% assign setup    = site.setup | prepend: 'setup-' %}
 {% assign book     = page.collection %}
 {% assign chapter  = page.chapter | replace: ' ','-' | downcase %}
-{% assign chapChap = chapter | prepend: 'chapter-' %}
+{% assign chapchap = chapter | prepend: 'chapter-' %}
 {% assign title    = page.title | replace: ' ','-' | downcase %}
-{% assign titlTitl = title | prepend: 'title-' %}
+{% assign titltitl = title | prepend: 'title-' %}
 {% assign artwork  = page.url | prepend: '/artwork' %}
 {% assign img      = page.url | prepend: '/assets/img' %}
 {% assign vid      = page.url | prepend: '/assets/vid' %}
 
-<div class="area _page-artwork {{ setup }} {{ chapChap }} {{ titlTitl }}">
+<div class="area _page-artwork {{ setup }} {{ chapchap }} {{ titltitl }}">
 
   {%- unless site.setup == 'docs' -%}
 
@@ -18,7 +18,10 @@
 
     {%- else -%}
 
-    {%- include html/loop/artwork/docs.liquid -%}
+    {% assign root    = '/artwork/' | append: page.collection %}
+    {% assign artwork = page.url | prepend: root %}
+
+    {% include html/loop/artwork/docs.liquid -%}
 
   {%- endunless -%}
 

data/_includes/html/scripts.liquid

@@ -1,2 +1,2 @@
 
-<script src="{{ "/assets/js/footer.min.js?v=1579598899554" | relative_url }}"></script>
+<script src="{{ "/assets/js/footer.min.js?v=1579785584441" | relative_url }}"></script>

data/_layouts/single.html

@@ -39,11 +39,19 @@ layout: mini
       </header>
       {% endif %}
 
-      {% unless page.type == 'home' %}
-        {% include html/page/topbar.liquid %}
-      {% endunless %}
+      {% unless page.type == 'theme' %}
+
+        {% unless page.type == 'home' %}
+          {% include html/page/topbar.liquid %}
+        {% endunless %}
+
+        {% include html/filter/type.liquid %}
 
-      {% include html/filter/type.liquid %}
+      {% else %}
+
+        {{ content }}
+
+      {% endunless %}
 
       {% if site.footer %}
       <footer>

data/_sass/_artwork.scss

@@ -1,15 +1,7 @@
 
-.colour-wrap {
-  grid-auto-flow: column;
-  display: grid;
-
-  > div {
-    height: 100px;
-  }
-
-  .orange {
-    background-color: pink;
-  }
+.thingo {
+  background-color: red;
+  min-height: 2rem;
 }
 
 .tag {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: futuro
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Paul Heading
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -89,14 +89,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- _includes/artwork/animal/flob.html
-- _includes/artwork/animal/flob.scss
-- _includes/artwork/animal/waldo.html
-- _includes/artwork/animal/waldo.scss
-- _includes/artwork/orwell/animal/flob.html
-- _includes/artwork/orwell/animal/flob.scss
-- _includes/artwork/orwell/animal/waldo.html
-- _includes/artwork/orwell/animal/waldo.scss
 - _includes/html/analytics.liquid
 - _includes/html/filter/loop.liquid
 - _includes/html/filter/type.liquid
@@ -232,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Private theme for Paul Heading

data/_includes/artwork/animal/flob.html

@@ -1,2 +0,0 @@
-
-<div class="thingo"></div>

data/_includes/artwork/animal/flob.scss

@@ -1,5 +0,0 @@
-
-.thingo {
-  background-color: red;
-  min-height: 2rem;
-}

data/_includes/artwork/animal/waldo.html

@@ -1,2 +0,0 @@
-
-<div class="dingo"></div>

data/_includes/artwork/animal/waldo.scss

@@ -1,45 +0,0 @@
-.tag {
-  &-buttons {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    font-size: 11px;
-
-    span:not(.hidden) {
-      display: inline-block;
-      color: #767676;
-    }
-
-    .tag-buttons__title {
-      padding-right: 0.5em;
-    }
-  }
-
-  &-button {
-    @extend %bold;
-    letter-spacing: normal;
-    display: inline-block;
-    max-width: 30ch;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    transition: all 0.1s;
-    border: 1px solid #767676;
-    border-radius: 11.5px;
-    text-decoration: none;
-    text-transform: uppercase;
-    padding: 5px 10px;
-    margin: 0.25em 0.5em 0.25em 0;
-
-    &:hover {
-      border-color: black;
-      color: black;
-    }
-
-    @media (min-width: 768px) {
-      font-size: 11px;
-      line-height: 13px;
-      border-radius: 12.5px;
-    }
-  }
-}

data/_includes/artwork/orwell/animal/flob.html

@@ -1,2 +0,0 @@
-
-<div class="thingo"></div>

data/_includes/artwork/orwell/animal/flob.scss

@@ -1,5 +0,0 @@
-
-.thingo {
-  background-color: red;
-  min-height: 2rem;
-}

data/_includes/artwork/orwell/animal/waldo.html

@@ -1,2 +0,0 @@
-
-<div class="dingo"></div>

data/_includes/artwork/orwell/animal/waldo.scss

@@ -1,45 +0,0 @@
-.tag {
-  &-buttons {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    font-size: 11px;
-
-    span:not(.hidden) {
-      display: inline-block;
-      color: #767676;
-    }
-
-    .tag-buttons__title {
-      padding-right: 0.5em;
-    }
-  }
-
-  &-button {
-    @extend %bold;
-    letter-spacing: normal;
-    display: inline-block;
-    max-width: 30ch;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    transition: all 0.1s;
-    border: 1px solid #767676;
-    border-radius: 11.5px;
-    text-decoration: none;
-    text-transform: uppercase;
-    padding: 5px 10px;
-    margin: 0.25em 0.5em 0.25em 0;
-
-    &:hover {
-      border-color: black;
-      color: black;
-    }
-
-    @media (min-width: 768px) {
-      font-size: 11px;
-      line-height: 13px;
-      border-radius: 12.5px;
-    }
-  }
-}