From 171a610a2caf2ae1357e41f7726be8f94e16b891 Mon Sep 17 00:00:00 2001 From: TJ Egan Date: Mon, 12 Sep 2022 15:44:51 +0200 Subject: [PATCH 1/2] fix(FilterableMultiselect): remove extra invalid border (#12078) --- packages/styles/scss/components/form/_form.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/styles/scss/components/form/_form.scss b/packages/styles/scss/components/form/_form.scss index b49fe32563e5..86ca02a4d8d5 100644 --- a/packages/styles/scss/components/form/_form.scss +++ b/packages/styles/scss/components/form/_form.scss @@ -111,7 +111,8 @@ $input-label-weight: 400 !default; .#{$prefix}--select-input__wrapper[data-invalid] .#{$prefix}--select-input:not(:focus), .#{$prefix}--list-box[data-invalid]:not(:focus), - .#{$prefix}--combo-box[data-invalid] .#{$prefix}--text-input:not(:focus) { + .#{$prefix}--combo-box[data-invalid]:not(.#{$prefix}--multi-select--selected) + .#{$prefix}--text-input:not(:focus) { @include focus-outline('invalid'); } From 62fc0f0b7a35e201e73c75809d491261b3374a99 Mon Sep 17 00:00:00 2001 From: Josefina Mancilla <32556167+jnm2377@users.noreply.github.com> Date: Mon, 12 Sep 2022 10:57:01 -0500 Subject: [PATCH 2/2] feat: add links to welcome story (#12077) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- packages/react/.storybook/Welcome/Welcome.js | 23 +++++++++++++++++++ .../react/.storybook/Welcome/welcome.scss | 15 ++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/packages/react/.storybook/Welcome/Welcome.js b/packages/react/.storybook/Welcome/Welcome.js index f2faab24cebd..244038eec329 100644 --- a/packages/react/.storybook/Welcome/Welcome.js +++ b/packages/react/.storybook/Welcome/Welcome.js @@ -9,6 +9,9 @@ import React from 'react'; import bg from './carbon_bg.png'; import './welcome.scss'; import PackageInfo from './../../package.json'; +import Link from '../../src/components/Link'; +import { ArrowRight } from '@carbon/icons-react'; +import { Stack } from '../../src/components/Stack'; export const Welcome = () => { return ( @@ -20,6 +23,26 @@ export const Welcome = () => { }}>

@carbon/react

{`v${PackageInfo.version}`}

+ + + v10 Storybook + + + v10 website + + + Github repo + + ); }; diff --git a/packages/react/.storybook/Welcome/welcome.scss b/packages/react/.storybook/Welcome/welcome.scss index 8ae24175c9d9..64e5072871be 100644 --- a/packages/react/.storybook/Welcome/welcome.scss +++ b/packages/react/.storybook/Welcome/welcome.scss @@ -1,5 +1,5 @@ -@use '@carbon/styles/scss/theme'; @use '@carbon/styles/scss/type'; +@use '@carbon/styles/scss/colors'; .container-welcome { /* stylelint-disable-next-line declaration-no-important */ @@ -18,9 +18,20 @@ .welcome__heading { @include type.type-style('productive-heading-07'); - color: theme.$text-inverse; + color: colors.$white; } .welcome__heading--subtitle { font-weight: 600; } + +.welcome__link, +.welcome__link:hover, +.welcome__link.cds--link:visited { + margin-top: 1rem; + color: colors.$blue-40; +} + +.welcome__link:first-child { + margin-top: 2rem; +}