Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
8 changes: 5 additions & 3 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,13 @@ declare module '@primer/components' {

export const StyledOcticon: React.FunctionComponent<StyledOcticonProps>

export interface DropdownProps extends CommonProps, ButtonProps {}
export interface DropdownProps extends React.Props<any>, StyledSystem.ColorProps, StyledSystem.SpaceProps, ButtonProps {
as?: React.ReactType
title?: string | React.ReactNode
}

export interface DropdownMenuProps extends CommonProps, Omit<React.HTMLAttributes<HTMLUListElement>, 'color'> {
direction?: string
title: string | React.ReactNode
}

export const Dropdown: React.FunctionComponent<DropdownProps> & {
Expand Down Expand Up @@ -191,7 +193,7 @@ declare module '@primer/components' {

export const CounterLabel: React.FunctionComponent<CounterLabelProps>

export interface GridProps extends BoxProps, StyledSystem.GridProps, Omit<React.HTMLAttributes<HTMLSpanElement>, 'color'> {}
export interface GridProps extends BoxProps, StyledSystem.GridProps {}

export const Grid: React.FunctionComponent<GridProps>

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@primer/components",
"version": "16.1.0",
"version": "16.2.0",
"description": "Primer react components",
"main": "dist/index.umd.js",
"module": "dist/index.esm.js",
Expand Down
4 changes: 2 additions & 2 deletions src/UnderlineNav.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ UnderlineNav.Link = styled.a.attrs(props => ({
&:focus {
color: ${get('colors.gray.9')};
text-decoration: none;
border-bottom-color: ${get('colors.orange.5')};
border-bottom-color: ${get('colors.accent')};
transition: 0.2s ease;

.UnderlineNav-octicon {
Expand All @@ -77,7 +77,7 @@ UnderlineNav.Link = styled.a.attrs(props => ({

&.selected {
color: ${get('colors.gray.9')};
border-bottom-color: ${get('colors.orange.5')};
border-bottom-color: ${get('colors.accent')};

.UnderlineNav-octicon {
color: ${get('colors.gray.5')};
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/__snapshots__/BreadcrumbItem.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ exports[`Breadcrumb.Item renders the given "as" prop 1`] = `
},
},
"colors": Object {
"accent": "#f66a0a",
"bg": Object {
"disabled": "#F3F4F6",
"gray": "#f6f8fa",
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/__snapshots__/FilterListItem.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ exports[`FilterList.Item renders the given "as" prop 1`] = `
},
},
"colors": Object {
"accent": "#f66a0a",
"bg": Object {
"disabled": "#F3F4F6",
"gray": "#f6f8fa",
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/__snapshots__/SubNavLink.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ exports[`SubNav.Link renders the given "as" prop 1`] = `
},
},
"colors": Object {
"accent": "#f66a0a",
"bg": Object {
"disabled": "#F3F4F6",
"gray": "#f6f8fa",
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/__snapshots__/UnderlineNavLink.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ exports[`UnderlineNav.Link renders the given "as" prop 1`] = `
},
},
"colors": Object {
"accent": "#f66a0a",
"bg": Object {
"disabled": "#F3F4F6",
"gray": "#f6f8fa",
Expand Down
3 changes: 2 additions & 1 deletion src/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ const colors = {
gray: gray[1],
grayLight: gray[0],
disabled: '#F3F4F6'
}
},
accent: orange[5]
}

const buttons = {
Expand Down