futuro 1.0.6 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f18621e9a71dfc8632878a3473280efc990d5ecf5425f67235b5d3d1fc773e
-  data.tar.gz: 10d0aaba16fd36fff183c516bf1609140624b49e1a0f1e590457dd59531246f1
+  metadata.gz: dfe204f9bed52d33c96c48701fcaa8971ecea1b8ced20063f7b3d5bdbe03ae70
+  data.tar.gz: eaf647eb08fcf3605f1892ee1dbdbb89268078476edade43125246bae495abcb
 SHA512:
-  metadata.gz: 2ab95805e45cb05eae6645607e06d825b19c861366a7e1523f807b62715fe1ca8bdee1df84d3953a2cb1fcda3d1be02f57949aa5349fb60ce4179719d7ea0cfd
-  data.tar.gz: 78545dda537062b21b2a165fc64a954e4871a4f3827f9407f633418a7948baf7ca2697b12c71a979151646f4cb56922a61cd24d77c4632ac7bb01ea7c6814055
+  metadata.gz: 93819f8e40f4519407b69ae78c2506337387a334c54a898a09184598ac3c07f6a7404d8b190dbd5528245b68450e5ca494de77a392a315ea5fb43ee18e4735f3
+  data.tar.gz: '0593994e1fa4542bb2f10de75c3231b67dd2ec4f017b613d653c72caeada5fa3c11faf450379085881b8dded323b216e74e236e745e1c9484563f20b226d3711'

data/_includes/html/assign/page.liquid

@@ -4,7 +4,8 @@
 {% assign PageChapter = page.chapter    | replace : ' ','-'     | downcase %}
 {% assign PageTopic   = page.topic      | replace : ' ','-'     | downcase %}
 {% assign PageTitle   = page.title      | replace : ' ','-'     | downcase %}
-{% assign PageTag     = page.tag        | replace : ' ',' tag-' | prepend : ' tag-'     | downcase %}
+{% assign PageTag     = page.tag        | replace : ' ',' tag-' | prepend : ' tag-' | downcase %}
+{% assign PageLabel   = page.label      | prepend: '/' | downcase %}
 
 {% assign PageUrl     = page.url | replace : '.html','' | replace : '/index','' | slice: 1,999 %}
 {% assign PageShare   = PageUrl  | prepend : '/' | prepend : site.url %}

data/_includes/html/assign/site.liquid

@@ -1,28 +1,25 @@
 
-{% assign SiteInstall = site.setup.install | replace : ' ','-' | prepend : 'install-' | downcase %}
-{% assign SiteStyle   = site.setup.style   | replace : ' ','-' | prepend : 'style-'   | downcase %}
-
-{% assign Site         = 'html/site/' %}
-{% assign SitePage     = 'html/page/' %}
-{% assign SiteOverlay  = 'html/overlay/' %}
-{% assign SiteLayout   = 'html/layout/' %}
-
-{% assign SiteUtil     = SitePage    | append : 'util/' %}
-{% assign SiteContent  = SitePage    | append : 'content/' %}
-{% assign PageBlock    = SitePage    | append : 'block/' %}
-
-{% assign ContentLoop  = SiteContent | append : 'loop/' %}
-{% assign LoopArtwork  = ContentLoop | append : 'artwork/' %}
-{% assign LoopForm     = ContentLoop | append : 'form/' %}
-{% assign LoopRoller   = ContentLoop | append : 'roller/' %}
-{% assign LoopHeader   = ContentLoop | append : 'header/' %}
-{% assign LoopScreen   = ContentLoop | append : 'screen/' %}
-{% assign LoopButton   = ContentLoop | append : 'button/' %}
-{% assign LoopAlert    = ContentLoop | append : 'alert/' %}
+{% assign Site        = 'html/site/' %}
+{% assign SitePage    = 'html/page/' %}
+{% assign SiteOverlay = 'html/overlay/' %}
+{% assign SiteLayout  = 'html/layout/' %}
+
+{% assign SiteUtil    = SitePage | append : 'util/' %}
+{% assign SiteContent = SitePage | append : 'content/' %}
+{% assign PageBlock   = SitePage | append : 'block/' %}
+{% assign SiteTopbar  = SitePage | append : 'topbar/' %}
+
+{% assign ContentLoop = SiteContent | append : 'loop/' %}
+{% assign LoopArtwork = ContentLoop | append : 'artwork/' %}
+{% assign LoopForm    = ContentLoop | append : 'form/' %}
+{% assign LoopRoller  = ContentLoop | append : 'roller/' %}
+{% assign LoopHeader  = ContentLoop | append : 'header/' %}
+{% assign LoopScreen  = ContentLoop | append : 'screen/' %}
+{% assign LoopButton  = ContentLoop | append : 'button/' %}
+{% assign LoopAlert   = ContentLoop | append : 'alert/' %}
 
 {% assign SiteSvg = 'svg/site/' %}
 {% assign SvgLoad = SiteSvg | append : 'load/' %}
-{% assign SvgBook = SiteSvg | append : 'book/' %}
 {% assign SvgBtn  = SiteSvg | append : 'btn/' %}
 {% assign SvgIcon = SiteSvg | append : 'icon.liquid' %}
 
@@ -32,6 +29,18 @@
 {% assign LayoutTitle   = page.title      | replace : ' ','-' | prepend : ' title-'   | downcase %}
 {% assign LayoutTopic   = page.topic      | replace : ' ','-' | downcase %}
 
+{%- if site.setup.install -%}
+  {% assign SiteInstall = site.setup.install | prepend : 'install-' %}
+{%- else -%}
+  {% assign SiteInstall = "install-library" %}
+{%- endif -%}
+
+{%- if site.setup.style -%}
+  {% assign SiteStyle = site.setup.style | prepend : 'style-' %}
+{%- else -%}
+  {% assign SiteStyle = "style-page" %}
+{%- endif -%}
+
 {%- if site.setup.respond -%}
   {% assign SiteIsResponsive = true %}
 {%- else -%}

data/_includes/html/layout/footer.liquid

@@ -1,7 +1,11 @@
 
 {% unless SiteIsTheme %}
 
-  {% include {{ SitePage | append : 'clippies.liquid' }} %}
+  {% unless PageIsHome %}
+
+    {% include {{ SitePage | append : 'clippies.liquid' }} %}
+    
+  {% endunless %}  
 
 {% endunless %}
 

data/_includes/html/page/content.liquid

@@ -4,19 +4,19 @@
   <div class="area {{ PageBook | prepend : 'book-' }} {{ PageType }} {{ PageChapter | prepend : 'chapter-' }}
               {% if site.setup.style %}{{ SiteStyle }}{% endif %}">
 
-  {%- unless SiteIsDocs -%}
+  {% unless SiteIsDocs %}
 
     <h2>{{ page.weight | slice: 0,3 }}</h2>
 
-  {%- endunless -%}
+  {% endunless %}
 
 {% else %}
 
-  {%- unless SiteIsDocs -%}
+  {% unless SiteIsDocs %}
 
-    {%- include {{ SitePage | append : 'subtitle.liquid' }} -%}
+    {% include {{ SitePage | append : 'subtitle.liquid' }} %}
 
-  {%- endunless -%}
+  {% endunless %}
 
   <div class="area {{ PageType }} {{ SiteStyle }} {{ PageTitle | prepend : 'title-' }}
               {% unless NoSubtitle %}has-subtitle{% endunless %}
@@ -25,149 +25,148 @@
 
 {% endif %}
 
-{%- unless SiteIsDocs -%}
+{% unless SiteIsDocs %}
 
   {{ page.content | markdownify }}
 
-{%- endunless -%}
+{% endunless %}
 
-{%- unless PageIsChapter -%}
+{% unless PageIsChapter %}
 
-  {%- include {{ SiteContent | append : 'more.liquid' }} -%}
+  {% include {{ SiteContent | append : 'more.liquid' }} %}
 
   {% unless SiteIsDocs %}
 
     {% include {{ SitePage | append : 'util.liquid' }} %}
     
   {% endunless %}
-  
 
-  {%- if page.break -%}
+  {% if page.break %}
 
     {% for i in (1..page.break) %}<br>{% endfor %}
 
-  {%- endif -%}
+  {% endif %}
+
+  {% if page.alert %}
+
+    {% include {{ ContentLoop | append : 'alert.liquid' }} 
+                  title = page.alert.title
+                  type  = page.alert.type 
+                  price = page.alert.price %}
+
+  {% endif %}
 
-  {%- if page.chart -%}
+  {% if page.chart %}
 
-    {%- include {{ SiteContent | append : 'chart.liquid' }} -%}
+    {% include {{ SiteContent | append : 'chart.liquid' }} %}
 
-  {%- endif -%}
+  {% endif %}
 
-  {%- if page.number -%}
+  {% if page.number %}
 
     <div class="block number-container">
 
-      {%- include {{ SiteContent | append : 'loop.liquid' }} type="number" -%}
+      {% include {{ SiteContent | append : 'loop.liquid' }} type="number" %}
 
     </div>
 
-  {%- endif -%}
+  {% endif %}
 
-  {%- if page.pies -%}
+  {% if page.pies %}
 
     <ul class="list pies style-spin">
 
-      {%- include {{ SiteContent | append : 'loop.liquid' }} type="pies" -%}
+      {% include {{ SiteContent | append : 'loop.liquid' }} type="pies" %}
 
     </ul>
 
-  {%- endif -%}
+  {% endif %}
 
-  {%- if page.roller -%}
+  {% if page.roller %}
 
-    {%- include {{ SiteContent | append : 'roller.liquid' }} -%}
+    {% include {{ SiteContent | append : 'roller.liquid' }} %}
 
-  {%- endif -%}
+  {% endif %}
 
-  {%- if page.artwork -%}
+  {% if page.artwork %}
 
-    {%- include {{ SiteContent | append : 'artwork.liquid' }} -%}
+    {% include {{ SiteContent | append : 'artwork.liquid' }} %}
 
-  {%- endif -%}
+  {% endif %}
 
-  {%- if page.form -%}
+  {% if page.form %}
 
     <form onsubmit="return false">
 
-      {%- include {{ SiteContent | append : 'loop.liquid' }} type="form" -%}
+      {% include {{ SiteContent | append : 'loop.liquid' }} type="form" %}
 
     </form>
 
-  {%- endif -%}
+  {% endif %}
 
-  {%- if page.header -%}
+  {% if page.header %}
 
-    {%- include {{ SiteContent | append : 'header.liquid' }} -%}
+    {% include {{ SiteContent | append : 'header.liquid' }} %}
 
-  {%- endif -%}
+  {% endif %}
 
-  {%- if page.screen -%}
+  {% if page.screen %}
 
   <div class="block screen-container">
 
     <div class="block screen-wrap">
 
-      {%- include {{ LoopScreen | append : 'header.liquid' }} -%}
+      {% include {{ LoopScreen | append : 'header.liquid' }} %}
 
-      {%- include {{ LoopScreen | append : 'feed.liquid' }} type="feed" -%}
+      {% include {{ LoopScreen | append : 'feed.liquid' }} type="feed" %}
 
-      {%- include {{ LoopScreen | append : 'feed.liquid' }} type="clone" -%}
+      {% include {{ LoopScreen | append : 'feed.liquid' }} type="clone" %}
 
     </div>
 
   </div>
 
-  {%- endif -%}
+  {% endif %}
 
-  {%- if page.loader -%}
+  {% if page.loader %}
 
-    {%- include {{ SiteContent | append : 'loader.liquid' }} -%}
-
-  {%- endif -%}
-
-  {%- if page.ticker -%}
-
-    <div class="ticker onemoment">
-
-      <div class="ticker message">{{ page.ticker }}</div>
-
-    </div>
+    {% include {{ SiteContent | append : 'loader.liquid' }} %}
 
-  {%- endif -%}
+  {% endif %}
 
-  {%- if page.button -%}
+  {% if page.ticker %}
 
-    {%- include {{ LoopButton | append : 'example.liquid' }} -%}
+    {% include {{ ContentLoop | append : 'onemoment.liquid' }} 
+                  ticker = page.ticker %}
 
-  {%- endif -%}
+  {% endif %}
 
-  {%- if page.row -%}
+  {% if page.button %}
 
-    {%- include {{ SiteContent | append : 'row.liquid' }} -%}
+    {% include {{ LoopButton | append : 'example.liquid' }} %}
 
-  {%- endif -%}
+  {% endif %}
 
-  {%- if page.yousaved -%}
+  {% if page.row %}
 
-    {%- include {{ SiteContent | append : 'loop.liquid' }} type="yousaved" -%}
+    {% include {{ SiteContent | append : 'row.liquid' }} %}
 
-  {%- endif -%}
+  {% endif %}
 
-  {%- if page.checkbox -%}
+  {% if page.checkbox %}
 
-    {%- include {{ ContentLoop | append : 'checkbox.liquid' }} 
-                   title = page.checkbox -%}
+    {% include {{ ContentLoop | append : 'checkbox.liquid' }} 
+                  label = page.checkbox.label %}
 
-  {%- endif -%}
+  {% endif %}
 
-  {%- if SiteIsDocs -%}
+  {% if SiteIsDocs %}
 
-    {%- if page.content -%}
+    {% if page.content %}
 
       {% assign length = page.content | size %}
 
-      {%- if length > 1 -%}
+      {% if length > 1 %}
 
         <div class="area type-content">
 
@@ -175,10 +174,10 @@
 
         </div>
 
-      {%- endif -%}
+      {% endif %}
 
-    {%- endif -%}
+    {% endif %}
 
-  {%- endif -%}
+  {% endif %}
 
-{%- endunless -%}
+{% endunless %}

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

@@ -0,0 +1,31 @@
+
+{% if include.type == "whatson" %}
+
+  <span class="wrap alert-wrap" style="display:block;">
+
+    <span class="block alert-content">
+
+      <span class="title alert-content alert-feed">
+
+        {{ include.title }}
+
+      </span>
+      
+      <span class="title alert-content alert-clone">
+
+        {{ include.title }}
+
+      </span>
+
+    </span>
+
+  </span>
+
+{% else %}
+
+  {% include {{ ContentLoop | append : 'item.liquid' }} 
+                title = include.title
+                price = include.price
+                alert = true %}
+    
+{% endif %}

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

@@ -2,10 +2,16 @@
 {% assign IncludeFunc  = include.func  | prepend : 'func-' %}
 {% assign IncludeTitle = include.title | prepend : 'title-' | downcase %}
 
+{% if include.type %}
+  {% assign IncludeType = include.type | prepend : 'type-' %}
+{% else %}
+  {% assign IncludeType = "type-solid" %}
+{% endif %}
+
 <span class="button-wrap
+            {{ IncludeType }}
             {% if include.func %}{{ IncludeFunc }}{% endif %}
             {% if include.title %}{{ IncludeTitle }}{% endif %}
-            {% if include.type %}{{ include.type | prepend : 'type-' }}{% endif %}
             {% if include.style %}{{ include.style | prepend : 'style-' }}{% endif %}
             {% if include.context %}{{ include.context | prepend : 'context-' }}{% endif %}">
 

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

@@ -1,23 +1,19 @@
 
 {% include html/assign/name.liquid parent="checkbox" %}
 
-{% if include.form %}<p class="block form-row checkbox-row">{% endif %}
+<span class="checkbox-wrap {% if include.nolabel %}no-label{% endif %}">
 
-<span class="checkbox-wrap {% if include.nolabel %}nolabel{% endif %}">
-
-  {%- include {{ LoopForm | append : 'input.liquid' }}
+  {%- include {{ ContentLoop | append : 'input.liquid' }}
                  type  = "checkbox"
                  value = "yes"
                  class = "checkbox-input" -%}
 
-  {%- include {{ LoopForm | append : 'label.liquid' }}
-                 title    = include.title
+  {%- include {{ ContentLoop | append : 'label.liquid' }}
+                 label    = include.label
                  small    = include.small
                  subtitle = include.subtitle
                  class    = "checkbox-label" -%}
 
 </span>
 
-{% if include.form %}</p>{% endif %}
-
 

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

@@ -2,7 +2,7 @@
 {% if item.yousaved %}
 
   {% include {{ SiteContent | append : 'loop.liquid' }} 
-                 type = "yousaved" %}
+                type = "yousaved" %}
 
 {% elsif item.legend %}
 
@@ -11,7 +11,7 @@
 {% elsif item.addr %}
 
   {% include {{ LoopForm | append : 'radio.liquid' }} 
-                 type = "address" %}
+                type = "address" %}
 
 {% elsif item.number %}
 
@@ -40,7 +40,7 @@
 {% elsif item.alert %}
 
   {% include {{ LoopForm | append : 'alert.liquid' }} 
-                 context = include.context %}
+                context = include.context %}
 
 {% elsif item.message %}
 
@@ -54,6 +54,10 @@
 
   {% include {{ LoopForm | append : 'text.liquid' }} %}
 
+{% elsif item.email %}
+
+{% include {{ LoopForm | append : 'email.liquid' }} %}
+
 {% elsif item.password %}
 
   {% include {{ LoopForm | append : 'password.liquid' }} %}
@@ -68,10 +72,13 @@
 
 {% elsif item.checkbox %}
 
-  {% include {{ ContentLoop | append : 'checkbox.liquid' }} 
-                 title   = item.checkbox 
-                 form    = true
-                 nolabel = true %}
+  <p class="block form-row checkbox-row">
+
+    {% include {{ ContentLoop | append : 'checkbox.liquid' }} 
+                  label   = item.checkbox.label 
+                  nolabel = true %}
+
+  </p>  
 
 {% elsif item.button %}