futuro 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8d532048cda7acded9476c29dfa26ca4faa30f5b3d80d61738c276df099b769
-  data.tar.gz: 6fbfa5686c11991a13c8421088feb32b1dfa8accd4399fcedd809449f0633707
+  metadata.gz: 720071786f7c677ea700175db2af8fc0dc0dd4cdc0174a288f516a2228b4ac96
+  data.tar.gz: 65931a89b40347a11f769c9d449d2ad5f61e8ae5db9ca52e658846f49af82b3a
 SHA512:
-  metadata.gz: 649090165f9e66df10fca1275587545cdcb4dffd697b6793d0cdc071ba271c982239bcc59f1fcc975e5aef1981f565a0c2303c6aaab87d6180fb4321d3557a16
-  data.tar.gz: e66a6434dbf2bef1ee9fb571bb5f8fd5473e03d4ec70e062ce3ec31b7cd0676373352b76ad7f693095a0aeb651da8a86d6e196be66a454b7ee67384ea2197a22
+  metadata.gz: f9d37024eef43ccf7e947ea7bb7c2fedb350641d70347c2977a1db72de6c39d664101f9873af6f4b68ffbb31efcb3c4b360dda271b0381517726388b56837085
+  data.tar.gz: 8ac9a2dfead8aa2d3d1bc528a84c6ca4d18886949d4a4362ad8551b226571aec1094902bc11777ce7ee132db08045f456183f38458e9c7c1e2a355c1c1fc8276

data/_includes/html/page/topbar.liquid

@@ -17,7 +17,7 @@
 
         {% if page.live %}
 
-          <div>
+          <div class="btn nav-book {{ page.label }}">
             <a class="lnk nav {{ page.label }}" href="{%- if site.setup.install == 'library' -%}{{ page.label | downcase | prepend: '/' }}{%- else -%}/{%- endif -%}">
               <strong>{{ page.label }}</strong>
             </a>

data/_sass/_btn.scss

@@ -2,14 +2,21 @@
 .btn {
   -webkit-tap-highlight-color: transparent;
   background-color: transparent;
+}
+
+.btn.nav-book {
+  place-content: center;
+  padding-right: 20px;
+  padding-left: 20px;
+  display: grid;
+}
 
-  &.submit {
-    background-color: $gray;
-    border-radius: 2px;
-    cursor: pointer;
-    display: block;
-    padding: 10px;
-    border: none;
-    width: 100%;
-  }
+.btn.submit {
+  background-color: $gray;
+  border-radius: 2px;
+  cursor: pointer;
+  display: block;
+  padding: 10px;
+  border: none;
+  width: 100%;
 }

data/_sass/_lnk.scss

@@ -4,6 +4,7 @@
   &.nav {
     text-transform: capitalize;
     text-decoration: none;
+    line-height: 1.1;
   }
 
   &.scroller {

data/_sass/_nav.scss

@@ -5,32 +5,27 @@
   svg {
     fill: $gray;
   }
+}
 
-  &.left {
-    justify-content: flex-start;
-    grid-auto-flow: column;
-    align-content: center;
-    grid-gap: 18px;
-    display: grid;
-  }
-
-  &.main {
-    grid-auto-flow: column;
-    align-content: center;
-    text-align: center;
-    font-size: 21px;
-    display: grid;
+.nav.left {
+  justify-content: flex-start;
+  grid-auto-flow: column;
+  align-content: center;
+  grid-gap: 18px;
+  display: grid;
+}
 
-    > div {
-      width: 120px;
-    }
-  }
+.nav.main {
+  grid-auto-flow: column;
+  text-align: center;
+  font-size: 21px;
+  display: grid;
+}
 
-  &.right {
-    justify-content: flex-end;
-    grid-auto-flow: column;
-    align-content: center;
-    grid-gap: 18px;
-    display: grid;
-  }
+.nav.right {
+  justify-content: flex-end;
+  grid-auto-flow: column;
+  align-content: center;
+  grid-gap: 18px;
+  display: grid;
 }

data/_sass/_wrap.scss

@@ -46,10 +46,6 @@
 
 .wrap.book {
 
-  &.orwell {
-    background-color: black;
-  }
-
   &.draft {
     background-color: rgba(black,10%);
   }

data/_sass/block/results.scss

@@ -0,0 +1,33 @@
+
+.block.results {
+  list-style: none;
+}
+
+.block.results-entry {
+  cursor: pointer;
+  grid-gap: 5px;
+  padding: 10px;
+  display: grid;
+
+  &:hover {
+    background-color: rgba(black,10%);
+  }
+}
+
+.block.results-info {
+  justify-content: flex-start;
+  grid-auto-flow: column;
+  align-items: center;
+  line-height: 1;
+  grid-gap: 7px;
+  display: grid;
+}
+
+.block.results-dot {
+  background-color: $gun;
+  border-radius: 50%;
+  position: relative;
+  height: 15px;
+  width: 15px;
+  top: 1px;
+}

data/_sass/helpers/_mixins.scss

@@ -44,14 +44,43 @@
   position: absolute;
 }
 
-@mixin ThemeResults($col) {
-  color: $col;
+@mixin Theme($name,$col) {
 
-  &:hover {
-    background-color: rgba($col,10%);
+  // Home Books
+
+  .wrap.book.#{$name} {
+    background-color: $col;
+  }
+
+  // Topbar Links
+
+  .btn.nav-book.#{$name} {
+    &:hover {
+      background-color: rgba($col,10%);
+    }
+  }
+
+  .lnk.nav.#{$name} {
+    color: $col;
   }
 
-  .block.results-dot {
+  // Chapter Covers
+
+  .area.type-chapter.book-#{$name} {
     background-color: $col;
   }
+
+  // Search Results
+
+  .block.results-entry.book-#{$name} {
+    color: $col;
+
+    &:hover {
+      background-color: rgba($col,10%);
+    }
+
+    .block.results-dot {
+      background-color: $col;
+    }
+  }
 }

data/_sass/helpers/_variables.scss

@@ -1,5 +1,4 @@
 
-$orwell : #000000;
 $system : #6e46a0;
 $brand  : #ff8200;
 $supply : #f00a0a;
@@ -22,8 +21,11 @@ $gun    : darken(white,60%);
 $carbon : lighten(black,10%);
 $coal   : lighten(black,5%);
 
-$animate : #f00a0a;
-$form    : #005a9b;
+$orwell : blue;
+$woolf  : green;
+
+$animate : black;
+$form    : lighten(black,20%);
 
 $min640  : 'only screen and (min-width: 640px)';
 $min768  : 'only screen and (min-width: 768px)';

data/assets/css/styles.scss

@@ -2,3 +2,6 @@
 ---
 
 @import "futuro";
+
+@include Theme(orwell,$orwell);
+@include Theme(woolf,$woolf);

data/assets/js/footer/custom/SwitchFocus.js

@@ -3,12 +3,10 @@ const SwitchFocus = () => {
 
   $("input,textarea").focusin(function() {
     Site.focus = true;
-    console.log("site.focus",Site.focus);
   });
 
   $("input,textarea").focusout(function() {
     Site.focus = false;
-    console.log("site.focus",Site.focus);
   });
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: futuro
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Paul Heading
@@ -162,9 +162,9 @@ files:
 - _sass/_wrap.scss
 - _sass/area/_overlay.scss
 - _sass/area/_topbar.scss
-- _sass/block/_browse.scss
-- _sass/block/_results.scss
-- _sass/block/_util.scss
+- _sass/block/browse.scss
+- _sass/block/results.scss
+- _sass/block/util.scss
 - _sass/fonts/_lite.scss
 - _sass/fonts/_max.scss
 - _sass/futuro.lite.scss

data/_sass/block/_results.scss

@@ -1,39 +0,0 @@
-
-.block {
-
-  &.results {
-    list-style: none;
-  }
-
-  &.results-entry {
-    cursor: pointer;
-    grid-gap: 5px;
-    padding: 10px;
-    display: grid;
-
-    &:hover {
-      background-color: rgba(black,10%);
-    }
-
-    &.book-orwell {
-      @include ThemeResults($orwell);
-    }
-  }
-
-  &.results-info {
-    justify-content: flex-start;
-    grid-auto-flow: column;
-    line-height: 1;
-    grid-gap: 7px;
-    display: grid;
-  }
-
-  &.results-dot {
-    background-color: $gun;
-    border-radius: 50%;
-    position: relative;
-    height: 15px;
-    width: 15px;
-    top: 1px;
-  }
-}