Merge branch 'main' into datepicker-rtl

carbon-design-system · Sep 12, 2022 · f79f038 · f79f038
2 parents f55120a + 62fc0f0
commit f79f038
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git 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 = () => {
       }}>
       <h2 className="welcome__heading">@carbon/react</h2>
       <h4 className="welcome__heading welcome__heading--subtitle">{`v${PackageInfo.version}`}</h4>
+      <Stack>
+        <Link
+          href="https://v10-react.carbondesignsystem.com/"
+          className="welcome__link"
+          renderIcon={ArrowRight}>
+          v10 Storybook
+        </Link>
+        <Link
+          href="https://v10.carbondesignsystem.com/"
+          className="welcome__link"
+          renderIcon={ArrowRight}>
+          v10 website
+        </Link>
+        <Link
+          href="https://github.com/carbon-design-system/carbon/tree/main/packages/react"
+          className="welcome__link"
+          renderIcon={ArrowRight}>
+          Github repo
+        </Link>
+      </Stack>
     </div>
   );
 };
diff --git 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;
+}
diff --git 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');
   }