Merge branch 'main' into joshfarrant/videoplayer-tooltip-focus

Author: joshfarrant

.changeset/proud-students-collect.md

@@ -0,0 +1,21 @@
+---
+'@primer/react-brand': patch
+---
+
+Added image support to `Pillar` component
+
+Usage example:
+
+```jsx
+ <Pillar>
+  <Pillar.Image
+    src="/path/to/your/image.jpg" alt="Required alternative text" 
+  />
+  <Pillar.Heading>Code search & code view</Pillar.Heading>
+  <Pillar.Description>
+    Enables you to rapidly search, navigate, and understand code, right from GitHub.com.
+  </Pillar.Description>
+</Pillar>
+```
+
+🔗 (See Storybook for an example)[https://primer.style/brand/storybook/?path=/story/components-pillar-features--with-image]

apps/docs/content/components/Card/index.mdx

@@ -30,7 +30,7 @@ Cards should always be used in groups of two or more related concepts.
 
 ### Stacked
 
-Cards should be stacked to display a list of items that are related to each other. If displaying a visual asset, do so for all cards to achieve a visually balanced layout. The visual asset should be the same type for all cards, either an icon or an image.
+Cards should be stacked to display a list of items that are related to each other. When displaying a visual asset, ensure it is consistent across all cards to create a visually balanced layout. The visual asset should be the same type for each card, either an icon or an image.
 
 For a better visual experience, we recommend using similar length size for the heading and description in all stacked cards.
 
@@ -123,7 +123,7 @@ The call to action label indicates the action or resource the card links to. It
 
 ### Border
 
-Card offers a variation with a border. Border is disabled by default. 
+Card offers a variation with a border. Border is disabled by default.
 
 ## Related components
 

apps/docs/content/components/Card/react.mdx

@@ -131,7 +131,6 @@ Use the `Image` component to add an image to the `Card`. The `Image` component i
   <Card.Image
     src="https://via.placeholder.com/600x400/d3d9df/d3d9df.png"
     alt="placeholder, blank area with an gray background color"
-    aspectRatio="16:9"
   />
   <Card.Heading>Code search & code view</Card.Heading>
   <Card.Description>

apps/docs/content/components/Pillar/images/do-stack-images.png

@@ -4,6 +4,9 @@ description: Use the pillar component to group related content together.
 ---
 
 import ComponentLayout from '../../../src/layouts/component-layout'
+import doStackImages from './images/do-stack-images.png'
+import dontStackImages from './images/dont-stack-images.png'
+
 export default ComponentLayout
 
 ## Anatomy
@@ -17,34 +20,38 @@ export default ComponentLayout
 
 ## Usage
 
-Use pillars to group similar features or benefits together to easily scan and read. Pillars display content in a familiar and recognizable style.
+Use pillars to display a collection of features or benefits, making them easier to scan and read. Pillars present content in a familiar and recognizable style.
 
 ### Stacked
 
-Pillars should be stacked to display a list of items that are related to each other. Use consistent pillar sizes within a row or group. A group or a row of content pillars is more visually appealing when the widths and heights of all elements match, so keep the content lenght of each pillar consistent.
+Stack multiple pillars to create a collection of items. Ensure that all the items in a group have consistent content lengths so that their width and height match, making the content more visually appealing. When displaying a visual, create a balanced layout by using the same type for each pillar, either an icon or an image.
 
 <DoDontContainer>
   <Do>
     <img src="https://github.com/primer/brand/assets/912236/cd9679ab-cfa0-4c6d-8a55-21d16668f1ca" />
     <Caption>
-      Use a similar content size to achieve a visually balanced layout.
+      Use similar character counts to achieve a visually balanced layout.
     </Caption>
   </Do>
   <Dont>
     <img src="https://github.com/primer/brand/assets/912236/cd6e471f-98cf-4c70-801f-c0aeb4d2bdf5" />
     <Caption>
-      Don't use different length sizes for the title or the description.
+      Avoid varying content lengths for the title and description.
     </Caption>
   </Dont>
 </DoDontContainer>
 
-If displaying an icon, do so for all cards to achieve a visually balanced layout.
+<Note variant="warning">
+  Use pillars with images only for groups of a maximum of three to six items.
+  Avoid stacking multiple sections that each contain groups of six pillars.
+</Note>
 
 <DoDontContainer>
   <Do>
     <img src="https://github.com/primer/brand/assets/912236/cdceda67-a911-40a0-839a-4620c83fe510" />
     <Caption>
-      Use icons either for all pillars or none for a visually balanced layout.
+      When using icons, add them to all pillars to create a visually balanced
+      layout.
     </Caption>
   </Do>
   <Dont>
@@ -53,9 +60,23 @@ If displaying an icon, do so for all cards to achieve a visually balanced layout
   </Dont>
 </DoDontContainer>
 
-When presenting more than four pillars, we recommend displaying them in multiple rows. You can use the [Grid](/components/Grid) or the [Stack](/components/Stack) component to achieve this. We recommend using a grid with 3 or 4 columns and balancing the number of pillars on each row.
+<DoDontContainer>
+  <Do>
+    <img alt="" src={doStackImages} />
+    <Caption>
+      When using images, add them to all pillars to create a visually balanced
+      layout.
+    </Caption>
+  </Do>
+  <Dont>
+    <img alt="" src={dontStackImages} />
+    <Caption>Don't use images with different aspect ratios.</Caption>
+  </Dont>
+</DoDontContainer>
+
+When presenting more than four pillars, we recommend displaying them in multiple rows. You can use the [Grid](/components/Grid) or the [Stack](/components/Stack) component to achieve this. We recommend using a grid with three or four columns and balancing the number of pillars on each row.
 
-![An image showing a group of numerous Pillars stacked in a 3 column grid.](https://github.com/primer/brand/assets/912236/350c5eab-bd21-450c-a7a3-60e29c828a3f)
+![An image showing a group of numerous Pillars stacked in a three column grid.](https://github.com/primer/brand/assets/912236/350c5eab-bd21-450c-a7a3-60e29c828a3f)
 
 ### Pillar and Card
 
@@ -71,18 +92,18 @@ Cards should be used for noteworthy information to immediately draw user attenti
 
 #### Group size
 
-Cards should be used in small groups (3, 4 or 5 items maximum), whereas Pillars can be used in larger (more than 5 items) or smaller groups. As users encounter an increasing number of items within a group, the distinctiveness of each individual element diminishes.
+Cards should be used in small groups of three to five items, while Pillars can accommodate larger groups of up to nine items, or six if using images. The more items in a group, the less distinctive each individual element becomes.
 
 <DoDontContainer>
   <Do>
     <img src="https://github.com/primer/brand/assets/912236/bc33c846-71c2-4af6-a3ac-f886bad71995" />
-    <Caption>Pillars are more suitable for groups of 5 or more items.</Caption>
+    <Caption>Pillars are suitable for groups of up to six items.</Caption>
   </Do>
   <Dont>
     <img src="https://github.com/primer/brand/assets/912236/302dbc4d-6199-4c0c-96d5-76ac2e35fdea" />
     <Caption>
-      Don't use Cards for groups of 5 or more items. Use them sparingly in
-      groups of 3 or 4.
+      Don't use Cards for groups of five or more items. Use them sparingly in
+      groups of three or four.
     </Caption>
   </Dont>
 </DoDontContainer>

apps/docs/content/components/Pillar/images/dont-stack-images.png

@@ -49,6 +49,24 @@ You can add an `icon` to enhance the visual context. We recommend using an [Octi
 </Pillar>
 ```
 
+### Image
+
+You can add an image to enhance the visual context.
+
+```jsx live
+<Pillar>
+  <Pillar.Image
+    src="https://via.placeholder.com/600x400/d3d9df/d3d9df.png"
+    alt="placeholder, blank area with an gray background color"
+  />
+  <Pillar.Heading>Code search & code view</Pillar.Heading>
+  <Pillar.Description>
+    Enables you to rapidly search, navigate, and understand code, right from
+    GitHub.com.
+  </Pillar.Description>
+</Pillar>
+```
+
 ### Link
 
 You can add an external link to the Pillar using the `Link` component.
@@ -130,6 +148,10 @@ Use the `Stack` component to stack multiple Pillars horizontally or vertically.
 | `icon`  | `React.Node`                                                |           | `true`   | Octicon                      |
 | `color` | <PropTableValues values={PillarIconColors} addLineBreaks /> | `default` | `false`  | The color of the Pillar icon |
 
+### Pillar.Image
+
+Forwards all the props from the [Image component](/components/Image), including `src`, `alt`, and `aspectRatio`.
+
 ### Pillar.Heading
 
 | name        | type                         | default     | required | description                                           |

apps/docs/content/components/Pillar/index.mdx

@@ -8,13 +8,14 @@ import startShape from '../fixtures/images/testimonial-bg-1.png'
 import endShape from '../fixtures/images/testimonial-bg-2.png'
 
 import styles from './Pillar.stories.module.css'
+import placeholderImage from '../fixtures/images/placeholder-600x400.png'
 
 export default {
   title: 'Components/Pillar/features',
   component: Pillar,
 } as Meta<typeof Pillar>
 
-export const Icon: StoryFn<typeof Pillar> = () => {
+export const WithIcon: StoryFn<typeof Pillar> = () => {
   return (
     <Pillar>
       <Pillar.Icon icon={<RocketIcon />} />
@@ -26,7 +27,23 @@ export const Icon: StoryFn<typeof Pillar> = () => {
   )
 }
 
-export const IconColors: StoryFn<typeof Pillar> = () => {
+export const WithImage: StoryFn<typeof Pillar> = () => {
+  return (
+    <Pillar>
+      <Pillar.Image
+        aspectRatio="16:10"
+        src={placeholderImage}
+        alt="placeholder, blank area with a gray background color"
+      />
+      <Pillar.Heading>Code search & code view</Pillar.Heading>
+      <Pillar.Description>
+        Enables you to rapidly search, navigate, and understand code, right from GitHub.com.
+      </Pillar.Description>
+    </Pillar>
+  )
+}
+
+export const WithIconColors: StoryFn<typeof Pillar> = () => {
   return (
     <Grid>
       {PillarIconColors.map((color, id) => {

apps/docs/content/components/Pillar/react.mdx

@@ -15,6 +15,17 @@
   text-align: left;
 }
 
+.Pillar__image {
+  margin-bottom: var(--base-size-28);
+  border-radius: var(--brand-borderRadius-medium);
+  overflow: hidden;
+}
+
+.Pillar__image img,
+.Pillar__image span {
+  display: block;
+}
+
 .Pillar__icon {
   display: flex;
   margin-bottom: var(--base-size-24);

packages/react/src/Pillar/Pillar.features.stories.tsx

@@ -2,6 +2,7 @@ declare const styles: {
   readonly "Pillar": string;
   readonly "Pillar--align-center": string;
   readonly "Pillar--align-start": string;
+  readonly "Pillar__image": string;
   readonly "Pillar__icon": string;
   readonly "Pillar__heading": string;
   readonly "Pillar__description": string;