uswds-jekyll 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84151ee36e5dee15c291972675e4d0729dbcf813886683f27efa8548b2cb550d
-  data.tar.gz: 68991524fdfd3a08ca5642dd9d41bf1c7308eade2477802f0d8dceb7a83d8eeb
+  metadata.gz: 29e08c0c93242d0988e5b023c39b250ecb253f039ad18db213a11a0c19232c27
+  data.tar.gz: 31e0ba8838991c621837ddd6790a972174f4b56ed3b7920ef3ec68f9f93fe53c
 SHA512:
-  metadata.gz: 8eccde348a2be434e4f280293b1e181069f1487766317cce3dbd4a5fe5caaed4d0424f13225659b32f6c2535aae2150afe9a5860179d57b6529aa68457880084
-  data.tar.gz: 9c451c5628afca130330ea6336c945c780959bcab350fd8c5cf133ab27eaf142098691fa6dc6bb3578059c39f1511036b541f371898c4c42336737ac3a01b5f4
+  metadata.gz: 3bc6518ab545cce8c5dcca05413cf759a66f0114cea6d5e3df31519b2a8092366c8d3ea5518a0571cd78b489e47dad9e08ac9f01dd094eec05d0930aa379e8d1
+  data.tar.gz: 70820de8069997a91357ba38291226ac4d4093817aaf5cd27f72c5e0824db79ea3c3d3be86bba6e914abbb0ec542f79b9e96e78e4ca6edd1534ebfcb64e0d464

data/README.md

@@ -20,6 +20,7 @@ This is a [Jekyll theme](https://jekyllrb.com/docs/themes/) for the
    - [Analytics](#analytics)
    - [Last modified date](#last-modified-date)
    - [Anchor JS](#anchor-js)
+   - [Private Eye JS](#private-eye-js)
 1. [Assets](#assets)
    - [Stylesheets](#stylesheets)
    - [Scripts](#scripts)
@@ -311,6 +312,14 @@ You can show an anchor link next to header tags by uncommenting this section fro
 # anchor_js_targets: [h1, h2, h3, h4, h5, h6]
 ```
 
+### Private Eye JS
+
+By default, the USWDS Jekyll theme uses [Private Eye](https://github.com/18F/private-eye) to denote private links. You can turn this off with the setting below. If you would like to customize the default Private Eye configuration, you can find it in `/assets/js/private_eye_conf.js`.
+
+```yml
+private_eye: false
+```
+
 ## Assets
 
 The [stylesheet](_includes/styles.html) and [script](_includes/scripts.html) includes each incorporate the USWDS CSS and JS files if the corresponding `styles` and `scripts` lists aren't defined in your `_config.yml`. So unless you add one or both of those manually, your HTML will include the following:
@@ -536,9 +545,6 @@ See [this example pull request](https://github.com/18F/before-you-ship/pull/458)
    --> footer.yml
    type: [slim | default | big]
 
-   --> navigation.yml
-   sidenav-breakpoint: {{ breakpoint_token }}
-
    --> theme.yml (examples)
    colors:
      usa-banner:

data/_includes/scripts.html

@@ -1,18 +1,25 @@
+<!-- dynamically determine scripts needed for this config -->
 {% assign _scripts = '' | split: '' %}
 {% assign _async_marker = 'uswds_async=true' %}
 {% assign _site_scripts = site.scripts %}
 {% unless _site_scripts -%}
   {% assign _uswds_js = '/assets/uswds/js/uswds.min.js' | append: '?' | append: _async_marker %}
-  {% assign _site_scripts = '' | split: ''
-    | push: _uswds_js %}
-    {% if site.anchor_js_targets %}
-      {% assign _anchor_js = '/assets/js/vendor/anchor.min.js' %}
-      {% assign _main_js = '/assets/js/main.js' %}
-      {% assign _site_scripts = _site_scripts
-        | push: _anchor_js
-        | push: _main_js %}
-    {% endif %}
+  {% assign _site_scripts = '' | split: '' | push: _uswds_js %}
+  {% if site.anchor_js_targets %}
+    {% assign _anchor_js = '/assets/js/vendor/anchor.min.js' %}
+    {% assign _anchor_conf_js = '/assets/js/anchor.js' %}
+    {% assign _site_scripts = _site_scripts
+      | push: _anchor_js
+      | push: _main_js %}
+  {% endif %}
 {% endunless %}
+{% if site.private_eye %}
+  {% assign _pi_js = '/assets/js/vendor/private_eye.js' %}
+  {% assign _pi_conf_js = '/assets/js/private_eye_conf.js' %}
+  {% assign _site_scripts = _site_scripts
+    | push: _pi_js
+    | push: _pi_conf_js %}
+{% endif %}
 {% assign _scripts = _scripts
   | push: _site_scripts
   | push: layout.scripts

data/_sass/uswds/components/_side-nav.scss

@@ -33,16 +33,14 @@
   }
 }
 
-@if variable-exists(theme-sidenav-breakpoint) {
-  @include at-media($theme-sidenav-breakpoint){
-    .usa-layout-docs__sidenav {
-      @include u-flex(3);
-      order: 1;
-      padding-top: 0;
-    }
-    .usa-layout-docs__main {
-      @include u-flex(9);
-      order: 2;
-    }
+@include at-media($theme-sidenav-breakpoint){
+  .usa-layout-docs__sidenav {
+    @include u-flex(3);
+    order: 1;
+    padding-top: 0;
   }
-}
+  .usa-layout-docs__main {
+    @include u-flex(9);
+    order: 2;
+  }
+}

data/_sass/uswds/src/core/mixins/_utility-builder.scss

@@ -63,7 +63,7 @@ future version of Sass' warning.
   $value-is-map: if(type-of($val-props) == "map", true, false);
 
   @if $media-key {
-    $media-prefix: #{$media-key}\: ;
+    $media-prefix: #{$media-key}\:;
   }
 
   .#{$media-prefix}#{ns("utility")}#{$selector} {
@@ -268,7 +268,7 @@ through all possible variants
               // all our build in the same loop.
 
               $our-modifiers: (
-                "slug": null
+                "slug": null,
               );
             }
 

data/_sass/uswds/src/settings/_settings-spacing.scss

@@ -7,7 +7,7 @@
 ========================================
 ========================================
 ----------------------------------------
-USWDS 2.7.0
+USWDS 2.9.0
 ----------------------------------------
 SPACING SETTINGS
 ----------------------------------------

data/_sass/uswds/src/theme/_uswds-theme-spacing.scss

@@ -7,7 +7,7 @@
 ========================================
 ========================================
 ----------------------------------------
-USWDS 2.4.0
+USWDS 2.9.0
 ----------------------------------------
 SPACING SETTINGS
 ----------------------------------------

data/_sass/uswds/src/utilities/utility-fonts.scss

@@ -13,7 +13,7 @@ $if-important: "";
 
 @each $face, $stack in $project-font-stacks {
   @if $stack {
-    [class*="#{ns("utility")}font-#{$face}-"] {
+    [class*="#{ns('utility')}font-#{$face}-"] {
       font-family: #{$stack}#{$if-important};
     }
   }

data/assets/css/uswds-theme.scss

@@ -32,9 +32,7 @@
   @import 'uswds/components/site-width';
 {% endif %}
 
-{% if site.data.navigation.sidenav-breakpoint %}
-  $theme-sidenav-breakpoint: '{{ site.data.navigation.sidenav-breakpoint }}';
-{% endif %}
+$theme-sidenav-breakpoint: '{{ site.data.navigation.sidenav-breakpoint | default: "desktop" }}';
 
 // Banner colors
 {% assign colors_banner = site.data.theme.colors.usa-banner %}

data/assets/js/private_eye_conf.js

@@ -0,0 +1,39 @@
+
+document.addEventListener('DOMContentLoaded', function() {
+    PrivateEye({
+      defaultMessage: "This link is private to TTS.",
+      ignoreUrls: [
+        '18f.slack.com',
+        'anywhere.gsa.gov',
+        'bookit.gsa.gov',
+        'calendar.gsa.gov',
+        'connect.gsa.gov',
+        'docs.google.com',
+        'drive.google.com',
+        'ea.gsa.gov',
+        'email.gsa.gov',
+        'eopf.opm.gov',
+        'gcims.gsa.gov',
+        'github.com/18F/Accessibility_Reviews',
+        'github.com/18F/blog-drafts',
+        'github.com/18F/codereviews',
+        'github.com/18F/DevOps',
+        'github.com/18F/Infrastructure',
+        'github.com/18F/security-incidents',
+        'github.com/18F/staffing',
+        'github.com/18F/team-api.18f.gov',
+        'github.com/18F/writing-lab',
+        'gkey.gsa.gov',
+        'gsa-tts.slack.com',
+        'gsa.my.salesforce.com',
+        'gsaolu.gsa.gov',
+        'hrlinks.gsa.gov',
+        'hrprod.hr.gsa.gov',
+        'insite.gsa.gov',
+        'mail.gsa.gov',
+        'meet.gsa.gov',
+        'sign.gsa.gov',
+        'tock.18f.gov'
+      ]
+    });
+  }, false );

data/assets/js/vendor/private_eye.js

@@ -0,0 +1,106 @@
+// https://github.com/18F/private-eye
+(function() {
+    'use strict';
+  
+    // The line below differs from private eye v2.0. We need to update the source file.
+    var STYLES = 'a.private-link::after { content: "\\1F512"; font-size: 0.75em; text-decoration: none }';
+    var STYLES_ID = '_privateEye-styles';
+  
+    var DEFAULT_OPTIONS = {
+      defaultMessage: 'This is a link to a private site, which may or may not be accessible to you.',
+      wrapper: ''
+    };
+  
+    var isString = function(str) { return !!str && typeof str === 'string'; };
+    var isArray = function(arr) { return !!arr && arr.length; };
+  
+    var optionValidators = {
+      defaultMessage: isString,
+      wrapper: isString,
+      ignoreUrls: isArray,
+    };
+  
+    function setStyles() {
+      var styles = document.createElement('style');
+      styles.innerHTML = STYLES;
+      styles.id = STYLES_ID;
+      document.body.appendChild(styles);
+    }
+  
+    function getOptions(opts) {
+      var newObj = {};
+  
+      for (var prop in DEFAULT_OPTIONS) {
+        newObj[prop] = DEFAULT_OPTIONS[prop];
+      }
+  
+      for (var prop in opts) {
+        var val = opts[prop];
+  
+        if (optionValidators[prop](val)) {
+          newObj[prop] = val;
+        }
+      }
+  
+      return newObj;
+    }
+  
+    var PrivateEye = function(opts) {
+      // The old docs recommend calling this as a function. This is here to detect
+      // those cases and make sure backward compatibility stays intact now that the
+      // new syntax is preferred.
+      if (!(this instanceof PrivateEye)) {
+        return new PrivateEye(opts);
+      }
+  
+      // Don't add the styles to the page more than once.
+      if (!document.getElementById(STYLES_ID)) {
+        setStyles();
+      }
+  
+      this.opts = getOptions(opts);
+  
+      this.checkLinks();
+    };
+  
+    PrivateEye.prototype.checkLinks = function() {
+      var self = this;
+  
+      this.opts.ignoreUrls.forEach(function(url) {
+        var hrefValue;
+        var titleValue;
+  
+        // If the `url` is an Object, then parse the properties `message` & `url`
+        if (url === Object(url)) {
+          titleValue = url.message;
+          hrefValue = url.url;
+        } else {
+          hrefValue = url;
+          titleValue = self.opts.defaultMessage;
+        }
+  
+        var wrapper = self.opts.wrapper.length ? self.opts.wrapper + ' ' : '';
+        var selector = wrapper + 'a';
+        var anchors = document.querySelectorAll(selector);
+  
+        Array.prototype.forEach.call(anchors, function(anchor) {
+          var anchorHref = anchor.href.toLowerCase().trim();
+  
+          if (anchorHref.indexOf(hrefValue.toLowerCase()) !== -1) {
+            anchor.className += ' private-link';
+  
+            // Only replace the anchor's title if it is empty
+            if (!anchor.title) {
+              anchor.title = titleValue;
+            }
+          }
+        });
+      });
+    }
+  
+    if (typeof module === 'object' && typeof module.exports === 'object') {
+      module.exports = PrivateEye;
+    } else {
+      window.PrivateEye = PrivateEye;
+    }
+  })();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uswds-jekyll
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Shawn Allen
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -48,6 +48,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_racer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -451,8 +465,10 @@ files:
 - assets/img/hero.png
 - assets/img/project-images/project-placeholder.png
 - assets/img/team-images/team-placeholder.png
-- assets/js/main.js
+- assets/js/anchor.js
+- assets/js/private_eye_conf.js
 - assets/js/vendor/anchor.min.js
+- assets/js/vendor/private_eye.js
 - assets/uswds/fonts/merriweather/Latin-Merriweather-Black.ttf
 - assets/uswds/fonts/merriweather/Latin-Merriweather-Black.woff
 - assets/uswds/fonts/merriweather/Latin-Merriweather-Black.woff2
@@ -712,7 +728,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.6
 signing_key:
 specification_version: 4
 summary: A Jekyll theme for the U.S. Web Design System.