Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BranchName: Add style for span and add v8 tokens #4556

Merged
merged 5 commits into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/thin-ligers-turn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/react': patch
---

BranchName: Fixing text color when rendered as span
8 changes: 7 additions & 1 deletion packages/react/src/BranchName/BranchName.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import React from 'react'
import type {Meta} from '@storybook/react'
import BranchName from './BranchName'
import {Stack} from '../Stack'

export default {
title: 'Components/BranchName',
component: BranchName,
} as Meta<typeof BranchName>

export const Default = () => <BranchName href="#">branch_name</BranchName>
export const Default = () => (
<Stack align="start">
<BranchName href="#">branch_name</BranchName>
<BranchName as="span">branch_name as span</BranchName>
</Stack>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

)
14 changes: 8 additions & 6 deletions packages/react/src/BranchName/BranchName.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ import type {ComponentProps} from '../utils/types'
const BranchName = styled.a<SxProp>`
display: inline-block;
padding: 2px 6px;
font-size: ${get('fontSizes.0')};
font-family: ${get('fonts.mono')};
color: ${get('colors.accent.fg')};
background-color: ${get('colors.accent.subtle')};
border-radius: ${get('radii.2')};
font-size: var(--text-body-size-small, ${get('fontSizes.0')});
font-family: var(--fontStack-monospace, ${get('fonts.mono')});
color: var(--fgColor-link, ${get('colors.accent.fg')});
background-color: var(--bgColor-accent-muted, ${get('colors.accent.subtle')});
border-radius: var(--borderRadius-medium, ${get('radii.2')});
text-decoration: none;

&:is(span) {
Copy link
Member

@siddharthkp siddharthkp May 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we make this is not a instead of span?

There is also as=p in gh/gh 😅 (I'm not sure why exactly)
https://musical-adventure-wlr3n3k.pages.github.io/?name=branchname&attribute=as

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you mean :is(:not(a)) ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep :)

color: var(--fgColor-muted);
}
${sx};
`

Expand Down
Loading