diff --git a/index.d.ts b/index.d.ts index 6a2177b8b6a..44689f8d24a 100644 --- a/index.d.ts +++ b/index.d.ts @@ -145,11 +145,13 @@ declare module '@primer/components' { export const StyledOcticon: React.FunctionComponent - export interface DropdownProps extends CommonProps, ButtonProps {} + export interface DropdownProps extends React.Props, StyledSystem.ColorProps, StyledSystem.SpaceProps, ButtonProps { + as?: React.ReactType + title?: string | React.ReactNode + } export interface DropdownMenuProps extends CommonProps, Omit, 'color'> { direction?: string - title: string | React.ReactNode } export const Dropdown: React.FunctionComponent & { @@ -191,7 +193,7 @@ declare module '@primer/components' { export const CounterLabel: React.FunctionComponent - export interface GridProps extends BoxProps, StyledSystem.GridProps, Omit, 'color'> {} + export interface GridProps extends BoxProps, StyledSystem.GridProps {} export const Grid: React.FunctionComponent diff --git a/package.json b/package.json index cf52594fad6..1a45401723c 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/UnderlineNav.js b/src/UnderlineNav.js index cf98727a125..f3a391ff453 100644 --- a/src/UnderlineNav.js +++ b/src/UnderlineNav.js @@ -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 { @@ -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')}; diff --git a/src/__tests__/__snapshots__/BreadcrumbItem.js.snap b/src/__tests__/__snapshots__/BreadcrumbItem.js.snap index 5aa788ce136..2cb15070f8d 100644 --- a/src/__tests__/__snapshots__/BreadcrumbItem.js.snap +++ b/src/__tests__/__snapshots__/BreadcrumbItem.js.snap @@ -135,6 +135,7 @@ exports[`Breadcrumb.Item renders the given "as" prop 1`] = ` }, }, "colors": Object { + "accent": "#f66a0a", "bg": Object { "disabled": "#F3F4F6", "gray": "#f6f8fa", diff --git a/src/__tests__/__snapshots__/FilterListItem.js.snap b/src/__tests__/__snapshots__/FilterListItem.js.snap index a8400eefd40..52fefdf3da4 100644 --- a/src/__tests__/__snapshots__/FilterListItem.js.snap +++ b/src/__tests__/__snapshots__/FilterListItem.js.snap @@ -148,6 +148,7 @@ exports[`FilterList.Item renders the given "as" prop 1`] = ` }, }, "colors": Object { + "accent": "#f66a0a", "bg": Object { "disabled": "#F3F4F6", "gray": "#f6f8fa", diff --git a/src/__tests__/__snapshots__/SubNavLink.js.snap b/src/__tests__/__snapshots__/SubNavLink.js.snap index 2c426a7aad5..8660b96f274 100644 --- a/src/__tests__/__snapshots__/SubNavLink.js.snap +++ b/src/__tests__/__snapshots__/SubNavLink.js.snap @@ -175,6 +175,7 @@ exports[`SubNav.Link renders the given "as" prop 1`] = ` }, }, "colors": Object { + "accent": "#f66a0a", "bg": Object { "disabled": "#F3F4F6", "gray": "#f6f8fa", diff --git a/src/__tests__/__snapshots__/UnderlineNavLink.js.snap b/src/__tests__/__snapshots__/UnderlineNavLink.js.snap index 02b5e7ee681..b3c44d16a10 100644 --- a/src/__tests__/__snapshots__/UnderlineNavLink.js.snap +++ b/src/__tests__/__snapshots__/UnderlineNavLink.js.snap @@ -152,6 +152,7 @@ exports[`UnderlineNav.Link renders the given "as" prop 1`] = ` }, }, "colors": Object { + "accent": "#f66a0a", "bg": Object { "disabled": "#F3F4F6", "gray": "#f6f8fa", diff --git a/src/theme.js b/src/theme.js index b6c6a66d944..242c787e9f0 100644 --- a/src/theme.js +++ b/src/theme.js @@ -48,7 +48,8 @@ const colors = { gray: gray[1], grayLight: gray[0], disabled: '#F3F4F6' - } + }, + accent: orange[5] } const buttons = {