futuro 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53307f4de12046d2ba4a3021e5795a341a4c17befb51c1be001907630fe00fa7
-  data.tar.gz: 8429ee546fd86d0daf39f5a67347cfc474f1b04c5d1a2efa29be2d28806e93ca
+  metadata.gz: f763ebdc34d1d167a49b548152f8d449fc9b21187ef3304f750684c8b573e1cb
+  data.tar.gz: 0300ec67b27d0e1e2b2f3e52c89b8558dbd36ad5ed1a5b65e16471d94757d74a
 SHA512:
-  metadata.gz: 04aa4c2b3333dd84fb2203675a82d6a73d075171fc9608e81351308b0dbe269e0c9d1ca0694cc0347a70f0d109a1c80ae1bc623c33803d1ad7176c06fd407b04
-  data.tar.gz: d295f95016a79908299d574d3f70134afef129bdf5023bfd3f63bd5708812a3886a88f85752a9e653aa0660b17e2bea290d601de908cad38a948c0d2bbbd2aeb
+  metadata.gz: ce6e455a1e78c0d53ff02649a0cbfff1ae7398305f5e3e4edfd8be6cca2fb4fc9c04bb8b40bbff761360c51fcfdf8ee35723bb6bf2fd26a86c2a2401fd0b8adc
+  data.tar.gz: 93b04a219c7dc357b8dd4e1ddc51c33d03f4a8100ceccbf145c38bbc3fd56d88db2175cbd676674faaf7f4b4045c635777b6bbe3086bd753c55eb7f5f313a875

data/_sass/block/form/checkbox.scss

@@ -30,16 +30,4 @@ input[type="checkbox"] {
   }
 }
 
-.checkbox-label {
-  @include padding($t:3.5,$b:2.5,$l:10);
-  @include borderRad;
-  border: 1px solid setcolor(slate,light);
-  color: setcolor(slate);
-  cursor: pointer;
-
-  &:hover {
-    background-color: setcolor(slate,xlight);
-  }
-}
-
 

data/_sass/futuro.core.scss

@@ -56,7 +56,6 @@
 "block/form/select",
 "block/form/screen",
 "block/form/text",
-"block/form/label",
 "block/form/login",
 "block/form/message",
 "block/form/title",
@@ -93,6 +92,7 @@
 @import
 "title/alert",
 "title/browse",
+"title/checkbox",
 "title/copied",
 "title/docs",
 "title/form",

data/_sass/helpers/mixins/theme.scss

@@ -44,38 +44,40 @@
 }
 
 // Used in Patterns
-@mixin ThemeHeader($name,$col) {
 
-  .block.header.title-#{$name} {
-    background-color: $col;
-  }
-
-  .list.login-list.title-#{$name} {
-    @include border($col,100%);
-  }
+@mixin ThemeHeader($chapter,$title,$color:slate) {
+  .wrap.chapter-#{$chapter}.title-#{$title} {
 
-  .item.login-item.title-#{$name} {
-    @include bg(lighten($col,45%),100%);
-    @include color($col,100%);
+    .block.header {
+      background-color: setcolor($color);
+    }
 
-    &:hover {
-      @include bg(lighten($col,40%),100%);
+    .list.login-list {
+      border: 1px solid setcolor($color,light);
     }
 
-    + .login-item {
-      border-top: 1px solid rgba($col,20%);
+    .item.login-item {
+      background-color: setcolor($color,xlight);
+      color: setcolor($color,dark);
+  
+      &:hover {
+        background-color: darken(setcolor($color,xlight),10%);
+      }
+  
+      + .login-item {
+        border-top: 1px solid setcolor($color,light);
+      }
     }
   }
 }
 
 // Used in Patterns
-@mixin ThemeCheckbox($name,$col) {
-  .area.title-#{$name} {
-
+@mixin ThemeCheckbox($chapter,$title,$color:slate) {
+  .wrap.chapter-#{$chapter}.title-#{$title} {
     .checkbox-input:checked + label {
-      @include border($col);
-      @include color($col,100%);
-      @include bg($col);
+      background-color: setcolor($color,xlight);
+      border: 1px solid setcolor($color,light);
+      color: setcolor($color,dark);
     }
   }
 }
@@ -179,13 +181,13 @@
 }
 
 // Used in Patterns
-@mixin ThemePassword($name,$col) {
-  .area.title-#{$name} {
+@mixin ThemePassword($chapter,$title,$color:slate) {
+  .wrap.chapter-#{$chapter}.title-#{$title} {
     .block.password-strength {
-      background: $col;
+      background-color: setcolor($color);
     }
     .block.password-bg {
-      background: rgba($col,10%);
+      background-color: setcolor($color,xlight);
     }
   }
 }
@@ -200,36 +202,34 @@
 }
 
 // Used in Patterns
-@mixin ThemeCallout($name,$col) {
-  .area.title-#{$name} {
+@mixin ThemeCallout($chapter,$title,$color:slate) {
+  .wrap.chapter-#{$chapter}.title-#{$title} {
     .block.title {
-      @include bg($col);
-      color: $col;
+      background-color: setcolor($color,xlight);
+      color: setcolor($color,dark);
     }
   }
 }
 
 // Used in Patterns
-@mixin ThemeAlert($name,$col) {
-  .area.title-#{$name} {
+@mixin ThemeAlert($chapter,$title,$color:slate) {
+  .wrap.chapter-#{$chapter}.title-#{$title} {
     .block.form-alert {
-      @include borderCol($col);
-      @include bg($col);
-      color: $col;
+      background-color: setcolor($color,xlight);
+      border: 1px solid setcolor($color,light);
+      color: setcolor($color,dark);
     }
   }
 }
 
 // Used in Patterns
-@mixin ThemeButton($name,$color) {
-
-  .area.title-#{$name} {
-
+@mixin ThemeButton($chapter,$title,$color:slate) {
+  .wrap.chapter-#{$chapter}.title-#{$title} {
     .button-wrap {
-      background: $color;
+      background: setcolor($color);
 
       &:hover {
-        background: darken($color,3%);
+        background: darken(setcolor($color),5%);
       }
     }
   }

data/_sass/helpers/themes.scss

@@ -2,6 +2,7 @@
 // ThemeBook | $name | $col
 
 @include ThemeBook("orwell",blue);
+
 @include ThemeBook("woolf",green);
 
 // ThemeCover | $name | $col | $left | $chapter

data/_sass/helpers/variables.scss

@@ -95,11 +95,17 @@ $colormap : (
   ),
 
   hire : (
-    base : #412f79
+    base : #412f79, // untested
+    dark : darken(#412f79,0%), // untested
+    light  : lighten(#412f79,32%), // untested
+    xlight : lighten(#412f79,64%) // untested
   ),
 
   members : (
-    base : #5d91e5
+    base : #5d91e5, // untested
+    dark : darken(#5d91e5,10%), // untested
+    light  : lighten(#5d91e5,18%), // untested
+    xlight : lighten(#5d91e5,35%) // untested
   ),
 
   art  : (
@@ -107,7 +113,10 @@ $colormap : (
   ),
 
   shop : (
-    base : #23D5B0
+    base : #23D5B0, // untested
+    dark : darken(#23D5B0,0%), // untested
+    light  : lighten(#23D5B0,25%), // untested
+    xlight : lighten(#23D5B0,50%) // untested
   ),
 
   addicts : (
@@ -157,14 +166,14 @@ $colormap : (
   generic : (
     base : #fe5900,
     dark : darken(#fe5900,10%),
-    light  : lighten(#fe5900,28%),
+    light  : lighten(#fe5900,24%),
     xlight : lighten(#fe5900,48%)
   ),
 
   dodgers : (
     base : #0092FF,
     dark : darken(#0092FF,10%),
-    light  : lighten(#0092FF,28%),
+    light  : lighten(#0092FF,24%),
     xlight : lighten(#0092FF,48%)
   ),
 

data/_sass/title/checkbox.scss

@@ -0,0 +1,14 @@
+
+.title.checkbox-label {
+  @include padding($t:3.5,$b:2.5,$l:10);
+  @include borderRad;
+  border: 1px solid setcolor(slate,light);
+  background-color: white;
+  color: setcolor(slate);
+  cursor: pointer;
+
+  &:hover {
+    background-color: setcolor(slate,xlight);
+  }
+  
+}

data/assets/js/futuro.header.custom.js

@@ -1 +1 @@
-"use strict";var Site={},Body={},Overlay={},Browse={},Book={},Chapter={},Page={},Color={},Artform={},Roller={},Contrast={},Start={},Setup={},Share={},Check={},Respond={},Util={},Print={},Save={};function Target(e){return document.querySelector(Overlay.load.wrap).children[e-1]}function SwitchOn(e){return{display:"block",fill:e}}function SwitchOff(){return{clearProps:"display",delay:Overlay.load.speed}}Browse.book={},Browse.chapter={},Browse.page={},Browse.found={},Check.book={},Check.chapter={},Check.page={},Respond.roller={},Respond.roller.default={},Respond.roller.morph={},Respond.roller.snap={},Book.is={},Page.is={},Chapter.is={},(Color={system:"#6e46a0",brand:"#ff8200",supply:"#f00a0a",demo:"#005a9b",generic:"#fe5900",theatre:"#019fc6",talks:"#ff9000",music:"#dc3636",classical:"#bf8f3a",cinema:"#259d31",tours:"#718ab2",hire:"#412f79",members:"#5d91e5",art:"#f90082",shop:"#23D5B0",paradise:"#e8396c",artforall:"#f9ae00",park:"#009640",news:"#009fe3",dodgers:"#0092FF",green:"#259d31"}).artforms={theatre:Color.theatre,talks:Color.talks,music:Color.music,classical:Color.classical,cinema:Color.cinema,tours:Color.tours,hire:Color.hire,members:Color.members,art:Color.art},Overlay.mobile={screen:".area.overlay-mobile",bar:".bar.mobile"},Overlay.load={screen:".area.overlay-load",wrap:".wrap.overlay-load",speed:.3},Overlay.custom=[{name:"about",open:!1},{name:"browse",open:!1},{name:"search",open:!1}],Overlay.button="button.navigation",Overlay.exit=".exit",Roller.default={input:".list.roller.input.style-default",output:".list.roller.output.style-default"},Roller.morph={input:".list.roller.input.style-morph",output:"svg#morph"},Roller.snap={input:".list.roller.input.style-snap",output:".list.pies.style-snap"},Site.tl=gsap.timeline({repeat:-1}),Site.inFocus=!1,Site.access={ratio:".access-ratio",best:"best",good:"good",poor:"poor"},Site.scramble={chars:"1234567890%",speed:.6},Site.mobile={active:!0},Site.tablet={active:!1,width:768},Site.desktop={active:!1,width:1200},Site.topbar={lnk:".link.navigation"},Site.scroll={lnk:".link.scroller"},Site.chapter={target:".wrap.type-chapter"},Site.page={artwork:".area.page-artwork",share:".util-share",url:".util-url",height:560},Site.rollers={input:".list.roller.input",output:".list.roller.output",morph:"svg#morph"},Site.charts={list:".block.chart-container",pcent:".block.chart-pcent-title",title:".block.chart-title"},Site.pies={list:".list.pies.style-spin",pcent:".title.pie-pcent",wrap:".block.pie-wrap",data:".block.pie-svg-data",title:".title.pie-title"},Site.numbers=".title.number-value",Site.mobile.query="screen and (max-width: ".concat(Site.tablet.width-1,"px)"),Site.tablet.query="screen and (min-width: ".concat(Site.tablet.width,"px) and (max-width: ").concat(Site.desktop.width-1,"px)"),Site.desktop.query="screen and (min-width: ".concat(Site.desktop.width,"px)"),enquire.register(Site.mobile.query,{match:function(){Site.mobile.active=!0,Site.tablet.active=!1,Site.desktop.active=!1}}),enquire.register(Site.tablet.query,{match:function(){Site.mobile.active=!1,Site.tablet.active=!0,Site.desktop.active=!1}}),enquire.register(Site.desktop.query,{match:function(){Site.mobile.active=!1,Site.tablet.active=!1,Site.desktop.active=!0}}),"theme"==Config.install&&(Site.isTheme=!0),"library"==Config.install&&(Site.isLibrary=!0),Config.share&&(Site.isShareable=!0);
+"use strict";var Site={},Body={},Overlay={},Browse={},Book={},Chapter={},Page={},Color={},Artform={},Roller={},Contrast={},Start={},Setup={},Share={},Check={},Respond={},Util={},Print={},Save={};function Target(e){return document.querySelector(Overlay.load.wrap).children[e-1]}function SwitchOn(e){return{display:"block",fill:e}}function SwitchOff(){return{clearProps:"display",delay:Overlay.load.speed}}Browse.book={},Browse.chapter={},Browse.page={},Browse.found={},Check.book={},Check.chapter={},Check.page={},Respond.roller={},Respond.roller.default={},Respond.roller.morph={},Respond.roller.snap={},Book.is={},Page.is={},Chapter.is={},(Color={system:"#6e46a0",brand:"#ff8200",supply:"#f00a0a",demo:"#005a9b",generic:"#fe5900",theatre:"#019fc6",talks:"#ff9000",music:"#dc3636",classical:"#bf8f3a",cinema:"#259d31",tours:"#718ab2",hire:"#412f79",members:"#5d91e5",art:"#f90082",shop:"#23D5B0",paradise:"#e8396c",artforall:"#f9ae00",park:"#009640",news:"#009fe3",dodgers:"#0092FF",green:"#259d31"}).artforms={theatre:Color.theatre,talks:Color.talks,music:Color.music,classical:Color.classical,cinema:Color.cinema,tours:Color.tours,hire:Color.hire,members:Color.members,art:Color.art},Overlay.mobile={screen:".area.overlay-mobile",bar:".bar.mobile"},Overlay.load={screen:".area.overlay-load",wrap:".wrap.overlay-load",speed:.3},Overlay.custom=[{name:"about",open:!1},{name:"browse",open:!1},{name:"search",open:!1}],Overlay.button="button.navigation",Overlay.exit=".exit",Page.wrap=".wrap.type-page",Page.get=function(e,t,r){var a=Page.wrap;return e&&(a+=".chapter-".concat(e)),t&&(a+=".title-".concat(t)),r&&(a+=".tag-".concat(r)),a},Roller.default={input:".list.roller.input.style-default",output:".list.roller.output.style-default"},Roller.morph={input:".list.roller.input.style-morph",output:"svg#morph"},Roller.snap={input:".list.roller.input.style-snap",output:".list.pies.style-snap"},Site.tl=gsap.timeline({repeat:-1}),Site.inFocus=!1,Site.access={ratio:".access-ratio",best:"best",good:"good",poor:"poor"},Site.scramble={chars:"1234567890%",speed:.6},Site.mobile={active:!0},Site.tablet={active:!1,width:768},Site.desktop={active:!1,width:1200},Site.topbar={lnk:".link.navigation"},Site.scroll={lnk:".link.scroller"},Site.chapter={target:".wrap.type-chapter"},Site.page={artwork:".area.page-artwork",share:".util-share",url:".util-url",height:560},Site.rollers={input:".list.roller.input",output:".list.roller.output",morph:"svg#morph"},Site.charts={list:".block.chart-container",pcent:".block.chart-pcent-title",title:".block.chart-title"},Site.pies={list:".list.pies.style-spin",pcent:".title.pie-pcent",wrap:".block.pie-wrap",data:".block.pie-svg-data",title:".title.pie-title"},Site.numbers=".title.number-value",Site.mobile.query="screen and (max-width: ".concat(Site.tablet.width-1,"px)"),Site.tablet.query="screen and (min-width: ".concat(Site.tablet.width,"px) and (max-width: ").concat(Site.desktop.width-1,"px)"),Site.desktop.query="screen and (min-width: ".concat(Site.desktop.width,"px)"),enquire.register(Site.mobile.query,{match:function(){Site.mobile.active=!0,Site.tablet.active=!1,Site.desktop.active=!1}}),enquire.register(Site.tablet.query,{match:function(){Site.mobile.active=!1,Site.tablet.active=!0,Site.desktop.active=!1}}),enquire.register(Site.desktop.query,{match:function(){Site.mobile.active=!1,Site.tablet.active=!1,Site.desktop.active=!0}}),"theme"==Config.install&&(Site.isTheme=!0),"library"==Config.install&&(Site.isLibrary=!0),Config.share&&(Site.isShareable=!0);

data/assets/js/header/custom/2_page.js

@@ -0,0 +1,22 @@
+
+Page.wrap = ".wrap.type-page";
+
+Page.get = (chapter,title,tag) => {
+
+  let path = Page.wrap;
+
+  if (chapter) {
+    path += `.chapter-${chapter}`;    
+  }
+
+  if (title) {
+    path += `.title-${title}`;    
+  }
+
+  if (tag) {
+    path += `.tag-${tag}`;    
+  }
+
+  return path;
+
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: futuro
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Paul Heading
@@ -229,7 +229,6 @@ files:
 - _sass/block/form/header.scss
 - _sass/block/form/input.scss
 - _sass/block/form/item.scss
-- _sass/block/form/label.scss
 - _sass/block/form/legend.scss
 - _sass/block/form/login.scss
 - _sass/block/form/message.scss
@@ -279,6 +278,7 @@ files:
 - _sass/list/scroller.scss
 - _sass/title/alert.scss
 - _sass/title/browse.scss
+- _sass/title/checkbox.scss
 - _sass/title/copied.scss
 - _sass/title/docs.scss
 - _sass/title/form.scss
@@ -353,6 +353,7 @@ files:
 - assets/js/header/custom/2_Color.js
 - assets/js/header/custom/2_Overlay.js
 - assets/js/header/custom/2_Site.js
+- assets/js/header/custom/2_page.js
 - assets/js/header/custom/2_roller.js
 - assets/js/header/custom/3_Config.js
 - assets/js/header/vendor/enquire.js

data/_sass/block/form/label.scss

@@ -1,15 +0,0 @@
-
-// label {
-
-//   &.jcf-checkbox-label {
-//     cursor: pointer;
-//   }
-
-//   small {
-//     @extend %smallstyle;
-//   }
-// }
-
-// label.form-label {
-//   @extend %bold;
-// }