Merge branch 'staging/charmander' into feat/health-index

RedHat-UX · May 9, 2024 · e4bc33a · e4bc33a
2 parents 4bb5592 + 8553546
commit e4bc33a
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 46 deletions.
diff --git a/.changeset/forty-seals-develop.md b/.changeset/forty-seals-develop.md
@@ -0,0 +1,5 @@
+---
+"@rhds/elements": patch
+---
+
+`<rh-tag>`: update green border color
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rhds/elements
 
+## 1.4.1
+
+### Patch Changes
+
+- 862380b: corrected `@patternfly/elements` dependency to be included with the package
+
 ## 1.4.0
 
 ### Minor Changes

diff --git a/docs/_includes/component/header.njk b/docs/_includes/component/header.njk
@@ -204,14 +204,3 @@
     </nav>
   </div>
 </header>
-
-<script type="module">
-  window.onUsersnapCXLoad = function(api) {
-    api.init();
-  }
-  var script = document.createElement('script');
-  script.async = 1;
-  script.src = 'https://widget.usersnap.com/load/64471a95-72fe-4239-b16d-ebcf8b1219f7?onload=onUsersnapCXLoad';
-  document.head.appendChild(script);
-</script>
-
diff --git a/elements/rh-cta/demo/color-context.html b/elements/rh-cta/demo/color-context.html
@@ -1,11 +1,11 @@
 <rh-context-demo>
   <rh-cta><a href="#default">Default</a></rh-cta>
-  <rh-cta icon="circle-play"><a href="#default-video">Default Video</a></rh-cta>
+  <rh-cta icon="play-circle"><a href="#default-video">Default Video</a></rh-cta>
   <rh-cta variant="primary"><a href="#primary">Primary</a></rh-cta>
-  <rh-cta variant="primary" icon="circle-play"><a href="#primary-video">Video</a></rh-cta>
+  <rh-cta variant="primary" icon="play-circle"><a href="#primary-video">Video</a></rh-cta>
   <rh-cta variant="secondary"><a href="#secondary">Secondary</a></rh-cta>
   <rh-cta variant="brick"><a href="#brick">Brick</a></rh-cta>
-  <rh-cta variant="brick" icon="circle-play"><a href="#brick-video">Brick Video</a></rh-cta>
+  <rh-cta variant="brick" icon="play-circle"><a href="#brick-video">Brick Video</a></rh-cta>
 </rh-context-demo>
 
 <script type="module">

diff --git a/elements/rh-cta/demo/no-javascript-customization.html b/elements/rh-cta/demo/no-javascript-customization.html
@@ -3,34 +3,34 @@
 <section id="variants">
   <h2>Variants</h2>
   <rh-cta><a href="#default">Default</a></rh-cta>
-  <rh-cta icon="circle-play"><a href="#default-video">Default Video</a></rh-cta>
+  <rh-cta icon="play-circle"><a href="#default-video">Default Video</a></rh-cta>
   <rh-cta variant="primary"><a href="#primary">Primary</a></rh-cta>
-  <rh-cta variant="primary" icon="circle-play"><a href="#primary-video">Video</a></rh-cta>
+  <rh-cta variant="primary" icon="play-circle"><a href="#primary-video">Video</a></rh-cta>
   <rh-cta variant="secondary"><a href="#secondary">Secondary</a></rh-cta>
   <rh-cta variant="brick"><a href="#brick">Brick</a></rh-cta>
-  <rh-cta variant="brick" icon="circle-play"><a href="#brick-video">Brick Video</a></rh-cta>
+  <rh-cta variant="brick" icon="play-circle"><a href="#brick-video">Brick Video</a></rh-cta>
 </section>
 
 <rh-context-provider id="dark" color-palette="darkest">
   <h2>Dark Colour Context</h2>
   <rh-cta><a href="#default">Default</a></rh-cta>
-  <rh-cta icon="circle-play"><a href="#default-video">Default Video</a></rh-cta>
+  <rh-cta icon="play-circle"><a href="#default-video">Default Video</a></rh-cta>
   <rh-cta variant="primary"><a href="#primary">Primary</a></rh-cta>
-  <rh-cta variant="primary" icon="circle-play"><a href="#primary-video">Video</a></rh-cta>
+  <rh-cta variant="primary" icon="play-circle"><a href="#primary-video">Video</a></rh-cta>
   <rh-cta variant="secondary"><a href="#secondary">Secondary</a></rh-cta>
   <rh-cta variant="brick"><a href="#brick">Brick</a></rh-cta>
-  <rh-cta variant="brick" icon="circle-play"><a href="#brick-video">Brick Video</a></rh-cta>
+  <rh-cta variant="brick" icon="play-circle"><a href="#brick-video">Brick Video</a></rh-cta>
 </rh-context-provider>
 
 <section dir="rtl">
   <h2>Right-to-Left Languages</h2>
   <rh-cta><a href="#default">ברירת מחדל</a></rh-cta>
-  <rh-cta icon="circle-play"><a href="#default-video">ברירת מחדל - וידאו</a></rh-cta>
+  <rh-cta icon="play-circle"><a href="#default-video">ברירת מחדל - וידאו</a></rh-cta>
   <rh-cta variant="primary"><a href="#primary">ראשי</a></rh-cta>
-  <rh-cta variant="primary" icon="circle-play"><a href="#primary-video">ראשי - וידאו</a></rh-cta>
+  <rh-cta variant="primary" icon="play-circle"><a href="#primary-video">ראשי - וידאו</a></rh-cta>
   <rh-cta variant="secondary"><a href="#secondary">משני</a></rh-cta>
   <rh-cta variant="brick"><a href="#brick">לבנה</a></rh-cta>
-  <rh-cta variant="brick" icon="circle-play"><a href="#brick-video">לבנה - וידאו</a></rh-cta>
+  <rh-cta variant="brick" icon="play-circle"><a href="#brick-video">לבנה - וידאו</a></rh-cta>
 </section>
 
 <section dir="rtl">
@@ -39,12 +39,12 @@ <h2>Deep Shadow RTL</h2>
   <template shadowrootmode="open">
     <style>:host{display: flex; flex-flow: row wrap; gap: 16px;}</style>
     <rh-cta id="deep"><a href="#default">ברירת מחדל</a></rh-cta>
-    <rh-cta icon="circle-play"><a href="#default-video">ברירת מחדל - וידאו</a></rh-cta>
+    <rh-cta icon="play-circle"><a href="#default-video">ברירת מחדל - וידאו</a></rh-cta>
     <rh-cta variant="primary"><a href="#primary">ראשי</a></rh-cta>
-    <rh-cta variant="primary" icon="circle-play"><a href="#primary-video">ראשי - וידאו</a></rh-cta>
+    <rh-cta variant="primary" icon="play-circle"><a href="#primary-video">ראשי - וידאו</a></rh-cta>
     <rh-cta variant="secondary"><a href="#secondary">משני</a></rh-cta>
     <rh-cta variant="brick"><a href="#brick">לבנה</a></rh-cta>
-    <rh-cta variant="brick" icon="circle-play"><a href="#brick-video">לבנה - וידאו</a></rh-cta>
+    <rh-cta variant="brick" icon="play-circle"><a href="#brick-video">לבנה - וידאו</a></rh-cta>
   </template>
 </section>
 

diff --git a/elements/rh-cta/demo/resizing.html b/elements/rh-cta/demo/resizing.html
@@ -6,7 +6,7 @@
   </div>
 
   <div>
-    <rh-cta icon="circle-play">
+    <rh-cta icon="play-circle">
       <a href="#default-video">Get product details</a>
     </rh-cta>
   </div>
@@ -18,7 +18,7 @@
   </div>
 
   <div>
-    <rh-cta variant="primary" icon="circle-play">
+    <rh-cta variant="primary" icon="play-circle">
       <a href="#primary-video">Get product details</a>
     </rh-cta>
   </div>
@@ -62,7 +62,7 @@
   </div>
 
   <div>
-    <rh-cta icon="circle-play">
+    <rh-cta icon="play-circle">
       <a href="#default-video">Supercalifragilisticexpialidocious</a>
     </rh-cta>
   </div>
@@ -74,7 +74,7 @@
   </div>
 
   <div>
-    <rh-cta variant="primary" icon="circle-play">
+    <rh-cta variant="primary" icon="play-circle">
       <a href="#primary-video">Supercalifragilisticexpialidocious</a>
     </rh-cta>
   </div>

diff --git a/elements/rh-cta/demo/right-to-left.html b/elements/rh-cta/demo/right-to-left.html
@@ -8,15 +8,15 @@ <h2>Right-to-Left Languages</h2>
       <a href="#default">ברירת מחדל</a>
     </rh-cta>
 
-    <rh-cta icon="circle-play">
+    <rh-cta icon="play-circle">
       <a href="#default-video">ברירת מחדל - וידאו</a>
     </rh-cta>
 
     <rh-cta variant="primary">
       <a href="#primary">ראשי</a>
     </rh-cta>
 
-    <rh-cta variant="primary" icon="circle-play">
+    <rh-cta variant="primary" icon="play-circle">
       <a href="#primary-video">ראשי - וידאו</a>
     </rh-cta>
 
@@ -62,15 +62,15 @@ <h2>Deep Shadow RTL</h2>
         <a href="#default">ברירת מחדל</a>
       </rh-cta>
 
-      <rh-cta icon="circle-play">
+      <rh-cta icon="play-circle">
         <a href="#default-video">ברירת מחדל - וידאו</a>
       </rh-cta>
 
       <rh-cta variant="primary">
         <a href="#primary">ראשי</a>
       </rh-cta>
 
-      <rh-cta variant="primary" icon="circle-play">
+      <rh-cta variant="primary" icon="play-circle">
         <a href="#primary-video">ראשי - וידאו</a>
       </rh-cta>
 

diff --git a/elements/rh-cta/demo/variants.html b/elements/rh-cta/demo/variants.html
@@ -3,15 +3,15 @@
     <a href="#default">Default</a>
   </rh-cta>
 
-  <rh-cta icon="circle-play">
+  <rh-cta icon="play-circle">
     <a href="#default-video">Default Video</a>
   </rh-cta>
 
   <rh-cta variant="primary">
     <a href="#primary">Primary</a>
   </rh-cta>
 
-  <rh-cta variant="primary" icon="circle-play">
+  <rh-cta variant="primary" icon="play-circle">
     <a href="#primary-video">Video</a>
   </rh-cta>
 

diff --git a/elements/rh-tag/rh-tag.css b/elements/rh-tag/rh-tag.css
@@ -75,7 +75,7 @@
 .green {
   --_content-color: var(--rh-color-green-70, #204d00);
   --_background-color: var(--rh-color-green-10, #e9f7df);
-  --_before-border-color: var(--rh-color-green-20, #d1f1bb);
+  --_before-border-color: var(--rh-color-green-30, #afdc8f);
   --_icon-color: var(--rh-color-green-60, #3d7317);
 }
 

diff --git a/eleventy.config.cjs b/eleventy.config.cjs
@@ -92,6 +92,10 @@ module.exports = function(eleventyConfig) {
       '@rhds/tokens/media.js',
       '@rhds/tokens/meta.js',
       '@patternfly/elements',
+      '@patternfly/icons/far/',
+      '@patternfly/icons/fas/',
+      '@patternfly/icons/fab/',
+      '@patternfly/icons/patternfly/',
       '@patternfly/pfe-core',
       // Vendor
       'lit',

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rhds/elements",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "Red Hat Design System Elements",
   "type": "module",
   "license": "MIT",
@@ -116,10 +116,17 @@
         "docs"
       ]
     },
+    "build:test": {
+      "dependencies": [
+        "patch",
+        "analyze",
+        "compile"
+      ]
+    },
     "test": {
       "command": "wtr --group default",
       "dependencies": [
-        "build"
+        "build:test"
       ]
     },
     "compile": {
@@ -237,6 +244,7 @@
   },
   "dependencies": {
     "@lit/context": "^1.1.1",
+    "@patternfly/elements": "^3.0.1",
     "@patternfly/icons": "^1.0.2",
     "@patternfly/pfe-core": "^3.0.0",
     "@rhds/tokens": "^2.0.1",
@@ -253,7 +261,6 @@
     "@lit/reactive-element": "^2.0.4",
     "@parse5/tools": "^0.3.0",
     "@patternfly/create-element": "^1.0.2",
-    "@patternfly/elements": "^3.0.0",
     "@patternfly/eslint-config-elements": "^3.0.0",
     "@patternfly/eslint-plugin-elements": "^2.0.0",
     "@patternfly/pfe-tools": "^2.0.1",