Merge branch 'main' into checkbox-radio

langermank · web-flow · commit d3c516cd8318 · 2022-06-30T14:21:07.000-07:00
diff --git a/.changeset/friendly-peaches-knock.md b/.changeset/friendly-peaches-knock.md
@@ -0,0 +1,5 @@
+---
+"@primer/css": patch
+---
+
+Bug: ActionList-item disabled state
diff --git a/src/actionlist/action-list-item.scss b/src/actionlist/action-list-item.scss
@@ -237,7 +237,7 @@
 
   // disabled
   &[aria-disabled='true'] {
-    .ActionList-item-content {
+    .ActionList-content {
       .ActionList-item-label,
       .ActionList-item-description {
         color: var(--color-primer-fg-disabled);
@@ -246,12 +246,12 @@
       .ActionList-item-visual {
         fill: var(--color-primer-fg-disabled);
       }
+    }
 
-      @media (hover: hover) {
-        &:hover {
-          cursor: not-allowed;
-          background-color: transparent;
-        }
+    @media (hover: hover) {
+      &:hover {
+        cursor: not-allowed;
+        background-color: transparent;
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@`
`237`	`237`
`238`	`238`	`// disabled`
`239`	`239`	`&[aria-disabled='true'] {`
`240`		`- .ActionList-item-content {`
	`240`	`+ .ActionList-content {`
`241`	`241`	`.ActionList-item-label,`
`242`	`242`	`.ActionList-item-description {`
`243`	`243`	`color: var(--color-primer-fg-disabled);`
`@@ -246,12 +246,12 @@`
`246`	`246`	`.ActionList-item-visual {`
`247`	`247`	`fill: var(--color-primer-fg-disabled);`
`248`	`248`	`}`
	`249`	`+ }`
`249`	`250`
`250`		`- @media (hover: hover) {`
`251`		`- &:hover {`
`252`		`- cursor: not-allowed;`
`253`		`- background-color: transparent;`
`254`		`- }`
	`251`	`+ @media (hover: hover) {`
	`252`	`+ &:hover {`
	`253`	`+ cursor: not-allowed;`
	`254`	`+ background-color: transparent;`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`	`}`