bookends 5.0.0 → 6.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0defd3889881696388e3da2be894c1b111b5a8248c379dd1ceffc088b1eafb8
-  data.tar.gz: d9f1e51cdee2cf32c9ce27a1e8ee778e37ad72e14be1dd9b2e2d8fdf6f325c75
+  metadata.gz: 9a63197f6a24d3856bbc55dd058dadcf453ca2cac435c48d130ecf29556bf70c
+  data.tar.gz: e92ce8600ee9f1e0d3414ab1623d3bfd6c10187dcc2f6b38451b4580b54c63d7
 SHA512:
-  metadata.gz: 8b3a22451da1c98ad4875b953873c3d6e14beaa06c35dd710756c094a318b0caca4a71859eaefbee56ef7e8517efc03c1ab7afe649e924b7cfd9c3af7e1ff0aa
-  data.tar.gz: 49e88928732716373597870a7b4d59d355080a8f7f01690868a8bd8a5b8fd9dddd415d3763e8d1532241ca8181bf81d6574871b86f207e0e21fe4d7896043d1c
+  metadata.gz: f458c5b3e77073611a63d604e6b26431aa03c62f24bffc4bcaaf7db276faef2c858c80ea03b8a9571bf6546764dff5f693f2a1af6edcbbc08243d6fc7f716353
+  data.tar.gz: ba9fb8621ca587268e3d784001127726072b6798a5c0e46b95ab82b6ae5685a75da6ac3ddd5d04c2785e4960099a4e0f96a2b7da9307d8881277e78ada11e7de

data/app/assets/stylesheets/bookends/_cookies.scss

@@ -0,0 +1,86 @@
+#consent_blackbar {
+  #truste-consent-track {
+    background-color: $off-white !important;
+    box-shadow: 0 0 0 1px rgba(89,105,128,0.05),0 3px 20px 0 rgba(89,105,128,0.15),0 1px 2px 0 rgba(0,0,0,0.05);
+    position: relative;
+    z-index: 5;
+  }
+
+  #truste-consent-content {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    min-height: 40px;
+    flex-direction: row-reverse;
+  }
+
+  .truste-text,
+  .truste-cookie-link,
+  .truste-cookie-link2 {
+    font-family: $font-main;
+  }
+
+  .truste-cookie-link,
+  .truste-cookie-link2 {
+    font-weight: $font-bold;
+    letter-spacing: 0.05em;
+    color: $blue;
+    padding-top: 0;
+    line-height: 1.4;
+  }
+
+  .truste-cookie-link2 {
+    padding: 8px 0 8px 20px;
+  }
+
+  .truste-textconsent {
+    line-height: 1.4;
+    margin-left: 20px;
+    flex: 1;
+    padding: 10px 0;
+  }
+
+  .truste-close {
+    padding: 8px 20px 8px 10px;
+  }
+
+  .truste-desktopbuttons {
+    padding: 0 !important;
+  }
+
+  @media (max-width: 768px) {
+    #truste-consent-content {
+      > div,
+      .truste-cookie-link2 {
+        align-self: flex-start;
+      }
+      .truste-cookie-link2 {
+        padding-top: 12px;
+        padding-bottom: 12px;
+      }
+    }
+  }
+
+  @media (max-width: 385px) {
+    > div,
+    .truste-cookie-link2 {
+      position: absolute;
+    }
+    > div {
+      top: 0;
+      right: 0;
+    }
+    .truste-cookie-link2 {
+      top: 0;
+      right: 50px;
+    }
+    .truste-textconsent {
+      padding-top: 40px;
+    }
+  }
+}
+
+#teconsent a {
+  text-decoration: underline;
+  color: #999;
+}

data/app/assets/stylesheets/bookends/_fonts.scss

@@ -3,10 +3,10 @@
 // ==========================================================================
 
 //- Primary font
-@include font-face(BentonSans, 'bentonsans-book', $font-light, $asset-pipeline: true, $file-formats: eot woff ttf svg);
-@include font-face(BentonSans, 'bentonsans-regular', $font-normal, $asset-pipeline: true, $file-formats: eot woff ttf svg);
-@include font-face(BentonSans, 'bentonsans-medium', $font-bold, $asset-pipeline: true, $file-formats: eot woff ttf svg);
+@include font-face(BentonSans, 'bentonsans-book', 200, $asset-pipeline: true, $file-formats: eot woff ttf svg);
+@include font-face(BentonSans, 'bentonsans-regular', normal, $asset-pipeline: true, $file-formats: eot woff ttf svg);
+@include font-face(BentonSans, 'bentonsans-medium', bold, $asset-pipeline: true, $file-formats: eot woff ttf svg);
 
 //- Monospace font
-@include font-face(Inconsolata, 'inconsolata-regular', $font-normal, $asset-pipeline: true, $file-formats: eot woff ttf svg);
-@include font-face(Inconsolata, 'inconsolata-bold', $font-bold, $asset-pipeline: true, $file-formats: eot woff ttf svg);
+@include font-face(Inconsolata, 'inconsolata-bold', bold, $asset-pipeline: true, $file-formats: eot woff ttf svg);
+@include font-face(Inconsolata, 'inconsolata-regular', normal, $asset-pipeline: true, $file-formats: eot woff ttf svg);

data/app/assets/stylesheets/bookends/_footer.scss

@@ -93,7 +93,7 @@
   ul {
     list-style: none;
     padding-left: 0;
-    font-weight: $font-light;
+    font-weight: 200;
   }
 
   h1,
@@ -108,14 +108,14 @@
   h3 {
     color: $color-purple;
     font-size: 14px;
-    font-weight: $font-normal;
+    font-weight: 500;
   }
 
   h4 {
     margin: 1.33em 0;
     font-size: 12px;
     text-align: left;
-    font-weight: $font-bold;
+    font-weight: bold;
     text-transform: uppercase;
     letter-spacing: .1em;
     color: $color-header;
@@ -202,7 +202,7 @@
 
       position: relative;
       width: 100%;
-      padding-bottom: 15px;
+      padding-bottom: 10px;
       @include screen(min-width, $threshold-tablet) {
         border-bottom: 1px solid $color-border;
       }
@@ -240,7 +240,7 @@
         text-transform: uppercase;
         letter-spacing: .05em;
         padding: 0;
-        font-weight: $font-bold;
+        font-weight: bold;
         text-align: center;
         color: #fff;
 
@@ -277,16 +277,6 @@
       }
     }
 
-    .language-select {
-      margin-top: 10px;
-      > a {
-        margin: 0 5px;
-        @include screen(min-width, $threshold-tablet) {
-          margin: 0 5px 0 0;
-        }
-      }
-    }
-
     iframe {
       position: relative;
       width: 100%;
@@ -342,7 +332,7 @@
       text-transform: uppercase;
       letter-spacing: .05em;
       font-size: 10px;
-      font-weight: $font-bold;
+      font-weight: bold;
 
       @include screen() {
         display: inline-block;
@@ -441,7 +431,7 @@
     margin-top: 0;
     min-width: 200px;
     font-size: 14px;
-    font-weight: $font-normal;
+    font-weight: normal;
     display: none;
 
     @include screen(min-width, $threshold-tablet) {
@@ -477,7 +467,7 @@
 
     a {
       color: #444;
-      font-weight: $font-normal;
+      font-weight: 400;
 
       &:hover {
         color: $color-purple;

data/app/assets/stylesheets/bookends/_glostick.scss

@@ -54,7 +54,7 @@ $gs-asset-path: 'bookends/glostick_icons';
   transition: .4s cubic-bezier(.3, 0, 0, 1.3);
   background-clip: content-box;
   z-index: 9991;
-  font-weight: $font-normal;
+  font-weight: normal;
   z-index: 2;
 
   @media (min-width: 1024px) {

data/app/assets/stylesheets/bookends/_google-cse.scss

@@ -79,10 +79,10 @@ input.gsc-input,
 .gssb_a td {
   line-height: normal !important;
   padding: 2px 5px !important;
-  font-weight: $font-bold;
+  font-weight: bold;
 
   b {
-    font-weight: $font-light;
+    font-weight: 200;
     color: fade-out(#222, .2);
   }
 
@@ -219,7 +219,7 @@ input.gsc-input,
     color: #999 !important;
     min-width: 75px !important;
     border-radius: 0 !important;
-    font-weight: $font-light !important;
+    font-weight: 300 !important;
     @include box-sizing(border-box);
     &:hover, &:focus {
       background: transparent !important;
@@ -232,7 +232,7 @@ input.gsc-input,
     &.gsc-tabhActive {
       color: $purple !important;
       cursor: default;
-      font-weight: $font-bold !important;
+      font-weight: bold !important;
       background: transparent !important;
       border-bottom: 2px solid $purple !important;
     }
@@ -375,7 +375,7 @@ input.gsc-input,
 
 .gs-promotion.gs-result a.gs-title:link,
 .gs-promotion.gs-result a.gs-title:visited {
-  font-weight: $font-bold;
+  font-weight: bold;
 }
 
 //Pagination

data/app/assets/stylesheets/bookends/_header.scss

@@ -52,7 +52,7 @@
 
   position: relative;
   font-size: 14px;
-  font-weight: $font-bold;
+  font-weight: 600;
   -webkit-font-smoothing: antialiased;
   line-height: 1;
 
@@ -208,7 +208,7 @@
     font-size: $font-sm;
     min-width: 200px;
     font-size: 14px;
-    font-weight: $font-normal;
+    font-weight: normal;
 
     &.wide {
       min-width: 220px;
@@ -251,7 +251,7 @@
 
     li a {
       color: #444;
-      font-weight: $font-normal;
+      font-weight: 400;
 
       &:hover {
         color: $purple;
@@ -423,12 +423,12 @@
           font-size: $font-sm;
           line-height: 1.4;
           color: #333;
-          font-weight: $font-normal;
+          font-weight: 500;
           margin: .7em 0;
 
           a {
             color: #333;
-            font-weight: $font-bold;
+            font-weight: 600;
 
             &:hover {
               color: $purple;
@@ -470,7 +470,7 @@
       color: white;
       background: #96A3B6;
       border-radius: 18px;
-      font-weight: $font-bold;
+      font-weight: bold;
       text-transform: uppercase;
       vertical-align: middle;
       margin-left: 5px;
@@ -645,7 +645,7 @@
 
         a {
           color: fade-out($white, .2);
-          font-weight: $font-normal;
+          font-weight: 500;
 
           &:hover {
             color: $blue;
@@ -839,7 +839,7 @@
         color: fade-out($white, .5);
         font-size: 13px !important;
         line-height: 1.35;
-        font-weight: $font-light;
+        font-weight: 300;
         @include transition(.15s ease-in-out);
         -webkit-font-smoothing: subpixel-antialiased;
 
@@ -989,7 +989,7 @@
   float: left;
   padding: .7em 0 0 .8em;
   font-size: 1.25em;
-  font-weight: $font-normal;
+  font-weight: 400;
 }
 
 #hero {

data/app/assets/stylesheets/bookends/_search-page.scss

@@ -131,7 +131,7 @@ $search-icon-size: 14px;
     border-bottom: 2px solid transparent;
     line-height: 1.2;
     font-size: 13px;
-    font-weight: $font-light;
+    font-weight: 300;
     color: #999;
 
     &:hover, &:focus {
@@ -145,7 +145,7 @@ $search-icon-size: 14px;
     &.active {
       border-bottom-color: $purple;
       cursor: default;
-      font-weight: $font-bold;
+      font-weight: bold;
       color: $purple;
     }
   }
@@ -190,7 +190,7 @@ $search-icon-size: 14px;
 
   .search-result-title {
     margin-bottom: 0;
-    font-weight: $font-normal;
+    font-weight: normal;
 
     a:link,
     a:visited {

data/app/assets/stylesheets/bookends/_search.scss

@@ -26,7 +26,7 @@
   }
 
   .aa-dropdown-menu .aa-suggestion em {
-    font-weight: $font-bold;
+    font-weight: bold;
     font-style: normal;
   }
 }

data/app/assets/stylesheets/bookends/_variables.scss

@@ -35,9 +35,9 @@ $font-main: "BentonSans", "Helvetica Neue", sans-serif;
 $font-mono: "Inconsolata", monospace;
 
 //- Font Weights
-$font-light: 300;
-$font-normal: 400;
-$font-bold: 700;
+$font-light: 100;
+$font-normal: normal;
+$font-bold: bold;
 
 //- Layout
 $grid-full: 100%;

data/app/assets/stylesheets/bookends/bookends.scss

@@ -14,3 +14,4 @@
 @import 'search';
 @import 'search-page';
 @import 'footer';
+@import 'cookies';

data/app/views/bookends/_footer.html.erb

@@ -32,7 +32,7 @@
           <li><a href="<%= Bookends::Config.host_www %>/customers">Our Customers</a></li>
           <li><a href="https://www.salesforce.com/company/careers/">Careers</a></li>
           <li><a href="<%= Bookends::Config.host_www %>/partnering">Partners</a></li>
-          <li><a href="<%= Bookends::Config.host_www %>/elements">Elements Marketplace</a></li>
+          <li><a href="<%= Bookends::Config.host_www %>/elements">Elements</a></li>
         </ul>
       </nav>
       <nav class="col">
@@ -84,11 +84,6 @@
         <li><a class="heroku-footer-icon-github" href="https://github.com/heroku" target="_blank" title="Heroku's GitHub">GitHub</a></li>
         <li><a class="heroku-footer-icon-linkedin" href="https://www.linkedin.com/company/heroku" target="_blank" title="Heroku's LinkedIn">LinkedIn</a></li>
       </ul>
-      <% if ENV['BOOKENDS_JP_LINK'] == 'true' %>
-        <div class="language-select">
-          <a href="https://jp.heroku.com/home">日本語</a>
-        </div>
-      <% end %>
     </div>
   </div>
   <div class="tertiary">
@@ -99,9 +94,14 @@
       <div class="col">
         <ul>
           <li><a href="<%= Bookends::Config.host_www %>/home">heroku.com</a></li>
-          <li><a href="<%= Bookends::Config.host_www %>/policy/salesforce-heroku-msa">Terms of Service</a></li>
+          <li><a href="https://www.salesforce.com/company/legal/sfdc-website-terms-of-service.jsp">Terms of Service</a></li>
           <li><a href="https://www.salesforce.com/company/privacy/">Privacy</a></li>
+          <li><span id="teconsent"></span></li>
           <li><a href="https://www.salesforce.com/company/privacy/full_privacy.jsp#nav_info">Cookies</a></li>
+          <li>
+            <% # Placeholder a link to TrustArc's Cookie Consent Manager %>
+            <div id="teconsent"></div>
+          </li>
           <li class="copyright">
             &copy;
             <%= Date.current.year %>
@@ -112,3 +112,4 @@
     </div>
   </div>
 </footer>
+<script async="async" src=//consent.trustarc.com/notice?domain=salesforce.com&c=teconsent&js=bb&noticeType=bb&text=true&pcookie crossorigin=""></script>

data/app/views/bookends/_header.html.erb

@@ -1,3 +1,9 @@
+<% # Loads JS to render TrustArc's Cookie Consent Manager %>
+<script async="async" src=//consent.trustarc.com/notice?domain=salesforce.com&c=teconsent&js=bb&noticeType=bb&text=true&pcookie crossorigin=""></script>
+
+<% # Placeholder for TrustArc's Cookie Consent Manager %>
+<div id="consent_blackbar"></div>
+
 <header id="header">
   <nav id="navigation" role="navigation">
     <span class="mobile-nav" aria-hidden="true">
@@ -48,7 +54,7 @@
             </ul>
           </li>
           <li class="has-dropdown">
-            <a href="<%= Bookends::Config.host_elements %>">Marketplace</a>
+            <a href="<%= Bookends::Config.host_elements %>">Elements</a>
             <ul class="dropdown">
               <li><a class="bookends-icon addons" href="<%= Bookends::Config.host_elements %>/addons">Add-ons</a></li>
               <li><a class="bookends-icon buttons" href="<%= Bookends::Config.host_elements %>/buttons">Buttons</a></li>
@@ -129,7 +135,7 @@
                     <a class="glostick__menu__item glostick__menu__item--dashboard" href="https://dashboard.heroku.com">Dashboard</a>
                     <a class="glostick__menu__item glostick__menu__item--databases" href="https://postgres.heroku.com">Databases</a>
                     <a class="glostick__menu__item glostick__menu__item--dataclips" href="https://dataclips.heroku.com">Dataclips</a>
-                    <a class="glostick__menu__item glostick__menu__item--elements" href="<%= Bookends::Config.host_elements %>">Marketplace</a>
+                    <a class="glostick__menu__item glostick__menu__item--elements" href="<%= Bookends::Config.host_elements %>">Elements</a>
                     <a class="glostick__menu__item glostick__menu__item--docs" href="<%= Bookends::Config.host_dev_center %>">Documentation</a>
                     <a class="glostick__menu__item glostick__menu__item--support" href="https://help.heroku.com">Support</a>
                   </div>

data/app/views/bookends/_search_page.html.erb

@@ -13,7 +13,7 @@
         <ul>
           <li><a href="#" class="js-index-selector search-tab" data-index="www_page_idx">WWW</a></li>
           <li><a href="#" class="js-index-selector search-tab" data-index="dev_center_article_idx">Dev Center</a></li>
-          <li><a href="#" class="js-index-selector search-tab" data-index="elements_resource_idx">Marketplace</a></li>
+          <li><a href="#" class="js-index-selector search-tab" data-index="elements_resource_idx">Elements</a></li>
           <li><a href="#" class="js-index-selector search-tab" data-index="blog_post_idx">Blog</a></li>
         </ul>
       </nav>

data/lib/bookends/version.rb

@@ -1,3 +1,3 @@
 module Bookends
-  VERSION = '5.0.0'.freeze
+  VERSION = '6.0.0.rc1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookends
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0.rc1
 platform: ruby
 authors:
 - Marketing Web Ops at heroku
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -279,6 +279,7 @@ files:
 - app/assets/javascripts/vendor/algoliasearch.js
 - app/assets/stylesheets/bookends/_base.scss
 - app/assets/stylesheets/bookends/_colors.scss
+- app/assets/stylesheets/bookends/_cookies.scss
 - app/assets/stylesheets/bookends/_fonts.scss
 - app/assets/stylesheets/bookends/_footer.scss
 - app/assets/stylesheets/bookends/_glostick.scss
@@ -1129,9 +1130,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6