bookends 10.1.0beta2 → 10.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29fd5bf9df9299ddd108d242564c73eb6070a6cf448611c2c183436eb8fe0453
-  data.tar.gz: d91dae4f604ef84be089a2ce92b17f482a053b1eb066154146a43a0473c6793c
+  metadata.gz: d46a1a7b6ac9fc879abb7fe26d8ff49da3ad306c268c20630611fae84f1df2c2
+  data.tar.gz: bafacf3b305d4e3cb079b9d41f9c2e15bbc491a172684b9892dae1fd76f76e71
 SHA512:
-  metadata.gz: 02aea68b0be0cabaf7f5bc13ae2cfa6914c8ca85b82b80ecc04f5152efbf20086236f5f6445d7ef7bb69a97c2316bac6b9364a9dffe3ec583c17caa8b41c96c1
-  data.tar.gz: 4ac2909e04256d131ec46b74e372aa933a64b212db2b683467606af66122d5b8871c5073a14e58ee6bd23482342a9ca94998daac09528ae3c9ec7bdbf76a365a
+  metadata.gz: 8a20833745a9ba79df41c1282927fee797c4c39aa8334dbe9fd477f4b01b1115d80e54d877b93c419e448ff6bc87be80cd7fb428a73eed9c87f86fce1e7ee742
+  data.tar.gz: 0c914e3be6ac6961940da53fe41d412ca90ad7129e11a00acb808b3040feb608970b31c001031d612cd26e92264a438b4b25863b489ec50d2f5c87347ef15a0a

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

@@ -91,7 +91,7 @@
         <li><a class="heroku-footer-icon-instagram" href="https://instagram.com/heroku" target="_blank" aria-label="Opens in new window" title="Heroku's Instagram">Instagram</a></li>
         <li><a class="heroku-footer-icon-github" href="https://github.com/heroku" target="_blank" aria-label="Opens in new window" title="Heroku's GitHub">GitHub</a></li>
         <li><a class="heroku-footer-icon-linkedin" href="https://www.linkedin.com/company/heroku" target="_blank" aria-label="Opens in new window" title="Heroku's LinkedIn">LinkedIn</a></li>
-        <li><a class="heroku-footer-icon-youtube" href="https://www.youtube.com/c/HerokuOfficial" target="_blank" aria-label="Opens in new window" title="Heroku's YouTube">YouTube</a></li>
+        <li><a class="heroku-footer-icon-youtube" href="https://www.youtube.com/c/SalesforceDevelopers/community" target="_blank" aria-label="Opens in new window" title="Heroku's YouTube">YouTube</a></li>
       </ul>
       <% if ENV['BOOKENDS_JP_LINK'] == 'true' %>
         <div class="language-select">
@@ -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,5 +1,10 @@
 <% 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_target, method: :get, id: 'search-form' do %>
@@ -16,10 +21,10 @@
     <% 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.1.0beta2'.freeze
+  VERSION = '10.2.1'.freeze
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: bookends
 version: !ruby/object:Gem::Version
-  version: 10.1.0beta2
+  version: 10.2.1
 platform: ruby
 authors:
 - Marketing Web Ops at heroku
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.22
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.22
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -82,22 +82,22 @@ dependencies:
   name: fernet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   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
@@ -315,7 +313,7 @@ files:
 homepage: https://www.heroku.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -326,12 +324,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.6
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: an engine to abstract common html/css elements across Heroku properties
 test_files:

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%;
-}