From 8d797b2f6f319a049db2aa3355f8aaded2f73677 Mon Sep 17 00:00:00 2001 From: "andrea.cardonaibm.com" Date: Thu, 9 Apr 2020 14:36:28 -0500 Subject: [PATCH 01/34] fix: issue 808 - removed button in ImageGallereyImage --- package.json | 2 +- .../src/components/ImageGallery/ImageGalleryImage.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 4c9fbe4d1..f3d424362 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "build": "yarn workspace example build", "build:clean": "yarn workspace example build:clean", "build:analyze": "ANALYZE=true yarn workspace example build", - "serve": "yarn build && yarn workspace example serve", + "serve": "yarn build && yarn workspace example serve -H 0.0.0.0", "test:prefix": "yarn workspace example test:prefix", "now-build": "yarn workspace example build", "format": "prettier --write \"**/*.{scss,css,js,md}\"", diff --git a/packages/gatsby-theme-carbon/src/components/ImageGallery/ImageGalleryImage.js b/packages/gatsby-theme-carbon/src/components/ImageGallery/ImageGalleryImage.js index 38c7e39e7..8a640a76b 100644 --- a/packages/gatsby-theme-carbon/src/components/ImageGallery/ImageGalleryImage.js +++ b/packages/gatsby-theme-carbon/src/components/ImageGallery/ImageGalleryImage.js @@ -28,9 +28,9 @@ function ImageGalleryImage({ return (
- + {/* */}
); From e1e39ebe1bb34b34146f0724cef48de3f97d21e9 Mon Sep 17 00:00:00 2001 From: "andrea.cardonaibm.com" Date: Thu, 9 Apr 2020 14:45:13 -0500 Subject: [PATCH 02/34] Revert "fix: issue 808 - removed button in ImageGallereyImage" This reverts commit 8d797b2f6f319a049db2aa3355f8aaded2f73677. --- package.json | 2 +- .../src/components/ImageGallery/ImageGalleryImage.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index f3d424362..4c9fbe4d1 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "build": "yarn workspace example build", "build:clean": "yarn workspace example build:clean", "build:analyze": "ANALYZE=true yarn workspace example build", - "serve": "yarn build && yarn workspace example serve -H 0.0.0.0", + "serve": "yarn build && yarn workspace example serve", "test:prefix": "yarn workspace example test:prefix", "now-build": "yarn workspace example build", "format": "prettier --write \"**/*.{scss,css,js,md}\"", diff --git a/packages/gatsby-theme-carbon/src/components/ImageGallery/ImageGalleryImage.js b/packages/gatsby-theme-carbon/src/components/ImageGallery/ImageGalleryImage.js index 8a640a76b..38c7e39e7 100644 --- a/packages/gatsby-theme-carbon/src/components/ImageGallery/ImageGalleryImage.js +++ b/packages/gatsby-theme-carbon/src/components/ImageGallery/ImageGalleryImage.js @@ -28,9 +28,9 @@ function ImageGalleryImage({ return (
- {/* */} +
); From 0bbbdebf8232592659a207843bca4af5c3a47535 Mon Sep 17 00:00:00 2001 From: "andrea.cardonaibm.com" Date: Wed, 6 May 2020 23:41:29 -0500 Subject: [PATCH 03/34] wip: mapping through nav bar --- packages/example/gatsby-config.js | 2 +- packages/example/src/data/nav-items.yaml | 124 +++++++++--------- .../gatsby-theme-carbon/components/Header.js | 2 +- .../src/components/Layout.js | 10 +- .../src/components/LeftNav/LeftNav.js | 1 + .../src/components/SiteHeader/SiteHeader.js | 44 +++++++ .../src/components/SiteHeader/header.scss | 5 + .../src/components/SiteHeader/index.js | 3 + .../SiteHeader/website-switcher.scss | 105 +++++++++++++++ 9 files changed, 228 insertions(+), 68 deletions(-) create mode 100644 packages/gatsby-theme-carbon/src/components/SiteHeader/SiteHeader.js create mode 100644 packages/gatsby-theme-carbon/src/components/SiteHeader/header.scss create mode 100644 packages/gatsby-theme-carbon/src/components/SiteHeader/index.js create mode 100644 packages/gatsby-theme-carbon/src/components/SiteHeader/website-switcher.scss diff --git a/packages/example/gatsby-config.js b/packages/example/gatsby-config.js index 8894dbcb8..ae05fc37f 100644 --- a/packages/example/gatsby-config.js +++ b/packages/example/gatsby-config.js @@ -1,6 +1,6 @@ module.exports = { siteMetadata: { - title: 'Gatsby Theme Carbon', + title: 'Gatsby Theme TESTING', description: 'A Gatsby theme for the carbon design system', keywords: 'gatsby,theme,carbon', }, diff --git a/packages/example/src/data/nav-items.yaml b/packages/example/src/data/nav-items.yaml index bb928cece..a3e6eee35 100644 --- a/packages/example/src/data/nav-items.yaml +++ b/packages/example/src/data/nav-items.yaml @@ -10,65 +10,65 @@ - title: Contributions pages: - path: /contributions -- title: Guides - pages: - - title: Configuration - path: /guides/configuration - - title: Authoring MDX - path: /guides/MDX - - title: Shadowing - path: /guides/shadowing - - title: Styling - path: /guides/styling - - title: Navigation - path: /guides/navigation/sidebar - - title: npm scripts - path: /guides/npm-scripts -- title: Components - pages: - - title: Accordion - path: /components/Accordion - - title: AnchorLinks - path: /components/AnchorLinks - - title: ArtDirection - path: /components/ArtDirection - - title: ArticleCard - path: /components/ArticleCard - - title: Aside - path: /components/Aside - - title: Caption - path: /components/Caption - - title: Code blocks - path: /components/code-blocks - - title: DoDontExample - path: /components/DoDontExample - - title: DoDontRow - path: /components/DoDontRow - - title: FeatureCard - path: /components/FeatureCard - - title: FeedbackDialog - path: /components/FeedbackDialog - - title: GifPlayer - path: /components/GifPlayer - - title: Grid - path: /components/Grid - - title: ImageCard - path: /components/ImageCard - - title: ImageGallery - path: /components/ImageGallery - - title: InlineNotification - path: /components/InlineNotification - - title: Markdown - path: /components/markdown - - title: MediumPosts - path: /components/MediumPosts - - title: PageDescription - path: /components/PageDescription - - title: ResourceCard - path: /components/ResourceCard - - title: Tabs - path: /components/Tabs - - title: Title - path: /components/Title - - title: Video - path: /components/Video +# - title: Guides +# pages: +# - title: Configuration +# path: /guides/configuration +# - title: Authoring MDX +# path: /guides/MDX +# - title: Shadowing +# path: /guides/shadowing +# - title: Styling +# path: /guides/styling +# - title: Navigation +# path: /guides/navigation/sidebar +# - title: npm scripts +# path: /guides/npm-scripts +# - title: Components +# pages: +# - title: Accordion +# path: /components/Accordion +# - title: AnchorLinks +# path: /components/AnchorLinks +# - title: ArtDirection +# path: /components/ArtDirection +# - title: ArticleCard +# path: /components/ArticleCard +# - title: Aside +# path: /components/Aside +# - title: Caption +# path: /components/Caption +# - title: Code blocks +# path: /components/code-blocks +# - title: DoDontExample +# path: /components/DoDontExample +# - title: DoDontRow +# path: /components/DoDontRow +# - title: FeatureCard +# path: /components/FeatureCard +# - title: FeedbackDialog +# path: /components/FeedbackDialog +# - title: GifPlayer +# path: /components/GifPlayer +# - title: Grid +# path: /components/Grid +# - title: ImageCard +# path: /components/ImageCard +# - title: ImageGallery +# path: /components/ImageGallery +# - title: InlineNotification +# path: /components/InlineNotification +# - title: Markdown +# path: /components/markdown +# - title: MediumPosts +# path: /components/MediumPosts +# - title: PageDescription +# path: /components/PageDescription +# - title: ResourceCard +# path: /components/ResourceCard +# - title: Tabs +# path: /components/Tabs +# - title: Title +# path: /components/Title +# - title: Video +# path: /components/Video diff --git a/packages/example/src/gatsby-theme-carbon/components/Header.js b/packages/example/src/gatsby-theme-carbon/components/Header.js index 6b82cad2a..14b2fe6c1 100644 --- a/packages/example/src/gatsby-theme-carbon/components/Header.js +++ b/packages/example/src/gatsby-theme-carbon/components/Header.js @@ -3,7 +3,7 @@ import Header from 'gatsby-theme-carbon/src/components/Header'; const CustomHeader = (props) => (
- Gatsby theme Carbon + Gatsby theme Carbon test
); diff --git a/packages/gatsby-theme-carbon/src/components/Layout.js b/packages/gatsby-theme-carbon/src/components/Layout.js index 647ebc312..f721ce720 100644 --- a/packages/gatsby-theme-carbon/src/components/Layout.js +++ b/packages/gatsby-theme-carbon/src/components/Layout.js @@ -1,9 +1,10 @@ /* eslint-disable import/no-unresolved */ import React, { useLayoutEffect } from 'react'; -import LeftNav from './LeftNav'; +// import LeftNav from './LeftNav'; import Meta from './Meta'; -import Header from './Header'; +import SiteHeader from './SiteHeader'; +// import Header from './Header'; import Switcher from './Switcher'; import Footer from './Footer'; import Container from './Container'; @@ -43,9 +44,10 @@ const Layout = ({ pageDescription={pageDescription} pageKeywords={pageKeywords} /> -
+ + {/*
*/} - + {/* */} {children}