futuro 1.1.1 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfe204f9bed52d33c96c48701fcaa8971ecea1b8ced20063f7b3d5bdbe03ae70
-  data.tar.gz: eaf647eb08fcf3605f1892ee1dbdbb89268078476edade43125246bae495abcb
+  metadata.gz: c273672c78532f150140e21d3e8a999d27b7b3f3e485e2a4b0a43fc2ac9edb56
+  data.tar.gz: d650690de04bff64ea181f18df2d46ee16653d89a7fd631e1fa7fa4918a4e8bc
 SHA512:
-  metadata.gz: 93819f8e40f4519407b69ae78c2506337387a334c54a898a09184598ac3c07f6a7404d8b190dbd5528245b68450e5ca494de77a392a315ea5fb43ee18e4735f3
-  data.tar.gz: '0593994e1fa4542bb2f10de75c3231b67dd2ec4f017b613d653c72caeada5fa3c11faf450379085881b8dded323b216e74e236e745e1c9484563f20b226d3711'
+  metadata.gz: 4247ab02af3eee759be49d58dc1bd2a28746c5b5605e48b30864f385a5f95700515c2af9ce503f7f0584bbaf6044b665abf169ede4ef6b22624276d7e9ca1d86
+  data.tar.gz: 4f7ba1d5031e3f384b790a5ba5ffb07f593104ee945f26411dddb3721d6b8a380c235ed305af1357b36a1cc71ceb096fe49660ac5fb7b4c3d0fd78bc3b4b361b

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

@@ -52,7 +52,7 @@
 
                       {%- endfor -%}
 
-                      <a href="{{ ItemUrl }}" class="link browse-page {{ ItemPage | prepend : 'title-' }}">
+                      <a href="{{ ItemUrl }}" class="link browse-page {{ ItemPage | prepend : 'page-' }}">
 
                         {{ ItemWeight }} {% if SiteIsBook %}{{ item.title | truncate : 22 }}{% else %}{{ item.title | truncate : 13 }}{% endif %}
 

data/_includes/html/page/content.liquid

@@ -156,7 +156,8 @@
   {% if page.checkbox %}
 
     {% include {{ ContentLoop | append : 'checkbox.liquid' }} 
-                  label = page.checkbox.label %}
+                  label = page.checkbox.label 
+                  small = page.checkbox.small %}
 
   {% endif %}
 

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

@@ -76,6 +76,7 @@
 
     {% include {{ ContentLoop | append : 'checkbox.liquid' }} 
                   label   = item.checkbox.label 
+                  small   = item.checkbox.small
                   nolabel = true %}
 
   </p>  

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

@@ -1,6 +1,20 @@
 
-<p class="block form-row message-row">
+<div class="block form-row message-row">
 
-  <span class="block message">{{ item.message.title }}</span>
+  <div class="block message">
+    {% if item.message.title %}
+    <span>
+      {{ item.message.title }}
+    </span>  
+  {% endif %}
+  
+  {% if item.message.list %} 
+    <ul style="padding-top:20px;">
+    {% for item in item.message.list %}
+      <li>{{ item.item }}</li>
+    {% endfor %} 
+    </ul>
+  {% endif %}
+  </div>
 
-</p>
+</div>

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

@@ -1,12 +1,17 @@
 
 {% assign RadioGroup = item.radio.label | replace : ' ','-' | downcase %}
 
+{% if item.radio.stack %}
+  {% assign stackClass = "stacked" %}
+{% endif %}
+
 <p class="block form-row form-radio">
 
   {% include html/assign/name.liquid parent="radio" %}
 
   {% include {{ ContentLoop | append : 'label.liquid' }} 
-                label = item.radio.label 
+                label = item.radio.label
+                small = item.radio.small 
                 class = "form-label" %}
 
   <span class="wrap form-radio">
@@ -15,7 +20,7 @@
 
       {% include html/assign/name.liquid parent="radio" %}
 
-      <span class="block form-radio-group">
+      <span class="block form-radio-group {{ stackClass }}">
 
         {% include {{ ContentLoop | append : 'input.liquid' }}
                        name  = RadioGroup

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

@@ -4,10 +4,11 @@
   {% for item in page.screen %}
 
     {% assign RowType = item.row.type %}
+    {% assign RowTypeClass = RowType | prepend : 'type-' %}
 
     {% if RowType == "header" %}
 
-      <span class="block screen-row {{ item.row.type | prepend : 'type-' }}">
+      <span class="block screen-row {{ RowTypeClass }}">
 
         {%- if item.row.title -%}
   
@@ -36,7 +37,49 @@
       {%- include {{ ContentLoop | append : 'alert.liquid' }}
                      title = item.row.title
                      type  = "whatson" -%}
-      
+
+    {% elsif RowType == "level" %}
+
+      <span class="block screen-row {{ RowTypeClass }}">
+
+        {%- if item.row.title -%}
+
+          <span class="block screen-title {{ RowTypeClass }}">
+
+            <!-- {{ item.row.title }} -->
+
+          </span>
+
+        {%- endif -%}
+
+        <span class="block room-list-primary">
+
+          {% for room in item.row.primary %}
+            <span class="block room-title">{{ room }}</span><br>
+          {% endfor %}
+
+        </span>
+
+        <span class="block room-list-secondary">
+
+          {% for room in item.row.secondary %}
+            <span class="block room-title">{{ room }}</span><br>            
+          {% endfor %}
+
+        </span>
+
+        <span class="block tag-list">
+
+          {% assign facilities = item.row.tags | split : " " %}
+
+          {% for facility in facilities %}
+            <div></div>
+          {% endfor %}
+
+        </span>
+
+      </span>
+
     {% endif %}
     
   {% endfor %}

data/_sass/block/form.scss

@@ -5,6 +5,10 @@
   }
 }
 
+.form-row + .form-row {
+  margin-top: 20px;
+}
+
 .block.form-date-group {
   grid-column-gap: 20px;
   grid-row-gap: 15px;

data/_sass/block/form/radio.scss

@@ -1,12 +1,44 @@
 
 .wrap.form-radio {
-  grid-row-gap: 5px;
-  display: grid;
+  display: inline-block;
 }
 
 .block.form-radio-group {
-  justify-content: flex-start;
-  grid-auto-flow: column;
-  grid-column-gap: 10px;
-  display: grid;
+  display: inline-block;
+  position: relative;
+  margin: 6px 2px;
+
+  &.stacked {
+    display: block;
+  }
+
+  input {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    left: 0;
+    top: 0;
+    left: 16px;
+    cursor: pointer;
+    height: 14px;
+    margin: auto;
+    width: 14px;
+    right: auto;
+
+    &:checked + label {
+      color: #333333;
+      border: 1px solid rgba(51, 51, 51, 0.5);
+      background: rgba(51, 51, 51, 0.05);
+    }
+  }
+
+  label {
+    display: inline-block;
+    border: 1px solid #b8b8b8;
+    padding: 14px 12px 10px 40px;
+    background-color: white;
+    color: #4d4d4d;
+    border-radius: 4px;
+    cursor: pointer;
+  }
 }

data/_sass/block/form/screen.scss

@@ -18,59 +18,78 @@ $title: 2.6rem;
   }
 }
 
-.block.screen-row {
-  grid-row-gap: $title * 0.2;
-  line-height: 1.1;
-  display: grid;
-}
-
 %ScreenRow {
   @extend %bold;
   @include padding(5,5,4.5,5);
 
   + .screen-row.type-event,
+  + .screen-row.type-level,
   + .screen-row.type-retail  {
     border-top: 1px solid setcolor(gun);
   }
 }
 
-.block.screen-row.type-header {
-  @extend %ScreenRow;
-  background: setcolor(smoke);
-  grid-row-gap: $title * 0.1;
-  color: setcolor(carbon);
+.block.screen-row {
+  grid-row-gap: $title * 0.2;
+  line-height: 1.1;
+  display: grid;
 
-  .screen-title {
-    @extend %large;
+  &.type-header {
+    @extend %ScreenRow;
+    background: setcolor(smoke);
+    grid-row-gap: $title * 0.1;
+    color: setcolor(carbon);
+  
+    .screen-title {
+      @extend %large;
+    }
+  
+    .screen-title.small {
+      @extend %small;
+    }
   }
 
-  .screen-title.small {
-    @extend %small;
+  &.type-event {
+    @extend %ScreenRow;
+    background-color: setcolor(carbon);
+    color: setcolor(gray);
   }
-}
 
-.block.screen-row.type-event {
-  @extend %ScreenRow;
-  background-color: setcolor(carbon);
-  color: setcolor(gray);
-} 
+  &.type-level {
+    @extend %ScreenRow;
+    grid-template-columns: 20fr 20fr 40fr 20fr;
+    background-color: setcolor(carbon);
+    color: setcolor(gray);
+    grid-column-gap: 1rem;
+  }
 
-.block.screen-row.type-retail {
-  @extend %ScreenRow;
-  background: setcolor(slate);
-  color: setcolor(gray);
+  &.type-retail {
+    @extend %ScreenRow;
+    background: setcolor(slate);
+    color: setcolor(gray);
+  }
 }
 
 .block.screen-title {
   font-size: $title;
-}
 
-.block.screen-title:not(.small) {
-  @extend %tight;
+  &.small {
+    @extend %small;
+  }
+
+  &:not(.small) {
+    @extend %tight;
+  }
+
+  &.type-level {
+    font-size: 10rem;
+    line-height: 1;
+  }
 }
 
-.block.screen-title.small {
+.block.room-title {
   @extend %small;
+  @extend %book;
 }
 
 .block.screen-wrap {
@@ -82,3 +101,17 @@ sup {
   @extend %small;
   left: 0.2em;
 }
+
+.block.tag-list {
+  grid-template-columns: repeat(5,1fr);
+  grid-template-rows: min-content;
+  grid-gap: 1rem;
+  display: grid;
+}
+
+.block.tag-list div {
+  background-color: setcolor(gray);
+  border-radius: 50%;
+  height: 10px;
+  width: 10px;
+}

data/_sass/block/page.scss

@@ -15,7 +15,7 @@
   width: 5px;
 }
 
-.block.page-container {
+%PageContainer {
   border-bottom: 1px solid lighten(setcolor(generic),43%);
   padding-right: 20px;
   padding-left: 20px;
@@ -26,9 +26,8 @@
   }
 }
 
-.block.page-content {
-  background-color: lighten(setcolor(generic),47%);
-  height: 100px;
+.block.page-container {
+  @extend %PageContainer;
 }
 
 .block.page-info {

data/_sass/helpers/variables/colors.scss

@@ -29,10 +29,10 @@ $ux-colors : (
   ),
 
   error : (
-    base : #B94A48, // untested
-    dark : darken(#B94A48,10%), // untested
-    light  : lighten(#B94A48,23%), // untested
-    xlight : lighten(#B94A48,46%) // untested
+    base : #e61717, // untested
+    dark : darken(#e61717,10%), // untested
+    light  : lighten(#e61717,23%), // untested
+    xlight : lighten(#e61717,46%) // untested
   ),
 
   success : (
@@ -46,39 +46,39 @@ $ux-colors : (
 
 $tier-colors : (
 
-  level_a : (
+  level-a : (
     base : #e61717
   ),
 
-  level_b : (
+  level-b : (
     base : #0099e6
   ),
 
-  level_c : (
+  level-c : (
     base : #ff8001
   ),
 
-  level_d : (
+  level-d : (
     base : #3bb300
   ),
 
-  level_e : (
+  level-e : (
     base : #8b3788
   ),
 
-  level_f : (
+  level-f : (
     base : #e60073
   ),
 
-  level_g : (
+  level-g : (
     base : #b35900
   ),
 
-  level_y : (
+  level-y : (
     base : #ffaa00
   ),
 
-  level_l : (
+  level-l : (
     base : #b8b8b8
   )
 

data/assets/js/footer/custom/1_Settings.js

@@ -1,4 +1,3 @@
-
 gsap.registerPlugin(ScrollTrigger);
 
 Browse.able = false;
@@ -11,10 +10,10 @@ if ($("body").hasClass("type-home")) {
 
 if (!Site.isTheme) {
   Browse.able = $(".wrap.type-page").length;
-} 
+}
 
-const HandleClass = (e,state,name="active") => {
-  $(e).map((index,value) => {
+const HandleClass = (e, state, name = "active") => {
+  $(e).map((index, value) => {
     if (state == "add") {
       $(value).addClass(name);
     } else if (state == "remove") {
@@ -23,4 +22,4 @@ const HandleClass = (e,state,name="active") => {
       $(value).removeClass();
     }
   });
-}
+};