Merge branch 'develop' into feat/fix-sheet-expansion

.changeset/great-maps-tell.md

@@ -0,0 +1,5 @@
+---
+'@ithaka/pharos': minor
+---
+
+Remove fill on subtle button with disabled state on-background

package.json

@@ -105,7 +105,7 @@
     "lit": "^2.7.5",
     "lit-analyzer": "^1.2.1",
     "markdown-toc": "^1.2.0",
-    "postcss": "^8.4.0",
+    "postcss": "^8.4.31",
     "postcss-import": "^14.0.0",
     "postcss-media-minmax": "^5.0.0",
     "postcss-preset-env": "^8.4.2",

packages/pharos/package.json

@@ -78,7 +78,7 @@
     "chokidar": "^3.5.2",
     "globby": "^12.0.0",
     "minify-html-literals": "^1.3.5",
-    "postcss": "^8.4.0",
+    "postcss": "^8.4.31",
     "prettier": "^2.5.0",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",

packages/pharos/src/components/button/pharos-button.scss

@@ -98,6 +98,14 @@
   );
 }
 
+:host([on-background][variant='subtle'][disabled]) #button-element {
+  @include mixins.button-color(
+    $color: var(--pharos-button-color-on-background-primary-text-disabled),
+    $background-color: var(--pharos-button-color-base-subtle-background-disabled),
+    $border-color: var(--pharos-button-color-base-subtle-border-base)
+  );
+}
+
 :host([on-background][variant='secondary']:not([disabled])) #button-element {
   @include mixins.button-color(
     $color: var(--pharos-button-color-on-background-secondary-text-base),

yarn.lock

@@ -16824,12 +16824,7 @@ nanocolors@^0.2.1:
   resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.2.13.tgz#dfd1ed0bfab05e9fe540eb6874525f0a1684099b"
   integrity sha512-0n3mSAQLPpGLV9ORXT5+C/D4mwew7Ebws69Hx4E2sgz2ZA5+32Q80B9tL8PbL7XHnRDiAxH/pnrUJ9a4fkTNTA==
 
-nanoid@^3.1.25, nanoid@^3.2.0:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
-
-nanoid@^3.3.6:
+nanoid@^3.1.25, nanoid@^3.2.0, nanoid@^3.3.6:
   version "3.3.6"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
   integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
@@ -18462,10 +18457,10 @@ [email protected]:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^8.2.14, postcss@^8.2.15, postcss@^8.2.9, postcss@^8.3.11, postcss@^8.4.0, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.24:
-  version "8.4.25"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.25.tgz#4a133f5e379eda7f61e906c3b1aaa9b81292726f"
-  integrity sha512-7taJ/8t2av0Z+sQEvNzCkpDynl0tX3uJMCODi6nT3PfASC7dYCWV9aQ+uiCf+KBD4SEFcu+GvJdGdwzQ6OSjCw==
+postcss@^8.2.14, postcss@^8.2.15, postcss@^8.2.9, postcss@^8.3.11, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.24, postcss@^8.4.31:
+  version "8.4.31"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
+  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
   dependencies:
     nanoid "^3.3.6"
     picocolors "^1.0.0"