futuro 1.0.5 → 1.1.0

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

@@ -0,0 +1,6 @@
+
+<div class="ticker onemoment">
+
+  <div class="ticker message">{{ include.ticker }}</div>
+
+</div>

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

@@ -29,11 +29,11 @@
 
     </span>
 
-  {%- elsif RowType == "alert" -%}
+  <!-- {%- elsif RowType == "alert" -%}
 
     {%- include {{ LoopAlert | append : 'create.liquid' }}
                    context = "screen"
-                   title   = item.row.title -%}
+                   title   = item.row.title -%} -->
 
   {%- elsif RowType == "event" or
             RowType == "retail" -%}

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

@@ -33,9 +33,9 @@
 
     {% elsif RowType == "alert" %}
 
-      {%- include {{ LoopAlert | append : 'create.liquid' }}
-                     context = "screen"
-                     title   = item.row.title -%}
+      {%- include {{ ContentLoop | append : 'alert.liquid' }}
+                     title = item.row.title
+                     type  = "whatson" -%}
       
     {% endif %}
     

data/_includes/html/page/content/loop/{select/create.liquid → select.liquid}

@@ -6,19 +6,23 @@
   <select id   = "{{ name }}" 
           name = "{{ name }}">
 
+    {% assign i = 0 %}
+
     {% for item in IncludeOptions %}
   
-      <option value="{{ item }}">{{ item }}</option>
+      <option value="{{ i }}">{{ item }}</option>
+
+      {% assign i = i | plus : 1 %}
       
     {% endfor %}
   
   </select>
 
-  <span class="block select-dropdown">
+  <!-- <span class="block select-dropdown">
 
     {% include {{ SvgIcon }} type='more' %}
 
-  </span>
+  </span> -->
 
 </span>
 

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

@@ -29,7 +29,7 @@
 
 {% elsif RowType == "alert" %}
 
-  {% include {{ LoopAlert | append : 'create.liquid' }}
+  {% include {{ ContentLoop | append : 'alert.liquid' }}
                  context = "screen"
                  title = page.row.title %}
 

data/_includes/html/page/footnote.liquid

@@ -3,7 +3,9 @@
 
   <p class="block page-footnote">
 
-    {%- for item in page.footnote -%}
+    <strong>Source:</strong> {{ page.footnote }}
+
+    <!-- {%- for item in page.footnote -%}
 
       {%- if item.pre -%}
 
@@ -17,7 +19,7 @@
 
       {%- endif -%}
 
-    {%- endfor -%}
+    {%- endfor -%} -->
 
   </p>
 

data/_includes/html/page/header.liquid

@@ -1,6 +1,5 @@
 
-<div class="wrap page-wrap {{ PageType }}
-            {% if site.setup.style %}{{ SiteStyle }}{% endif %}
+<div class="wrap page-wrap {{ PageType }} {{ SiteStyle }}
             {% if page.collection %}{{ PageBook | prepend : 'book-' }}{% endif %}
             {% if page.chapter %}{{ PageChapter | prepend : 'chapter-' }}{% endif %}
             {% if page.topic %}{{ PageTopic | prepend : 'topic-' }} in-topic{% endif %}

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

@@ -3,18 +3,28 @@
 
   {% for book in loop %}
 
-    {% assign label = book.label %}
-    {% assign url = label | prepend: '/' | append: '/' %}
-    {% assign svg = label | append: '.svg' %}
+    {% assign url = book.label | prepend: '/' | append: '/' %}
+    {% assign svg = book.label | append: '.svg' %}
 
-    {% unless label == 'posts' %}
+    {% if book.live %}
+      {% assign href  = url %}
+      {% assign class = book.label %}
+    {% else %}
+      {% assign href  = "#" %}
+      {% assign class = "draft" %}
+    {% endif %}
+
+    {% unless book.label == 'posts' %}
 
       <div class="wrap book">
 
-        <a class="link book {% if book.live %}{{ label }}{% else %}draft{% endif %}" 
-           href="{% if book.live %}{{ url }}{% else %}#{% endif %}">
+        <a class="link book {{ class }}" href="{{ href }}">
 
-          {% include {{ SvgBook | append : svg }} %}
+          <span class="title book {{ class }}">
+            
+            {{ book.label }}
+          
+          </span>
 
         </a>
 

data/_includes/html/page/topbar.liquid

@@ -1,52 +1,63 @@
 
-{% assign label = page.label | downcase | prepend: '/' %}
-
 <div class="area topbar">
 
     <div class="block navigation left">
 
       <button type="button" class="navigation about">
-        {% include {{ SvgBtn | append : 'about.svg' }} %}
+
+        {% include {{ SvgIcon }} type="about" %}
+
       </button>
 
       <button type="button" class="navigation browse">
-        {% include {{ SvgBtn | append : 'browse.svg' }} %}
+
+        {% include {{ SvgIcon }} type="browse" %}
+
       </button>
 
     </div>
 
     <div class="block navigation main">
 
-      {% assign loop = site.collections | sort: 'weight' %}
+      {% if page.error %}
 
-      {% for page in loop %}
+        {% include {{ SiteTopbar | append : 'navigation/link.liquid' }} 
+                      title = "Home"
+                      href  = "/" %}
+        
+      {% else %}
 
-        {% if page.live %}
+        {% assign loop = site.collections | sort: 'weight' %}
 
-        <a class="link navigation {{ page.label }}" href="{%- if site.setup.install == 'library' -%}{{ page.label | prepend: '/' }}{%- else -%}/{%- endif -%}">
-          <button type="button" name="button">
-            <strong>{{ page.label }}</strong>
-          </button>
-        </a>
+        {% for item in loop %}
 
-        {% endif %}
+          {% if item.live %}
 
-      {% endfor %}
+            {% include {{ SiteTopbar | append : 'navigation/link.liquid' }} 
+                          title = item.label %}
+
+          {% endif %}
+          
+        {% endfor %}
+        
+      {% endif %}
 
     </div>
 
     <div class="block navigation right">
 
-      <button type="button" class="navigation cart" style="display:none;">
+      <!-- <button type="button" class="navigation cart">
         {% include {{ SvgBtn | append : 'cart.svg' }} %}
       </button>
 
-      <button type="button" class="navigation count" style="display:none;">
+      <button type="button" class="navigation count">
         <strong>0</strong>
-      </button>
+      </button> -->
 
       <button type="button" class="navigation search">
+
         {% include {{ SvgIcon }} type="search" %}
+
       </button>
 
     </div>

data/_includes/html/page/topbar/navigation/link.liquid

@@ -0,0 +1,22 @@
+
+{% assign class = include.title | replace : ' ','-' | downcase %}
+
+{% if include.href %}
+
+  {% assign href = include.href %}
+
+{% else %}
+    
+  {% assign href = class | prepend : '/' %}
+  
+{% endif %}
+
+<a class="link navigation {{ class }}" href={{ href }}>
+
+  <button type="button" name="button">
+
+    <strong>{{ include.title }}</strong>
+
+  </button>
+
+</a>

data/_includes/html/site/scroller.liquid

@@ -29,7 +29,7 @@
           {% assign ItemTitle   = item.title   | replace : ' ','-' | downcase %}
           {% assign ItemID      = ItemChapter  | append : ItemTitle %}
 
-          <li class="item scroller {{ ItemTitle }}">
+          <li class="item scroller {{ ItemID }}">
 
             <a href="{{ ItemID | prepend : '#' }}" class="link scroller">
 

data/_includes/svg/site/icon.liquid

@@ -15,6 +15,14 @@
 
   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
 
+{%- elsif include.type == "about" -%}
+
+  <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M17.5,10.5c-0.5,0.5-1.1,0.7-1.8,0.7c-0.7,0-1.3-0.2-1.7-0.7 c-0.5-0.5-0.7-1.1-0.7-1.8C13.3,8,13.5,7.5,14,7c0.5-0.5,1.1-0.7,1.7-0.7c0.7,0,1.3,0.2,1.8,0.7C18,7.5,18.2,8,18.2,8.7 C18.2,9.4,18,10,17.5,10.5z M13.5,25.3H18v-11h-4.5V25.3z M16,0C7.2,0,0,7.2,0,16c0,8.8,7.2,16,16,16c8.8,0,16-7.2,16-16	C32,7.2,24.8,0,16,0z" fill-rule="evenodd" clip-rule="evenodd"/></svg>
+
+{%- elsif include.type == "browse" -%}
+
+  <svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path d="M27.2,4.6C21-1.6,10.8-1.5,4.6,4.8C-1.6,11-1.5,21.2,4.8,27.4	s16.4,6.2,22.6-0.1S33.5,10.8,27.2,4.6z" fill-rule="evenodd" clip-rule="evenodd"/><path d="M25.3,22.3L17,24.4L17.1,11l8.2-2V22.3z M7,8.8l8,2l-0.1,13.3	L7,22.2V8.8z" fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF"/></svg>
+
 {%- elsif include.type == "search" -%}
 
   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M7.5,7.4C6.6,8.3,6,9.7,6,11.1s0.6,2.7,1.5,3.7c0.9,0.9,2.3,1.5,3.7,1.5 s2.7-0.6,3.7-1.5c0.9-0.9,1.5-2.3,1.5-3.7s-0.6-2.7-1.5-3.7c-1-1.1-2.3-1.5-3.7-1.5S8.5,6.4,7.5,7.4z M19.5,21.4l-4-4 c-1.2,0.9-2.7,1.3-4.2,1.3c-2.1,0-4-0.8-5.4-2.2c-1.4-1.4-2.2-3.3-2.2-5.3s0.8-4,2.2-5.4s3.4-2.3,5.4-2.3s4,0.8,5.4,2.2 S19,9,19,11.1c0,1.5-0.4,3-1.3,4.3l4,4L19.5,21.4z" fill-rule="evenodd" clip-rule="evenodd"/></svg>
@@ -67,7 +75,7 @@
 
   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12"><path d="M6,0c3.3,0,6,2.7,6,6s-2.7,6-6,6S0,9.3,0,6S2.7,0,6,0z"/></svg>
 
-{%- elsif include.type == "seatplan" -%}  
+{%- elsif include.type == "seatplan" -%}
 
   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 200">
     <path class="style-level-d" d="M109,102.5c3.6,0,6.5,2.9,6.5,6.5s-2.9,6.5-6.5,6.5s-6.5-2.9-6.5-6.5S105.4,102.5,109,102.5z"/>

data/_sass/_button.scss

@@ -21,16 +21,16 @@
 }
 
 .button-wrap.type-solid {
-  @include bg($tint:100%);
+  background-color: setcolor(slate);
   color: white;
-  fill: white;
+  fill: white; 
 }
 
 .button-wrap.type-outline {
   border: 1px solid setcolor(slate);
+  background-color: white;
   color: setcolor(slate);
   fill: setcolor(slate);
-  background-color: white;
 }
 
 .button-wrap.context-legend {
@@ -43,7 +43,7 @@
 }
 
 .button-bg.func-submit {
-  @include borderRad($radius);
+  border-radius: 4px;
 }
 
 .button-wrap.func-update {

data/_sass/area/chapter.scss

@@ -3,7 +3,8 @@
   @extend %ContentFlow;
 
   ul {
-    grid-auto-rows: min-content;
+    // grid-auto-rows: min-content;
+    padding: 20px 0 0;
     list-style: none;
     grid-gap: 8px;
     display: grid;

data/_sass/area/page.scss

@@ -9,7 +9,7 @@ $AreaSub : $AreaHeight - $SubHeight;
 
 %PageContent {
 
-  > h1, > h2, > h3, > h4, > h5, > h6, > p, > ul, > ol, > .roller, .block.animate {
+  > h1, > h2, > h3, > h4, > h5, > h6, > p, > ul, > ol, > .roller, .block.animate, .wrap.switch {
     @extend %ContentPrep;
   }
 

data/_sass/block/chart.scss

@@ -39,6 +39,7 @@
 .block.chart-title {
   @include RotateTitle;
   left: calc(50% + 14px);
-  bottom: 10px;
+  position: absolute;
   color: white;
+  bottom: 10px;
 }

data/_sass/block/form/alert.scss

@@ -1,15 +1,6 @@
 
 .block.form-alert {
-  padding: 14px 12px 10px 12px;
-  background-color: setcolor(gun,xlight);
-  border: 1px solid setcolor(gun,light);
-  color: setcolor(gun,dark);
-  border-radius: 4px;
-  display: block;
-}
-
-.block.form-alert > .block.item-object {
-  padding: 0;
+  @extend %AlertBlock;
 }
 
 .block.form-row .block.form-alert {

data/_sass/block/form/checkbox.scss

@@ -1,22 +1,6 @@
 
-%checkbox {
-  @include zeros(absolute);
-  left: ($radius * 4);
-  cursor: pointer;
-  height: 14px;
-  margin: auto;
-  width: 14px;
-  right: auto;
-
-  &:checked + label {
-    @include color(setcolor(slate),100%);
-    @include border(setcolor(slate));
-    @include bg(setcolor(slate));
-  }
-}
-
 input[type="checkbox"] {
-  @extend %checkbox;
+  @extend %Checkbox;
 }
 
 .checkbox-wrap {
@@ -24,10 +8,8 @@ input[type="checkbox"] {
   display: grid;
 }
 
-.nolabel {
-  @media#{map-get($query,min768)} {
-    grid-column: 2 / 3;
-  }
+.no-label {
+  @extend %NoLabel;
 }
 
 

data/_sass/block/form/input.scss

@@ -7,6 +7,14 @@ input[type="email"] {
   @extend %TextInput;
 }
 
+input[type="tel"] {
+  @extend %TextInput;
+}
+
+input[type="number"] {
+  @extend %TextInput;
+}
+
 input[type="checkbox"] {
   cursor: pointer;
 }

data/_sass/block/form/item.scss

@@ -1,22 +1,22 @@
 
-.block.item-row + .block.item-row {
-  margin-top: 0;
+// .block.item-row + .block.item-row {
+//   margin-top: 0;
 
-  .block.item-object {
-    border-top: 1px solid rgba(setcolor(slate),20%);
-  }
-}
+//   .block.item-object {
+//     border-top: 1px solid rgba(setcolor(slate),20%);
+//   }
+// }
 
-.block.item-object {
-  padding: ($radius * 2) ($radius * 3);
-  grid-template-columns: auto 100px;
-  display: grid;
+// .block.item-object {
+//   padding: ($radius * 2) ($radius * 3);
+//   grid-template-columns: auto 100px;
+//   display: grid;
 
-  @media#{map-get($query,min768)} {
-    grid-column: 2 / 3;
-  }
-}
+//   @media#{map-get($query,min768)} {
+//     grid-column: 2 / 3;
+//   }
+// }
 
-.block.item-object-price {
-  text-align: right;
-}
+// .block.item-object-price {
+//   text-align: right;
+// }