Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:carbon-design-system/carbon-websi…
Browse files Browse the repository at this point in the history
…te into codesandbox-dataviz
theiliad committed Jun 12, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents e606862 + 277e49f commit 483dde1
Showing 2 changed files with 1,008 additions and 446 deletions.
5 changes: 4 additions & 1 deletion src/gatsby-theme-carbon/components/Layout.js
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@
/* eslint-disable import/no-extraneous-dependencies */
/* eslint-disable import/no-unresolved */
import React, { useLayoutEffect } from 'react';
import useMedia from 'use-media';
import { breakpoints } from '@carbon/layout';

import LeftNav from 'gatsby-theme-carbon/src/components/LeftNav';
import Meta from 'gatsby-theme-carbon/src/components/Meta';
@@ -25,6 +27,7 @@ const Layout = ({
tabs,
}) => {
const is404 = children.key === null;
const isMobile = useMedia({ maxWidth: breakpoints.md.width });

useLayoutEffect(() => {
const scroll = require('smooth-scroll')('a[href*="#"]', {
@@ -49,7 +52,7 @@ const Layout = ({
<header className={banner}>
Black Lives Matter.&nbsp;
<a href="https://support.eji.org/give/153413/#!/donation/checkout">
Support Equal Justice Initiative.
{`Support the ${isMobile ? 'EJI' : 'Equal Justice Initiative'}.`}
</a>
</header>
<Header />
1,449 changes: 1,004 additions & 445 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 483dde1

Please sign in to comment.