From bd22b5c70d6bc3198713be7b400957e5b75f26cf Mon Sep 17 00:00:00 2001 From: TJ Egan Date: Thu, 27 Aug 2020 12:32:47 -0700 Subject: [PATCH] chore(story): clean up stories to use default line-heights --- .../src/components/Tooltip/Tooltip-story.js | 16 +++++++--------- .../src/components/UIShell/UIShell-story.js | 18 ++++++------------ packages/type/scss/_styles.scss | 3 ++- 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/packages/react/src/components/Tooltip/Tooltip-story.js b/packages/react/src/components/Tooltip/Tooltip-story.js index 32ea1f84efea..35ab5c86f1c0 100644 --- a/packages/react/src/components/Tooltip/Tooltip-story.js +++ b/packages/react/src/components/Tooltip/Tooltip-story.js @@ -49,15 +49,13 @@ const props = { '' ), // eslint-disable-next-line react/display-name - renderIcon: React.forwardRef((props, ref) => ( -
- - - - - -
- )), + renderIcon: () => ( + + + + + + ), }), customIconOnly: () => ({ showIcon: true, diff --git a/packages/react/src/components/UIShell/UIShell-story.js b/packages/react/src/components/UIShell/UIShell-story.js index f112df0b245b..1b4646be47cb 100644 --- a/packages/react/src/components/UIShell/UIShell-story.js +++ b/packages/react/src/components/UIShell/UIShell-story.js @@ -66,10 +66,8 @@ const StoryContent = ({ useResponsiveOffset = true }) => {
-

- Purpose and function -

-

+

Purpose and function

+

The shell is perhaps the most crucial piece of any UI built with Carbon. It contains the shared navigation framework for the entire design system and ties @@ -94,19 +92,15 @@ const StoryContent = ({ useResponsiveOffset = true }) => { these parts of the Mac UI. For example, the app switcher portion of the shell can be compared to the dock in MacOS.

-

- Header responsive behavior -

-

+

Header responsive behavior

+

As a header scales down to fit smaller screen sizes, headers with persistent side nav menus should have the side nav collapse into “hamburger” menu. See the example to better understand responsive behavior of the header.

-

- Secondary navigation -

-

+

Secondary navigation

+

The side-nav contains secondary navigation and fits below the header. It can be configured to be either fixed-width or flexible, with only one level of nested items allowed. Both links and category diff --git a/packages/type/scss/_styles.scss b/packages/type/scss/_styles.scss index 85764ad2b33e..cae88edbfb97 100644 --- a/packages/type/scss/_styles.scss +++ b/packages/type/scss/_styles.scss @@ -166,7 +166,8 @@ $productive-heading-05: ( $productive-heading-06: ( font-size: carbon--type-scale(8), font-weight: carbon--font-weight('light'), - line-height: 1.19, + // Extra digit needed for precision in Chrome + line-height: 1.199, letter-spacing: 0, ) !default;