Merge branch 'main' into size-audit-accordion

carbon-design-system · Jan 25, 2022 · 07fce47 · 07fce47
2 parents 30930d5 + 8f423cf
commit 07fce47
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.yarn/cache/bluebird-npm-3.1.5-c044543786-532596038c.zip b/.yarn/cache/bluebird-npm-3.1.5-c044543786-532596038c.zip
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -94,7 +94,7 @@
     "babel-plugin-dev-expression": "^0.2.3",
     "babel-plugin-istanbul": "^6.1.1",
     "babel-plugin-rewire": "^1.2.0",
-    "bluebird": "~3.1.1",
+    "bluebird": "~3.7.0",
     "browser-sync": "^2.26.3",
     "browserslist-config-carbon": "^10.6.1",
     "carbon-components": "^9.0.0",

diff --git a/packages/styles/scss/components/select/_select.scss b/packages/styles/scss/components/select/_select.scss
@@ -214,6 +214,11 @@
     color: $text-primary;
   }
 
+  .#{$prefix}--select--inline .#{$prefix}--select-input:focus option,
+  .#{$prefix}--select--inline .#{$prefix}--select-input:focus optgroup {
+    background-color: $background;
+  }
+
   .#{$prefix}--select--inline .#{$prefix}--select-input[disabled],
   .#{$prefix}--select--inline .#{$prefix}--select-input[disabled]:hover {
     background-color: $field-disabled;

diff --git a/yarn.lock b/yarn.lock
@@ -10670,20 +10670,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bluebird@npm:3.7.2, bluebird@npm:^3.0.5, bluebird@npm:^3.1.1, bluebird@npm:^3.3.0, bluebird@npm:^3.3.5, bluebird@npm:^3.4.1, bluebird@npm:^3.5.1, bluebird@npm:^3.5.2, bluebird@npm:^3.5.3, bluebird@npm:^3.5.4, bluebird@npm:^3.5.5":
+"bluebird@npm:3.7.2, bluebird@npm:^3.0.5, bluebird@npm:^3.1.1, bluebird@npm:^3.3.0, bluebird@npm:^3.3.5, bluebird@npm:^3.4.1, bluebird@npm:^3.5.1, bluebird@npm:^3.5.2, bluebird@npm:^3.5.3, bluebird@npm:^3.5.4, bluebird@npm:^3.5.5, bluebird@npm:~3.7.0":
   version: 3.7.2
   resolution: "bluebird@npm:3.7.2"
   checksum: 869417503c722e7dc54ca46715f70e15f4d9c602a423a02c825570862d12935be59ed9c7ba34a9b31f186c017c23cac6b54e35446f8353059c101da73eac22ef
   languageName: node
   linkType: hard
 
-"bluebird@npm:~3.1.1":
-  version: 3.1.5
-  resolution: "bluebird@npm:3.1.5"
-  checksum: 532596038c3d8802bc15e16407dd6c8c8b07951e17a84266e280b1f2ce90bec14a963fedd924f4c98b456ae48ad79acd2c6cfc7d87aae5262daf4402d78000c5
-  languageName: node
-  linkType: hard
-
 "bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.1.1, bn.js@npm:^4.4.0":
   version: 4.11.8
   resolution: "bn.js@npm:4.11.8"
@@ -11796,7 +11789,7 @@ __metadata:
     babel-plugin-dev-expression: ^0.2.3
     babel-plugin-istanbul: ^6.1.1
     babel-plugin-rewire: ^1.2.0
-    bluebird: ~3.1.1
+    bluebird: ~3.7.0
     browser-sync: ^2.26.3
     browserslist-config-carbon: ^10.6.1
     carbon-components: ^9.0.0