Merge branch 'main' into 9542-fix/disabled-accordion-item-rule-divide…

…r-tokens
carbon-design-system · Aug 30, 2021 · 4865e0d · 4865e0d
2 parents 3eb3e6f + 8e27c60
commit 4865e0d
Show file tree

Hide file tree

Showing 19 changed files with 275 additions and 131 deletions.
diff --git a/.yarn/cache/carbon-components-npm-10.41.0-2769c65482-9cd5df5f26.zip b/.yarn/cache/carbon-components-npm-10.41.0-2769c65482-9cd5df5f26.zip
diff --git a/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms-react/__snapshots__/PublicAPI-test.js.snap
@@ -285,6 +285,7 @@ Array [
   "FinancialNews",
   "FireAlarm",
   "FireExtinguisher",
+  "Firefighter",
   "Firewall",
   "FirstAid",
   "FlashStorage",
@@ -514,6 +515,7 @@ Array [
   "Podcast",
   "Police",
   "PopulationDiagram",
+  "PortlandBuilding",
   "Power",
   "PragueCharlesBridgeTower",
   "PragueDancingHouse_01",
@@ -590,6 +592,7 @@ Array [
   "SecurityShield",
   "SelectProduct",
   "SelectRange",
+  "SeoulGyeongbokgungPalace",
   "ServerOperatingSystems",
   "ServerRack",
   "Servers",
@@ -605,6 +608,7 @@ Array [
   "Snow",
   "SocialWork_01",
   "SocialWork_02",
+  "SocialWorker",
   "Socks",
   "SoftIceCream",
   "SoftlayerEnablement",
@@ -662,6 +666,7 @@ Array [
   "TapeStorage",
   "Target",
   "TargetArea",
+  "Teacher",
   "TeamAlignment",
   "Teammates",
   "TelAviv",

diff --git a/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap b/e2e/pictograms/__snapshots__/PublicAPI-test.js.snap
@@ -285,6 +285,7 @@ Array [
   "FinancialNews",
   "FireAlarm",
   "FireExtinguisher",
+  "Firefighter",
   "Firewall",
   "FirstAid",
   "FlashStorage",
@@ -513,6 +514,7 @@ Array [
   "Podcast",
   "Police",
   "PopulationDiagram",
+  "PortlandBuilding",
   "Power",
   "PragueCharlesBridgeTower",
   "PragueDancingHouse_01",
@@ -589,6 +591,7 @@ Array [
   "SecurityShield",
   "SelectProduct",
   "SelectRange",
+  "SeoulGyeongbokgungPalace",
   "ServerOperatingSystems",
   "ServerRack",
   "Servers",
@@ -604,6 +607,7 @@ Array [
   "Snow",
   "SocialWork_01",
   "SocialWork_02",
+  "SocialWorker",
   "Socks",
   "SoftIceCream",
   "SoftlayerEnablement",
@@ -661,6 +665,7 @@ Array [
   "TapeStorage",
   "Target",
   "TargetArea",
+  "Teacher",
   "TeamAlignment",
   "Teammates",
   "TelAviv",

diff --git a/packages/carbon-react/package.json b/packages/carbon-react/package.json
@@ -46,7 +46,9 @@
     "@carbon/icons-react": "^10.38.0",
     "@carbon/styles": "^0.3.0",
     "@carbon/telemetry": "0.0.0-alpha.6",
-    "carbon-components-react": "^7.42.0"
+    "carbon-components": "10.41.0",
+    "carbon-components-react": "^7.42.0",
+    "carbon-icons": "^7.0.7"
   },
   "devDependencies": {
     "@babel/core": "^7.14.6",

diff --git a/packages/components/src/components/menu/_menu.scss b/packages/components/src/components/menu/_menu.scss
@@ -36,6 +36,7 @@
 
   .#{$prefix}--menu--invisible {
     opacity: 0;
+    pointer-events: none;
   }
 
   .#{$prefix}--menu-option {

diff --git a/packages/components/src/components/search/_search.scss b/packages/components/src/components/search/_search.scss
@@ -75,6 +75,10 @@
     background: $field-02;
   }
 
+  .#{$prefix}--search--light .#{$prefix}--search-close::before {
+    background: $field-02;
+  }
+
   // Small styles
   .#{$prefix}--search--sm .#{$prefix}--search-input,
   .#{$prefix}--search--sm.#{$prefix}--search--expandable.#{$prefix}--search--expanded

diff --git a/packages/pictograms/categories.yml b/packages/pictograms/categories.yml
@@ -116,17 +116,18 @@ categories:
       - paris--notre-dame
       - paris--pompidou-center
       - peru--machu-picchu
+      - portland--building
       - prague--charles-bridge-tower
       - prague--dancing-house--01
       - prague--dancing-house--02
-      #    - portland
       - raleigh-nc
       - rio-de-janeiro
       - rome
       - san-francisco
       - san-francisco--fog
       - sao-paulo
       - seattle
+      - seoul--gyeongbokgung-palace
       #    - shanghai
       - singapore
       - stockholm
@@ -378,13 +379,6 @@ categories:
       - television
       - washer
       - wifi
-  - name: Enforcement
-    members:
-      - capitol
-      - fairness
-      - justice
-      - parliament
-      - police
   - name: File
     members:
       - add--document
@@ -422,6 +416,12 @@ categories:
       - invoice
       - optimize--cash-flow--01
       - optimize--cash-flow--02
+  - name: Government
+    members:
+      - capitol
+      - fairness
+      - justice
+      - parliament
   - name: Healthcare
     members:
       - baby--bottle
@@ -648,6 +648,12 @@ categories:
       - user
       - user--profile
       - user--search
+  - name: Public service
+    members:
+      - firefighter
+      - police
+      - social--worker
+      - teacher
   - name: Retail
     members:
       - bag