Skip to content

Commit

Permalink
Merge branch 'main' into rezrah/antialiased-components
Browse files Browse the repository at this point in the history
  • Loading branch information
rezrah authored Jan 10, 2025
2 parents 665330b + 75f0413 commit 0a59583
Show file tree
Hide file tree
Showing 20 changed files with 87 additions and 76 deletions.
5 changes: 0 additions & 5 deletions .changeset/cold-ears-breathe.md

This file was deleted.

15 changes: 0 additions & 15 deletions .changeset/early-roses-pump.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/gorgeous-frogs-buy.md

This file was deleted.

10 changes: 0 additions & 10 deletions .changeset/hot-laws-hug.md

This file was deleted.

19 changes: 0 additions & 19 deletions .changeset/proud-students-collect.md

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/integration_test_remix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
labels: ubuntu-latest-16-cores
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node
uses: actions/setup-node@v4
Expand All @@ -44,7 +44,7 @@ jobs:
run: cd ./packages/react && npm pack

- name: Configuring Remix.run
run: npx create-remix@latest ./${{env.TEST_FOLDER}} --yes
run: npx create-remix@latest ./${{env.TEST_FOLDER}} --yes --debug --no-git-init

- name: Retrieving package version
id: package-version
Expand Down
32 changes: 22 additions & 10 deletions apps/docs/content/components/VideoPlayer.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {VideoPlayer} from '@primer/react-brand'

```jsx live
<VideoPlayer title="GitHub media player">
<VideoPlayer.Source src="/brand/assets/example.mp4" />
<VideoPlayer.Source src="https://primer.github.io/brand/assets/example.mp4" />
<VideoPlayer.Track src="/brand/assets/example.vtt" default />
</VideoPlayer>
```
Expand All @@ -29,7 +29,7 @@ import {VideoPlayer} from '@primer/react-brand'
poster="/brand/assets/example-poster.png"
title="GitHub media player"
>
<VideoPlayer.Source src="/brand/assets/example.mp4" />
<VideoPlayer.Source src="https://primer.github.io/brand/assets/example.mp4" />
<VideoPlayer.Track src="/brand/assets/example.vtt" default />
</VideoPlayer>
```
Expand All @@ -38,7 +38,7 @@ import {VideoPlayer} from '@primer/react-brand'

```jsx live
<VideoPlayer showBranding={false} title="GitHub media player">
<VideoPlayer.Source src="/brand/assets/example.mp4" />
<VideoPlayer.Source src="https://primer.github.io/brand/assets/example.mp4" />
<VideoPlayer.Track src="/brand/assets/example.vtt" default />
</VideoPlayer>
```
Expand All @@ -47,7 +47,7 @@ import {VideoPlayer} from '@primer/react-brand'

```jsx live
<VideoPlayer visuallyHiddenTitle title="GitHub media player">
<VideoPlayer.Source src="/brand/assets/example.mp4" />
<VideoPlayer.Source src="https://primer.github.io/brand/assets/example.mp4" />
<VideoPlayer.Track src="/brand/assets/example.vtt" default />
</VideoPlayer>
```
Expand All @@ -64,7 +64,10 @@ import {VideoPlayer} from '@primer/react-brand'
showVolumeControl={false}
showFullScreenButton={false}
>
<VideoPlayer.Source src="/brand/assets/example.mp4" type="video/mp4" />
<VideoPlayer.Source
src="https://primer.github.io/brand/assets/example.mp4"
type="video/mp4"
/>
<VideoPlayer.Track src="/brand/assets/example.vtt" default />
</VideoPlayer>
```
Expand All @@ -73,7 +76,10 @@ import {VideoPlayer} from '@primer/react-brand'

```jsx live
<VideoPlayer title="GitHub media player" showControlsWhenPaused={false}>
<VideoPlayer.Source src="/brand/assets/example.mp4" type="video/mp4" />
<VideoPlayer.Source
src="https://primer.github.io/brand/assets/example.mp4"
type="video/mp4"
/>
<VideoPlayer.Track src="/brand/assets/example.vtt" default />
</VideoPlayer>
```
Expand All @@ -87,7 +93,10 @@ import {VideoPlayer} from '@primer/react-brand'
showBranding={false}
showControlsWhenPaused={false}
>
<VideoPlayer.Source src="/brand/assets/example.mp4" type="video/mp4" />
<VideoPlayer.Source
src="https://primer.github.io/brand/assets/example.mp4"
type="video/mp4"
/>
<VideoPlayer.Track src="/brand/assets/example.vtt" default />
</VideoPlayer>
```
Expand All @@ -99,7 +108,10 @@ import {VideoPlayer} from '@primer/react-brand'
title="GitHub media player"
playIcon={() => <PlayIcon size={96} />}
>
<VideoPlayer.Source src="/brand/assets/example.mp4" type="video/mp4" />
<VideoPlayer.Source
src="https://primer.github.io/brand/assets/example.mp4"
type="video/mp4"
/>
<VideoPlayer.Track src="/brand/assets/example.vtt" default />
</VideoPlayer>
```
Expand All @@ -111,7 +123,7 @@ The `VideoPlayer` component exposes a `useVideo` hook that can be used to contro
Full documentation for the `useVideo` hook can be found [below](#usevideo-context).

```tsx live
() => {
;() => {
const MyVideoPlayer = () => {
const {isPlaying, togglePlaying, seek} = useVideo()

Expand All @@ -127,7 +139,7 @@ Full documentation for the `useVideo` hook can be found [below](#usevideo-contex
showFullScreenButton={false}
>
<VideoPlayer.Source
src="/brand/assets/example.mp4"
src="https://primer.github.io/brand/assets/example.mp4"
type="video/mp4"
/>
<VideoPlayer.Track src="/brand/assets/example.vtt" default />
Expand Down
2 changes: 2 additions & 0 deletions apps/storybook/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @primer/brand-storybook

## 0.45.1

## 0.45.0

## 0.44.1
Expand Down
2 changes: 1 addition & 1 deletion apps/storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/brand-storybook",
"version": "0.45.0",
"version": "0.45.1",
"private": true,
"description": "Primer Brand Storybook",
"keywords": [
Expand Down
2 changes: 2 additions & 0 deletions packages/design-tokens/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @primer/brand-primitives

## 0.45.1

## 0.45.0

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/design-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/brand-primitives",
"version": "0.45.0",
"version": "0.45.1",
"description": "Color, spacing, and typography primitives for the Primer Brand Design System ",
"keywords": [
"primer",
Expand Down
2 changes: 2 additions & 0 deletions packages/e2e/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @primer/brand-e2e

## 0.45.1

## 0.45.0

## 0.44.1
Expand Down
2 changes: 1 addition & 1 deletion packages/e2e/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/brand-e2e",
"version": "0.45.0",
"version": "0.45.1",
"private": true,
"description": "Primer Brand is a GitHub's design system for creating React-based marketing websites and digital experiences.",
"keywords": [
Expand Down
2 changes: 2 additions & 0 deletions packages/fonts/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @primer/brand-fonts

## 0.45.1

## 0.45.0

## 0.44.1
Expand Down
2 changes: 1 addition & 1 deletion packages/fonts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/brand-fonts",
"version": "0.45.0",
"version": "0.45.1",
"private": true,
"description": "Primer Brand is a GitHub's design system for creating React-based marketing websites and digital experiences.",
"keywords": [
Expand Down
45 changes: 45 additions & 0 deletions packages/react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,50 @@
# @primer/react-brand

## 0.45.1

### Patch Changes

- [#880](https://github.com/primer/brand/pull/880) [`bfe40610`](https://github.com/primer/brand/commit/bfe4061068a8149fe8b6b7ec498fe61328729d05) Thanks [@rezrah](https://github.com/rezrah)! - Increased border radius of `Card` from `large` (`16px`) to `xlarge` (`24px`)

- [#878](https://github.com/primer/brand/pull/878) [`d9183796`](https://github.com/primer/brand/commit/d918379698bacaeb856067107d9ac59615f146a2) Thanks [@rezrah](https://github.com/rezrah)! - Added `leadingComponent` slot to `SectionIntro` for inserting arbitrary visuals and JSX above the heading.

```jsx
<SectionIntro leadingComponent={() => <img src="leading-visual.png" alt="description of your leading visual" />}>
<SectionIntro.Heading>...</SectionIntro.Heading>
<SectionIntro.Description>...</SectionIntro.Description>
<SectionIntro.Link>...</SectionIntro.Link>
</SectionIntro>
```

🔗 [See Storybook example](https://primer.style/brand/storybook?path=/story/components-sectionintro-features--leading-component)

- [#880](https://github.com/primer/brand/pull/880) [`bfe40610`](https://github.com/primer/brand/commit/bfe4061068a8149fe8b6b7ec498fe61328729d05) Thanks [@rezrah](https://github.com/rezrah)! - Added `hasBorder` prop to `Pillar` for alternative presentation

🔗 [See Storybook for an example](https://primer.style/brand/storybook/?path=/story/components-pillar-features--with-border)

- [#703](https://github.com/primer/brand/pull/703) [`621d8ee2`](https://github.com/primer/brand/commit/621d8ee25e15a4a67281be5e4ec6116fa89a6fa0) Thanks [@joshfarrant](https://github.com/joshfarrant)! - `VideoPlayer` accessibility improvements

- Improved contrast of play overlay focus styles.
- Improved contrast of controls and title.
- The title bar now hides while the video is playing.
- The controls bar now hides when the cursor or keyboard focus leaves the video player, or after a few seconds of inactivity, and reappears when the cursor or keyboard focus returns.

- [#862](https://github.com/primer/brand/pull/862) [`eba0c530`](https://github.com/primer/brand/commit/eba0c53043133239006807a2694b05e9852da169) Thanks [@danielguillan](https://github.com/danielguillan)! - 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)

## 0.45.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/react-brand",
"version": "0.45.0",
"version": "0.45.1",
"description": "Primer Brand is a GitHub's design system for creating React-based marketing websites and digital experiences.",
"keywords": [
"primer",
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/Card/Card.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@

.Card--skew {
height: 100%;
border-radius: var(--brand-borderRadius-large);
border-radius: var(--brand-borderRadius-xlarge);
overflow: hidden;
}

Expand All @@ -157,7 +157,7 @@
}

.Card__skew-bounding {
border-radius: var(--brand-borderRadius-large);
border-radius: var(--brand-borderRadius-xlarge);
position: relative;
overflow: hidden;
z-index: 1;
Expand Down
2 changes: 2 additions & 0 deletions packages/repo-configs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# @primer/brand-config

## 0.45.1

## 0.45.0

## 0.44.1
Expand Down
2 changes: 1 addition & 1 deletion packages/repo-configs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/brand-config",
"version": "0.45.0",
"version": "0.45.1",
"private": true,
"description": "General-purpose configurations for maintaining Primer Brand",
"homepage": "https://primer.style/brand",
Expand Down

0 comments on commit 0a59583

Please sign in to comment.