futuro 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7faef02b932cf458c8f7e9575242e399d52496e50d2ec54263d751ada95a9d59
-  data.tar.gz: 227abe50196205041e802f04e819fb6ae124e791ea760bce1435a8581e45022d
+  metadata.gz: 88bfbc1f3328ee5154dc064ddfb904f9ebf4435ec7bb8d6413eaf65402652c1b
+  data.tar.gz: dfc3cb8a14cdaad18071aed49a3b9cee2b46aae6f6cfdece90a9d424342caf5c
 SHA512:
-  metadata.gz: fe7eca043f83a4145bf4adf84fcb22387d89d88a3e2750e7fec813b6ca9784231ed46402d06b002c0358cc0279925939c06aa6b6919c7c8c7ec53124e561e79d
-  data.tar.gz: 31e2100d224dae603fba53b51ce3161dfbb75540f3efbae712415dedf9aa0946c62e15d4595389ed17cfaaa7d4f5dfbdf557e143b0885d87ba2e310341761521
+  metadata.gz: f710a9862db4ae7662529f4c3c005790e0f9274e95ead6986d2d8cd8d33387978567b9d446f26707f2761a19028f4b22b082f28395398aa0107504c2d0ea4069
+  data.tar.gz: ecc6c7f000e1e2ae93edbce99504424c6cab9249b8b54d3a8f05d7155857f79c38af0591fc8e480c8f6907d93dec4bda4262f9e196d78befb2ec0cf86417ee85

data/_includes/html/overlay/browse/chapter.liquid

@@ -17,8 +17,8 @@
 
         {% for item in loop %}
 
-          {% assign ItemBook    = item.collection | replace : ' ','' | downcase %}
-          {% assign ItemChapter = item.chapter    | replace : ' ','' | downcase %}
+          {% assign ItemBook    = item.collection | replace : ' ','-' | downcase %}
+          {% assign ItemChapter = item.chapter    | replace : ' ','-' | downcase %}
           {% assign ItemUrl     = item.url        | replace : '/index.html','' %}
           {% assign ItemWeight  = item.weight     | slice : 0,3 %}
 

data/_includes/html/overlay/browse/page.liquid

@@ -11,7 +11,7 @@
 
       {% assign loop = site[item.label] | sort: 'weight' %}
 
-      {% assign ItemBook = item.label | replace : ' ','' | downcase %}
+      {% assign ItemBook = item.label | replace : ' ','-' | downcase %}
 
       <div class="block browse-book {{ ItemBook | prepend : 'book-' }}">
 
@@ -19,13 +19,13 @@
 
           {%- if item.type == 'chapter' -%}
 
-            {% assign ItemChapter = item.chapter | replace: ' ','' | downcase %}
+            {% assign ItemChapter = item.chapter | replace: ' ','-' | downcase %}
 
             <div class="block browse-chapter {{ ItemChapter | prepend : 'chapter-' }}">
 
               {% for item in loop %}
 
-                {% assign QueryChapter = item.chapter | replace: ' ','' | downcase %}
+                {% assign QueryChapter = item.chapter | replace: ' ','-' | downcase %}
 
                 {%- if item.type == 'page' -%}
 
@@ -33,7 +33,7 @@
 
                     {% if QueryChapter == ItemChapter %}
 
-                      {% assign ItemTitle  = item.title   | replace : ' ','' | downcase %}
+                      {% assign ItemTitle  = item.title   | replace : ' ','-' | downcase %}
                       {% assign ItemUrl    = item.url     | replace : '.html','' %}
                       {% assign ItemWeight = item.weight  | slice : 0,5 %}
                       {% assign SplitUrl   = ItemUrl      | split : '/' %}

data/_includes/html/overlay/load.liquid

@@ -5,7 +5,7 @@
 
 <script type="text/javascript">
 
-SiteTl
+Site.tl
 .set(Target(1),SwitchOn("red"))
 .set(Target(1),SwitchOff())
 .set(Target(2),SwitchOn("blue"))

data/_includes/html/page/content/area.liquid

@@ -0,0 +1,17 @@
+
+{% if page.area.pies %}
+
+<ul class="list pies style-snap">
+
+  {% for item in page.area.pies %}     
+
+    {% include {{ ContentLoop | append : 'pies/create.liquid' }} 
+                  value = 0
+                  style = "snap"
+                  title = item.title %}
+    
+  {% endfor %}
+
+</ul>    
+
+{% endif %}

data/_includes/html/page/content/loop/checkbox.liquid

@@ -0,0 +1,29 @@
+
+{% assign title    = include.title %}
+{% assign small    = include.small %}
+{% assign subtitle = include.subtitle %}
+{% assign label    = title | replace: ' ','-' | downcase %}
+
+{% if include.form %}<p class="block form-row checkbox-row">{% endif %}
+
+<span class="checkbox-wrap {% if include.nolabel %}nolabel{% endif %}">
+
+  {%- include {{ LoopForm | append : 'input.liquid' }}
+                 type  = "checkbox"
+                 id    = label
+                 name  = label
+                 value = "yes"
+                 class = "checkbox-input" -%}
+
+  {%- include {{ LoopForm | append : 'label.liquid' }}
+                 title    = title
+                 for      = label
+                 small    = small
+                 subtitle = subtitle
+                 class    = "checkbox-label" -%}
+
+</span>
+
+{% if include.form %}</p>{% endif %}
+
+

data/_includes/html/page/content/loop/form/input.liquid

@@ -1,7 +1,7 @@
 
 <input {% if include.class %}class="{{ include.class }}"{% endif %}
-       type="{{ include.type }}"
-       id="{{ include.id }}"
-       name="{{ include.name }}"
-       value="{{ include.value }}"
+          type  = "{{ include.type }}"
+          id    = "{{ include.id }}"
+          name  = "{{ include.name }}"
+          value = "{{ include.value }}"
        {% if include.placeholder %}placeholder="{{ include.placeholder }}"{% endif %}>

data/_includes/html/page/content/loop/form/text.liquid

@@ -1,45 +1,40 @@
 
-{%- if context == "legend" -%}
+{% if context == "legend" %}
 
-  <!-- <span class="block legend-row">
-
-    <span><strong>{{ item.text }}</strong></span>
-
-  </span> -->
-
-{%- else -%}
+{% else %}
 
   <p class="block form-row text-row">
 
-    {% assign parent = item.text %}
-    {% assign for = parent | replace: ' ','-' | downcase %}
+    {% assign parent = item.text | replace: ' ','-' %}
+    {% assign unique = PageChapter | append : '-' | append : PageTitle %}
+    {% assign for = unique | append : '-' | append : parent | downcase %}
 
-    {%- include {{ LoopForm | append : 'label.liquid' }}
-                for=for
-                title=item.text
-                small=item.small
-                class="form-label" -%}
+    {% include {{ LoopForm | append : 'label.liquid' }}
+                  for   = for
+                  title = item.text
+                  small = item.small
+                  class = "form-label" %}
 
     <span class="textinput-wrap {% if item.stub %}stub{% endif %}">
 
       <span class="textinput-border">
 
-        {%- include {{ LoopForm | append : 'input.liquid' }}
-                    type="text"
-                    id=for
-                    name="name"
-                    class="text-input" -%}
+        {% include {{ LoopForm | append : 'input.liquid' }}
+                      type  = "text"
+                      id    = for
+                      name  = "name"
+                      class = "text-input" %}
 
       </span>
 
-      {%- if item.inline -%}
+      {% if item.inline %}
 
         <small>{{ item.inline }}</small>
 
-      {%- endif -%}
+      {% endif %}
 
     </span>
 
   </p>
 
-{%- endif -%}
+{% endif %}

data/_includes/html/page/content/loop/form.liquid

@@ -57,7 +57,10 @@
 
 {%- elsif item.checkbox -%}
 
-  {%- include {{ LoopForm | append : 'checkbox.liquid' }} -%}
+  {%- include {{ ContentLoop | append : 'checkbox.liquid' }} 
+                 title   = item.checkbox 
+                 form    = true
+                 nolabel = true -%}
 
 {%- elsif item.button -%}
 

data/_includes/html/page/content/loop/header/search.liquid

@@ -1,9 +1,11 @@
 
+{% assign unique = PageChapter | append : '-' | append : PageTitle %}
+
 <div class="block search-form">
 
   {%- include {{ LoopForm | append : 'input.liquid' }}
               type        = "text"
-              id          = "search-text"
+              id          = unique
               placeholder = page.header.search
               class       = "search-input" -%}
 

data/_includes/html/page/content/loop/pies/create.liquid

@@ -0,0 +1,48 @@
+
+{% assign PiePath  = include.title | prepend : '/' | replace : ' ','-' | append : '.svg' | downcase %}
+
+{% assign PiePathB = include.title | prepend : '/' | replace : ' ','-' | append : '-B.svg' | downcase %}
+
+{% assign PieStyle = include.style | prepend : 'style-' %}
+
+<li class="item pie {{ PieStyle }}">
+
+  <span class="title pie-pcent"><span>{{ include.value }}</span>%</span>
+
+  <span class="block pie-wrap {{ PieStyle }}">
+
+    {% if include.style == "spin" %}
+
+      <span class="block pie-svg pie-svg-bg">
+
+        {% include {{ SvgIcon }} type="pie" %}
+  
+      </span>
+      
+    {% endif %}
+
+    <span class="block pie-svg pie-svg-data {{ PieStyle }}">
+
+      {% include {{ PageArtwork | append : PiePath }} %}
+
+    </span>
+
+    {% if include.style == "spin" %}
+
+      {% if include.value > 50 %}
+
+        <span class="block pie-svg pie-svg-data {{ PieStyle }}">
+
+          {% include {{ PageArtwork | append : PiePathB }} %}
+
+        </span>
+
+      {% endif %}
+      
+    {% endif %}
+
+  </span>
+
+  <span class="title pie-title {{ PieStyle }}">{{ include.title }}</span>
+
+</li>

data/_includes/html/page/content/loop/pies.liquid

@@ -1,42 +1,5 @@
 
-{% assign ItemTitle = item.title | replace : ' ','-' | prepend : '/' | downcase %}
-
-{% assign ItemUrl = PageUrl | prepend : 'artwork/' | append : ItemTitle %}
-
-<li class="item pie">
-
-  <span class="title pie-pcent"><span>{{ item.value }}</span>%</span>
-
-  <span class="block pie-wrap">
-
-    <span class="block pie-svg pie-svg-bg">
-
-     {%- include {{ SvgIcon }} type="pie" -%}
-
-    </span>
-
-    <span class="block pie-svg pie-svg-data">
-
-      {%- unless item.value == 0 -%}
-
-        {%- include {{ ItemUrl | append : '.svg' }} -%}
-
-      {%- endunless -%}
-
-    </span>
-
-    {%- if item.value > 50 -%}
-
-      <span class="block pie-svg pie-svg-data">
-
-        {%- include {{ ItemUrl | append : '-B.svg' }} -%}
-
-      </span>
-
-    {%- endif -%}
-
-  </span>
-
-  <span class="title pie-title">{{ item.title }}</span>
-
-</li>
+{% include {{ ContentLoop | append : 'pies/create.liquid' }} 
+              value = item.value
+              style = "spin"
+              title = item.title %}

data/_includes/html/page/content/loop.liquid

@@ -5,6 +5,6 @@
 
 {% for item in loop %}
 
-  {%- include {{ ContentLoop | append : fetch }} context=include.type -%}
+  {%- include {{ ContentLoop | append : fetch }} context = include.type -%}
 
 {% endfor %}

data/_includes/html/page/content/row.liquid

@@ -1,11 +1,11 @@
 
 {% assign RowType = page.row.type %}
 
-{%- if RowType == "header" -%}
+{% if RowType == "header" %}
 
   <span class="block screen-row {{ page.row.type | prepend : 'type-' }}">
 
-    {%- if page.row.title -%}
+    {% if page.row.title %}
 
       <span class="block screen-title">
 
@@ -13,9 +13,9 @@
 
       </span>
 
-    {%- endif -%}
+    {% endif %}
 
-    {%- if page.row.time -%}
+    {% if page.row.time %}
 
       <span class="block screen-title small">
 
@@ -23,22 +23,22 @@
 
       </span>
 
-    {%- endif -%}
+    {% endif %}
 
   </span>
 
-{%- elsif RowType == "alert" -%}
+{% elsif RowType == "alert" %}
 
-  {%- include {{ LoopAlert | append : 'create.liquid' }}
+  {% include {{ LoopAlert | append : 'create.liquid' }}
                  context = "screen"
-                 title = page.row.title -%}
+                 title = page.row.title %}
 
-{%- elsif RowType == "event" or
-          RowType == "retail" -%}
+{% elsif RowType == "event" or
+          RowType == "retail" %}
 
     <span class="block screen-row {{ page.row.type | prepend : 'type-' }}">
 
-      {%- if page.row.time -%}
+      {% if page.row.time %}
 
         <span class="block screen-title small">
 
@@ -46,25 +46,25 @@
 
         </span>
 
-      {%- endif -%}
+      {% endif %}
 
-      {%- if page.row.title -%}
+      {% if page.row.title %}
 
         <span class="block screen-title">
 
           {{ page.row.title }}
 
-          {%- if page.row.cert -%}
+          {% if page.row.cert %}
 
             <sup>{{ page.row.cert }}</sup>
 
-          {%- endif -%}
+          {% endif %}
 
         </span>
 
-      {%- endif -%}
+      {% endif %}
 
-      {%- if page.row.subtitle -%}
+      {% if page.row.subtitle %}
 
         <span class="block screen-title small">
 
@@ -72,11 +72,11 @@
 
         </span>
 
-      {%- endif -%}
+      {% endif %}
 
     </span>
 
-{%- elsif page.row.type == "yousaved" -%}
+{% elsif RowType == "yousaved" %}
 
   <span class="block form-alert title-you-saved">
 
@@ -90,4 +90,4 @@
 
   </span>
 
-{%- endif -%}
+{% endif %}

data/_includes/html/page/content.liquid

@@ -18,8 +18,7 @@
 
   {%- endunless -%}
 
-  <div class="area this? {{ PageTitle | prepend : 'title-' }} {{ PageType }}
-              {% if site.setup.style %}{{ SiteStyle }}{% endif %}
+  <div class="area {{ PageType }} {{ SiteStyle }} {{ PageTitle | prepend : 'title-' }}
               {% unless NoSubtitle %}has-subtitle{% endunless %}
               {% if page.row %} has-row {% endif %}
               {% if page.pies %}is-pie{% endif %}">
@@ -67,7 +66,7 @@
 
   {%- if page.pies -%}
 
-    <ul class="list pies">
+    <ul class="list pies style-spin">
 
       {%- include {{ SiteContent | append : 'loop.liquid' }} type="pies" -%}
 
@@ -151,6 +150,13 @@
 
   {%- endif -%}
 
+  {%- if page.checkbox -%}
+
+    {%- include {{ ContentLoop | append : 'checkbox.liquid' }} 
+                   title = page.checkbox -%}
+
+  {%- endif -%}
+
   {%- if SiteIsDocs -%}
 
     {%- if page.content -%}

data/_includes/html/page/layout/page.liquid

@@ -5,11 +5,9 @@
 
   </div>
 
-  {%- if page.row -%}
+  {%- if page.area -%}
 
-    <!-- <div class="area {{ PageType }} row-content">
-       include {{ ContentLoop }} type="row" -%}
-    </div> -->
+    {%- include {{ SiteContent | append : 'area.liquid' }} -%}
 
   {%- endif -%}
 

data/_includes/html/page/title/create.liquid

@@ -0,0 +1,38 @@
+
+<div class="title {{ PageType }} {{ SiteStyle }} {% if SiteIsShare %}is-shareable{% endif %}">
+
+  {% if PageIsChapter %}
+
+    {{ ChapterSplit }}
+
+  {% else %}
+
+    {% unless SiteIsDocs %}
+
+      {{ page.title | truncate: 13 }}
+
+      {% if SiteIsShare %}
+
+        {% include {{ SiteUtil | append : 'share.liquid' }} %}
+          
+      {% endif %}
+
+    {% else %}
+
+      {{ page.title }}      
+      
+    {% endunless %}   
+
+  {% endif %}
+
+  {% if SiteIsDocs %}
+
+    {% if SiteIsShare %}
+
+      {% include {{ SiteUtil | append : 'share.liquid' }} %}
+        
+    {% endif %}
+    
+  {% endif %}
+
+</div>

data/_includes/html/page/title.liquid

@@ -5,26 +5,8 @@
 
     <div class="wrap title-wrap {{ PageType }} {{ SiteStyle }} {% if SiteIsShare %}is-shareable{% endif %}">
 
-      <h5 class="title {{ PageType }} {{ SiteStyle }} {% if SiteIsShare %}is-shareable{% endif %}">
+      {% include {{ SitePage | append: 'title/create.liquid' }} %}      
 
-        {% if PageIsChapter %}
-
-          {{ ChapterSplit }}
-
-        {% else %}
-
-          {{ page.title }}
-
-        {% endif %}
-
-        {% if SiteIsShare %}
-
-          {% include {{ SiteUtil | append : 'share.liquid' }} %}
-            
-        {% endif %}
-
-      </h5>
-      
       {% unless PageIsChapter %}
 
         {%- if page.score -%}
@@ -35,7 +17,7 @@
 
           </div>
 
-        {%- endif -%}      
+        {%- endif -%}
 
       {% endunless %}
       
@@ -43,19 +25,7 @@
 
   {%- else -%}
 
-    <h3 class="title {{ PageType }}">
-
-      {%- if PageIsChapter -%}
-
-        {{ ChapterSplit }}
-
-      {% else %}
-
-        {{ page.title | truncate: 13 }}
-
-      {%- endif -%}
-
-    </h3>
+    {% include {{ SitePage | append: 'title/create.liquid' }} %}
 
   {%- endif -%}
 

data/_sass/area/page.scss

@@ -50,7 +50,8 @@ $AreaSub : $AreaHeight - $SubHeight;
   }
 
   &.is-pie {
-    height: $PieHeight;
+    align-items: center;
+    display: grid;
   }
 }
 
@@ -59,15 +60,6 @@ $AreaSub : $AreaHeight - $SubHeight;
   display: grid;
 }
 
-// .area.type-page.tag-cheatsheet h1 {
-//   margin-bottom: 40px;
-// }
-//
-// .area.type-page.style-docs {
-//   grid-row-gap: 20px;
-// }
-//
-// .area.type-page.row-page {
-//   grid-auto-rows: min-content;
-//   grid-gap: 0;
-// }
+.tag-150 .area.type-page.style-page {
+  height: 150px;
+}

data/_sass/area/topbar.scss

@@ -1,8 +1,6 @@
 
 .area.topbar {
   @include zeros;
-  padding-right: map-get($topbar,padding);
-  padding-left: map-get($topbar,padding);
   height: map-get($topbar,height);
   border-bottom: $NavBorder;
   background-color: white;
@@ -12,6 +10,8 @@
   z-index: 4;
 
   @media#{map-get($query,min768)} {
+    padding-right: map-get($topbar,padding);
+    padding-left: map-get($topbar,padding);
     grid-template-columns: 1fr auto 1fr;
   }
-}
+}

data/_sass/block/alert.scss

@@ -6,3 +6,9 @@
   display: block;
   color: white;
 }
+
+.block.alert-content.modify-grid {
+  grid-auto-flow: column;
+  grid-gap: 100px;
+  display: grid;
+}

data/_sass/block/form/checkbox.scss

@@ -22,7 +22,9 @@ input[type="checkbox"] {
 .checkbox-wrap {
   position: relative;
   display: grid;
+}
 
+.nolabel {
   @media#{map-get($query,min768)} {
     grid-column: 2 / 3;
   }
@@ -30,13 +32,14 @@ input[type="checkbox"] {
 
 .checkbox-label {
   @include padding($t:3.5,$b:2.5,$l:10);
-  @include color($tint:80%);
   @include borderRad;
-  @include border;
+  border: 1px solid setcolor(slate,light);
+  color: setcolor(slate);
   cursor: pointer;
 
   &:hover {
-    @include borderCol($tint:50%);
-    @include bg;
+    background-color: setcolor(slate,xlight);
   }
 }
+
+