From 571257e0b11c249999825aa77979fc845f6ad331 Mon Sep 17 00:00:00 2001
From: Ni Chia <ni.chia@adhocteam.us>
Date: Thu, 1 Oct 2020 16:38:48 -0400
Subject: [PATCH] [NO-TICKET] ESLint fixes (#833)

* Lint fixes

* Update root_url path

* Add eslint-disable-next-line
---
 .../src/scripts/components/CodeSnippet.jsx    |  1 +
 .../src/scripts/components/Frame.jsx          |  1 +
 .../src/scripts/components/HtmlExample.jsx    |  1 +
 .../src/scripts/components/PageHeader.jsx     |  1 +
 .../components/Tooltip/Tooltip.e2e.test.js    |  6 ++---
 .../uswds/_uswds-theme-utilities.scss         | 25 ++++++-------------
 6 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/packages/design-system-docs/src/scripts/components/CodeSnippet.jsx b/packages/design-system-docs/src/scripts/components/CodeSnippet.jsx
index 20a139bb6b..b0d0b302dd 100644
--- a/packages/design-system-docs/src/scripts/components/CodeSnippet.jsx
+++ b/packages/design-system-docs/src/scripts/components/CodeSnippet.jsx
@@ -8,6 +8,7 @@ const CodeSnippet = function (props) {
         Code snippet
       </summary>
       <pre className="ds-u-margin-bottom--4 ds-u-overflow--auto">
+        {/* eslint-disable-next-line react/no-danger */}
         <code dangerouslySetInnerHTML={{ __html: props.children }} />
       </pre>
     </details>
diff --git a/packages/design-system-docs/src/scripts/components/Frame.jsx b/packages/design-system-docs/src/scripts/components/Frame.jsx
index 31b8f7752b..5a5b645879 100644
--- a/packages/design-system-docs/src/scripts/components/Frame.jsx
+++ b/packages/design-system-docs/src/scripts/components/Frame.jsx
@@ -131,6 +131,7 @@ class Frame extends React.PureComponent {
           className="frame__link"
           href={this.props.src}
           rel="nofollow"
+          // eslint-disable-next-line react/jsx-no-target-blank
           target="_blank"
           title="Open the rendered HTML in a new tab or window"
         >
diff --git a/packages/design-system-docs/src/scripts/components/HtmlExample.jsx b/packages/design-system-docs/src/scripts/components/HtmlExample.jsx
index f47e7e1e0f..ea9414c708 100644
--- a/packages/design-system-docs/src/scripts/components/HtmlExample.jsx
+++ b/packages/design-system-docs/src/scripts/components/HtmlExample.jsx
@@ -37,6 +37,7 @@ class HtmlExample extends React.PureComponent {
         </h4>
         <p
           className="ds-u-margin-bottom--1 ds-u-margin-top--0 ds-u-color--muted"
+          // eslint-disable-next-line react/no-danger
           dangerouslySetInnerHTML={{ __html: description }}
         />
       </div>
diff --git a/packages/design-system-docs/src/scripts/components/PageHeader.jsx b/packages/design-system-docs/src/scripts/components/PageHeader.jsx
index 0ba052585c..88421a2493 100644
--- a/packages/design-system-docs/src/scripts/components/PageHeader.jsx
+++ b/packages/design-system-docs/src/scripts/components/PageHeader.jsx
@@ -38,6 +38,7 @@ class PageHeader extends React.PureComponent {
       <header className="ds-u-padding--3 ds-u-sm-padding--6 ds-u-display--block ds-u-fill--gray-lightest">
         <h1
           className="ds-display"
+          // eslint-disable-next-line react/no-danger
           dangerouslySetInnerHTML={{ __html: this.props.header }}
           id={this.props.reference}
         />
diff --git a/packages/design-system/src/components/Tooltip/Tooltip.e2e.test.js b/packages/design-system/src/components/Tooltip/Tooltip.e2e.test.js
index cd34a763a0..8b10e94725 100644
--- a/packages/design-system/src/components/Tooltip/Tooltip.e2e.test.js
+++ b/packages/design-system/src/components/Tooltip/Tooltip.e2e.test.js
@@ -1,8 +1,8 @@
 /* global driver */
-import { ROOT_URL } from '../../helpers/e2e/constants';
+import { ROOT_URL } from '../helpers/e2e/constants';
 
-import assertNoAxeViolations from '../../helpers/e2e/assertNoAxeViolations';
-import { getElementById } from '../../helpers/e2e';
+import assertNoAxeViolations from '../helpers/e2e/assertNoAxeViolations';
+import { getElementById } from '../helpers/e2e';
 
 const rootURL = `${ROOT_URL}/example/components.tooltip.react/`;
 
diff --git a/packages/design-system/src/styles/settings/uswds/_uswds-theme-utilities.scss b/packages/design-system/src/styles/settings/uswds/_uswds-theme-utilities.scss
index 03fe525d73..1a1bed5194 100644
--- a/packages/design-system/src/styles/settings/uswds/_uswds-theme-utilities.scss
+++ b/packages/design-system/src/styles/settings/uswds/_uswds-theme-utilities.scss
@@ -32,23 +32,14 @@ used by utilities or layout grid
 
 $theme-utility-breakpoints: (
   'card': false,
-  // 160px
-    'card-lg': false,
-  // 240px
-    'mobile': false,
-  // 320px
-    'mobile-lg': true,
-  // 480px
-    'tablet': true,
-  // 640px
-    'tablet-lg': false,
-  // 800px
-    'desktop': true,
-  // 1024px
-    'desktop-lg': false,
-  // 1200px
-    'widescreen': false,
-  // 1400px
+  'card-lg': false,
+  'mobile': false,
+  'mobile-lg': true,
+  'tablet': true,
+  'tablet-lg': false,
+  'desktop': true,
+  'desktop-lg': false,
+  'widescreen': false,
 );
 
 /*