From 2e1ce1135b8f443a01d7c0136e332b2d7da14944 Mon Sep 17 00:00:00 2001 From: Nick Mitchell Date: Sun, 10 May 2020 19:19:34 -0400 Subject: [PATCH] fix(plugins/plugin-client-common): breadcrumb fonts can be too large, and double zoom Fixes #4519 --- .../src/components/spi/Breadcrumb/impl/Carbon.tsx | 2 +- .../src/components/spi/Breadcrumb/impl/PatternFly.tsx | 3 +-- plugins/plugin-client-common/web/css/static/sidecar-main.css | 1 + .../web/scss/components/Breadcrumb/Carbon.scss | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/plugin-client-common/src/components/spi/Breadcrumb/impl/Carbon.tsx b/plugins/plugin-client-common/src/components/spi/Breadcrumb/impl/Carbon.tsx index 679fdcbd8fa..e83685acb84 100644 --- a/plugins/plugin-client-common/src/components/spi/Breadcrumb/impl/Carbon.tsx +++ b/plugins/plugin-client-common/src/components/spi/Breadcrumb/impl/Carbon.tsx @@ -33,7 +33,7 @@ export default class CarbonBreadcrumb extends React.PureComponent { _).join(' ')} + className={[_.className, _.deemphasize && 'kui--secondary-breadcrumb'].filter(_ => _).join(' ')} isCurrentPage={idx === currentPageIdx} onClick={_.command && (() => this.props.repl.pexec(_.command))} > diff --git a/plugins/plugin-client-common/src/components/spi/Breadcrumb/impl/PatternFly.tsx b/plugins/plugin-client-common/src/components/spi/Breadcrumb/impl/PatternFly.tsx index b2b06b95a4a..77d25b491cf 100644 --- a/plugins/plugin-client-common/src/components/spi/Breadcrumb/impl/PatternFly.tsx +++ b/plugins/plugin-client-common/src/components/spi/Breadcrumb/impl/PatternFly.tsx @@ -35,8 +35,7 @@ export default class PatternflyBreadcrumb extends React.PureComponent { className={[ _.className, _.deemphasize && 'kui--secondary-breadcrumb', - idx === currentPageIdx && 'kui--current-page-breadcrumb', - 'zoomable' + idx === currentPageIdx && 'kui--current-page-breadcrumb' ] .filter(_ => _) .join(' ')} diff --git a/plugins/plugin-client-common/web/css/static/sidecar-main.css b/plugins/plugin-client-common/web/css/static/sidecar-main.css index 65b666fdefb..bebfdc0fe0e 100644 --- a/plugins/plugin-client-common/web/css/static/sidecar-main.css +++ b/plugins/plugin-client-common/web/css/static/sidecar-main.css @@ -397,6 +397,7 @@ display: flex; align-items: center; overflow-x: hidden; + font-size: 0.875em; .sidecar-bottom-stripe-button:first-child { margin-left: 0.5em; diff --git a/plugins/plugin-client-common/web/scss/components/Breadcrumb/Carbon.scss b/plugins/plugin-client-common/web/scss/components/Breadcrumb/Carbon.scss index f94c0d07148..4979165a3a6 100644 --- a/plugins/plugin-client-common/web/scss/components/Breadcrumb/Carbon.scss +++ b/plugins/plugin-client-common/web/scss/components/Breadcrumb/Carbon.scss @@ -6,6 +6,7 @@ body[kui-theme-style] nav[aria-label='Breadcrumb'] { .bx--breadcrumb { display: flex; + font-size: unset; flex-wrap: nowrap; font-family: var(--font-sans-serif); padding: 0 1em; @@ -30,7 +31,7 @@ body[kui-theme-style] nav[aria-label='Breadcrumb'] { .bx--link { font-size: inherit; - font-size: 1em; + font-size: unset; font-weight: normal; color: var(--color-base0C); overflow: unset;