From 347423696aff44d4d1435fa5641dd6456aca7c2d Mon Sep 17 00:00:00 2001 From: Josefina Mancilla Date: Wed, 7 Oct 2020 15:17:06 -0700 Subject: [PATCH 1/6] feat: update switcher content --- .../src/components/Switcher/Switcher.js | 37 +++++++++++-------- .../components/Switcher/Switcher.module.scss | 3 +- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js index aae281312..3a3d2080b 100644 --- a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js +++ b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js @@ -7,6 +7,7 @@ import React, { } from 'react'; import cx from 'classnames'; import useMedia from 'use-media'; +import { Locked16 } from '@carbon/icons-react'; import NavContext from '../../util/context/NavContext'; import { nav, open, divider, link, linkDisabled } from './Switcher.module.scss'; @@ -61,6 +62,7 @@ export const SwitcherDivider = (props) => ( export const SwitcherLink = ({ disabled, children, + isInternal, href: hrefProp, ...rest }) => { @@ -79,6 +81,7 @@ export const SwitcherLink = ({ href={href} {...rest}> {children} + {isInternal && } ); @@ -88,35 +91,39 @@ export const SwitcherLink = ({ // Note: if you change this, update the max-height in the switcher stylesheet const DefaultChildren = () => ( <> - IBM Design + Foundations + + IBM Brand Center + IBM Design Language - IBM Brand Center - - IBM Accessibility - - Design disciplines + Implementation - Product + Carbon Design System - Digital + IBM.com Library + + + IBM Event Design + + Community + + IBM Design - Event - Workplace - Design practices + Practices Enterprise Design Thinking - - IBM Design Research + + IBM Accessibility IBM Design for AI - - IBM iX + + IBM Design Research ); diff --git a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.module.scss b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.module.scss index 3f1ac4470..05544df08 100644 --- a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.module.scss +++ b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.module.scss @@ -52,7 +52,8 @@ .link { padding: 6px 1rem; @include carbon--type-style('heading-01'); - display: block; + display: flex; + justify-content: space-between; text-decoration: none; color: $carbon--gray-30; From 262373bf65d99aba0b8548a0d5ca9527e1d6ad29 Mon Sep 17 00:00:00 2001 From: Josefina Mancilla Date: Wed, 7 Oct 2020 15:27:15 -0700 Subject: [PATCH 2/6] fix: consolidate divider margin styles --- .../src/components/Switcher/Switcher.module.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.module.scss b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.module.scss index 05544df08..c8ac95c0d 100644 --- a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.module.scss +++ b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.module.scss @@ -37,11 +37,10 @@ } .divider { - margin: 32px 1rem 0 1rem; + margin: 32px 1rem 8px 1rem; color: $carbon--gray-70; padding-bottom: 4px; border-bottom: 1px solid $carbon--gray-70; - margin-bottom: 8px; } .divider span { From 4960efc6a424a1331434e117bb1fbe8c302388fa Mon Sep 17 00:00:00 2001 From: Josefina Mancilla Date: Fri, 9 Oct 2020 15:32:42 -0700 Subject: [PATCH 3/6] fix: design link --- .../gatsby-theme-carbon/src/components/Switcher/Switcher.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js index 3a3d2080b..18d484395 100644 --- a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js +++ b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js @@ -109,7 +109,7 @@ const DefaultChildren = () => ( IBM Event Design Community - + IBM Design Practices From 512f91791dcfc550834d30083a5291a475e22985 Mon Sep 17 00:00:00 2001 From: Josefina Mancilla <32556167+jnm2377@users.noreply.github.com> Date: Mon, 12 Oct 2020 16:27:51 -0500 Subject: [PATCH 4/6] fix: community order and ibm.com label --- .../src/components/Switcher/Switcher.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js index 18d484395..3060ddd19 100644 --- a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js +++ b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js @@ -103,15 +103,11 @@ const DefaultChildren = () => ( Carbon Design System - IBM.com Library + Carbon for IBM.com IBM Event Design - Community - - IBM Design - Practices Enterprise Design Thinking @@ -125,6 +121,10 @@ const DefaultChildren = () => ( IBM Design Research + Community + + IBM Design + ); From 34c3b0323d5f8ae7b68bf5d585eb2999b84ddf54 Mon Sep 17 00:00:00 2001 From: Josefina Mancilla <32556167+jnm2377@users.noreply.github.com> Date: Fri, 16 Oct 2020 14:48:48 -0500 Subject: [PATCH 5/6] fix: add back iX --- .../gatsby-theme-carbon/src/components/Switcher/Switcher.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js index 3060ddd19..baa7982f1 100644 --- a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js +++ b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js @@ -121,6 +121,9 @@ const DefaultChildren = () => ( IBM Design Research + + IBM iX + Community IBM Design From 41a4e390ccc587061054e98ce827b5a441a57979 Mon Sep 17 00:00:00 2001 From: Josefina Mancilla <32556167+jnm2377@users.noreply.github.com> Date: Fri, 16 Oct 2020 15:48:42 -0500 Subject: [PATCH 6/6] fix: ibm.com link --- .../gatsby-theme-carbon/src/components/Switcher/Switcher.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js index baa7982f1..cbc89431d 100644 --- a/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js +++ b/packages/gatsby-theme-carbon/src/components/Switcher/Switcher.js @@ -102,7 +102,7 @@ const DefaultChildren = () => ( Carbon Design System - + Carbon for IBM.com