bookends 10.0.6 → 10.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6601ae27bcdc3f586ffc920edc776313e1a7135049a33df52d22d9acd27980ca
-  data.tar.gz: '042279ceb99e5ed46d7adeabedaeabf2e3c99cece860dbbc16612be3084f7e29'
+  metadata.gz: eda5abadf8cf6af38c32aeeeacdd4140f9206db809b69e6726b3ddfc0348ea94
+  data.tar.gz: 2d4189980390b62ad3a8cdd0a584400bcba41f7000b0f3f931a562dba9376d6c
 SHA512:
-  metadata.gz: 318b7ce84f031cec5767d1a3314b5f87f5518dc31742520fd49c9f596e8af38e828fd406020f54890a42320dd0415f9c9dd59741bba4c71f8b0750cd92f7b39f
-  data.tar.gz: f5aaffbce20ab4840d00bfd5d66c8c872e42a83f02ccad8688203a6b40a7c00c995631f0631b3ec54afa125850c14400fa07f46ee3e59437fa9c03c99c1446a4
+  metadata.gz: b37d847eecaaf691a8596905cb35659f8bea49af23b51886d6e6b4a11b662746b5843d68bfe5f8ac24178e97ddaca5c7d05857d436a185ae5927c4ceec5c16fc
+  data.tar.gz: 2d0c739974543cf727847caf91eb8a2be9f22ab0fddfe3cf5f62a82250351f73c45552af0bbbd2363aebfc347b5e6df7c064a81b04e664d8d35ca8e67dbdeb2a

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

@@ -12,5 +12,4 @@
 @import 'search';
 @import 'search-page';
 @import 'footer';
-@import 'cookie-banner';
 @import 'helpers';

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

@@ -108,9 +108,10 @@
       <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" rel="nofollow">Terms of Service</a></li>
+          <li><a href="<%= ENV['BOOKENDS_TOS_URL'] || 'https://www.salesforce.com/company/legal/sfdc-website-terms-of-service/' %>" rel="nofollow">Terms of Service</a></li>
           <li><a href="https://www.salesforce.com/company/privacy/" rel="nofollow">Privacy</a></li>
           <li><a href="https://www.salesforce.com/company/privacy/full_privacy.jsp#nav_info" rel="nofollow">Cookies</a></li>
+          <li><a class="optanon-toggle-display" rel="nofollow" href="#">Cookie Preferences</a></li>
           <li class="copyright">
             &copy;
             <%= Date.current.year %>

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

@@ -1,5 +1,3 @@
-<div id="heroku-cookie-banner"></div>
-
 <!--googleoff: anchor-->
 <a class="visuallyhidden skip-link" href="#skip-link">Skip Navigation</a>
 <!--googleon: anchor-->

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

@@ -1,21 +1,30 @@
+<% search_target = local_assigns[:search_target].presence || search_path %>
+<% search_base_index = local_assigns[:search_base_index].presence || ENV['ALGOLIA_BASE_INDEX'] %>
+<% www_search_index = local_assigns[:www_search_index].presence || 'www_page_idx' %>
+<% devcenter_search_index = local_assigns[:devcenter_search_index].presence || 'dev_center_article_idx' %>
+<% elements_search_index = local_assigns[:elements_search_index].presence || 'elements_resource_idx' %>
+<% blog_search_index = local_assigns[:blog_search_index].presence || 'blog_post_idx' %>
+
 <div id="bookends-search-page" class="search-page">
   <div class="wrapper wrapper-md">
-    <%= form_tag search_path, method: :get, id: 'search-form' do %>
+    <%= form_tag search_target, method: :get, id: 'search-form' do %>
       <%= text_field_tag :q, params[:q], class: 'form-control', id: 'search-input', autocomplete: 'off', autofocus: true %>
       <%= submit_tag 'Submit search', class: 'search-submit' %>
       <span class="search-icon"></span>
     <% end %>
     <%= hidden_field_tag :search_app_id, ENV['ALGOLIA_APP_ID'], id: 'search-app-id' %>
     <%= hidden_field_tag :search_api_key, ENV['ALGOLIA_SEARCH_API_KEY'], id: 'search-api-key' %>
-    <%= hidden_field_tag :search_base_index, ENV['ALGOLIA_BASE_INDEX'], id: 'search-base-index' %>
+    <%= hidden_field_tag :search_base_index, search_base_index, id: 'search-base-index' %>
+
+    <%= yield if block_given? %>
 
     <% if ENV['SEARCH_BASE_INDEX_ONLY'].nil? || ENV['SEARCH_BASE_INDEX_ONLY'].to_s == 'false' %>
       <nav class="js-index-selector-container search-tabs">
         <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="blog_post_idx">Blog</a></li>
+          <li><a href="#" class="js-index-selector search-tab" data-index="<%= www_search_index %>">WWW</a></li>
+          <li><a href="#" class="js-index-selector search-tab" data-index="<%= devcenter_search_index %>">Dev Center</a></li>
+          <li><a href="#" class="js-index-selector search-tab" data-index="<%= elements_search_index %>">Marketplace</a></li>
+          <li><a href="#" class="js-index-selector search-tab" data-index="<%= blog_search_index %>">Blog</a></li>
         </ul>
       </nav>
     <% end %>

data/lib/bookends/version.rb

@@ -1,3 +1,3 @@
 module Bookends
-  VERSION = '10.0.6'.freeze
+  VERSION = '10.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookends
 version: !ruby/object:Gem::Version
-  version: 10.0.6
+  version: 10.2.0
 platform: ruby
 authors:
 - Marketing Web Ops at heroku
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,14 +104,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,6 @@ files:
 - app/assets/images/nav-flyout-caret.svg
 - app/assets/javascripts/blog-fetcher.js
 - app/assets/javascripts/bookends.js
-- app/assets/javascripts/cookie-banner.js
 - app/assets/javascripts/heroku-namespace.js
 - app/assets/javascripts/lscache.js
 - app/assets/javascripts/md5.js
@@ -237,7 +236,6 @@ files:
 - app/assets/javascripts/vendor/algoliasearch.js
 - app/assets/stylesheets/bookends/_base.scss
 - app/assets/stylesheets/bookends/_colors.scss
-- app/assets/stylesheets/bookends/_cookie-banner.scss
 - app/assets/stylesheets/bookends/_fonts.scss
 - app/assets/stylesheets/bookends/_footer.scss
 - app/assets/stylesheets/bookends/_glostick.scss

data/app/assets/javascripts/cookie-banner.js

@@ -1,49 +0,0 @@
-// Uses cookies to see if users have dismissed the cookie banner.
-// If they haven't, inserts the banner:
-// - if an element with ID = Heroku.CookieBanner.domElementId exists, inserts the content of the banner there
-// - if not, inserts the banner at the top of the body element
-var Heroku = Heroku || {};
-
-Heroku.CookieBanner = {
-  cookieName : 'heroku-cookie-banner-dismissed',
-  cookieDismissedValue : '1',
-  domElementId : 'heroku-cookie-banner',
-  domain : '.heroku.com', // accessible to all subdomains
-  init : function() {
-      var dismissed = Heroku.CookieBanner.getCookie(Heroku.CookieBanner.cookieName) == Heroku.CookieBanner.cookieDismissedValue;
-      if (!dismissed) {
-          Heroku.CookieBanner.insert();
-      } 
-  },
-  insert : function() {
-      var html = '<div class="heroku-cookie-banner" aria-live="polite" role="status"><p>We use cookies to make interactions with our websites and services easy and meaningful, to better understand how they are used and to tailor advertising. You can <a href="https://www.salesforce.com/company/privacy/full_privacy.jsp#nav_info">read more</a> and <a href="https://www.salesforce.com/company/privacy/full_privacy.jsp#nav_info">make your cookie choices here</a>. By continuing to use this site you are giving us your consent to do this.</p> <a class="heroku-cookie-banner__dismiss" href="#" onclick="Heroku.CookieBanner.dismiss(event)"><svg viewBox="0 0 16 16"><path fill-rule="evenodd" d="M6.663 8.01l-3.362 3.362a.955.955 0 0 0-.005 1.352.953.953 0 0 0 1.352-.005L8.01 9.357l3.362 3.362a.955.955 0 0 0 1.352.005.953.953 0 0 0-.005-1.352L9.357 8.01l3.362-3.362a.955.955 0 0 0 .005-1.352.953.953 0 0 0-1.352.005L8.01 6.663 4.648 3.301a.955.955 0 0 0-1.352-.005.953.953 0 0 0 .005 1.352L6.663 8.01z"></path></svg></a></div>';
-      var placeholder = document.getElementById('heroku-cookie-banner');
-      if (placeholder) {
-          placeholder.innerHTML = html;
-      } else {
-          var banner = document.createElement('div');
-          banner.setAttribute('id', Heroku.CookieBanner.domElementId);
-          banner.innerHTML = html;
-          document.body.insertBefore(banner, document.body.childNodes[0]);    
-      }
-  },
-  getCookie: function(name) {
-      var v = document.cookie.match('(^|;) ?' + name + '=([^;]*)(;|$)');
-      return v ? v[2] : null;
-  },
-  setCookie : function(name, value, domain, days) {
-      var d = new Date;
-      d.setTime(d.getTime() + 24*60*60*1000*days);
-      document.cookie = name + '=' + value + ';domain=' + domain + ';path=/;expires=' + d.toGMTString();
-  },
-  dismiss : function(event) {
-      Heroku.CookieBanner.setCookie(Heroku.CookieBanner.cookieName, Heroku.CookieBanner.cookieDismissedValue, Heroku.CookieBanner.domain, 365);
-      var cookieBanner = document.getElementById(Heroku.CookieBanner.domElementId);
-      cookieBanner.parentElement.removeChild(cookieBanner);
-      event.preventDefault();
-  }
-};
-
-document.addEventListener("DOMContentLoaded", function(event) {
-  Heroku.CookieBanner.init();
-});

data/app/assets/stylesheets/bookends/_cookie-banner.scss

@@ -1,91 +0,0 @@
-/* Cookie Banner */
-
-.heroku-cookie-banner {
-  background: #F9F9FB;
-  font-family: inherit;
-  line-height: 1.4;
-  box-shadow: 0 0 0 1px rgba(89,105,128,0.05),0 3px 20px 0 rgba(89,105,128,0.1),0 1px 2px 0 rgba(0,0,0,0.05);
-  position: relative;
-  z-index: 1000;
-  display: flex;
-}
-
-.heroku-cookie-banner a {
-  color: #1969ca;
-}
-
-.heroku-cookie-banner.heroku-cookie-banner p {
-  margin: 0;
-  padding: 0;
-  color: #333D47;
-  padding: 15px 20px;
-  max-width: 1024px;
-  margin-right: auto;
-  font-size: 14px;
-  line-height: 1.4;
-}
-
-.heroku-cookie-banner__dismiss {
-  border-left: 1px solid #e7e7e7;
-  display: flex;
-  padding: 20px;
-  transition: background-color 0.3s;
-}
-
-.heroku-cookie-banner__dismiss:hover {
-  background-color: #F0F7FF;
-}
-
-.heroku-cookie-banner__dismiss svg {
-  width: 16px;
-  height: 100%;
-  fill: currentColor;
-  vertical-align: middle;
-}
-
-/* Media Queries */
-
-@media (max-width: 600px) {
-  .heroku-cookie-banner {
-    font-size: 13px;
-    flex-direction: column;
-  }
-
-  .heroku-cookie-banner p,
-  .heroku-cookie-banner__dismiss {
-    padding: 15px;
-  }
-
-  .heroku-cookie-banner__dismiss {
-    text-decoration: none;
-    border-top: 1px solid #eee;
-    border-left: none;
-  }
-
-  .heroku-cookie-banner__dismiss::after {
-    content: "Dismiss";
-    padding-left: 10px;
-  }
-
-  .heroku-cookie-banner__dismiss svg {
-    height: 16px;
-  }
-}
-
-/* Overrides */
-/* Banner mode */
-#heroku-cookie-banner.banner-mode .heroku-cookie-banner {
-  border-radius: 3px;
-  margin: 20px auto;
-  z-index: 0;
-  max-width: 1024px;
-}
-
-/* Overrides */
-/* Fixed mode */
-#heroku-cookie-banner.fixed-mode .heroku-cookie-banner {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-}