diff --git a/src/__tests__/__snapshots__/Tooltip.test.tsx.snap b/src/__tests__/__snapshots__/Tooltip.test.tsx.snap
index d461c34404c..2438acd8319 100644
--- a/src/__tests__/__snapshots__/Tooltip.test.tsx.snap
+++ b/src/__tests__/__snapshots__/Tooltip.test.tsx.snap
@@ -3,6 +3,7 @@
exports[`Tooltip renders consistently 1`] = `
.c0 {
position: relative;
+ display: inline-block;
}
.c0::before {
diff --git a/src/__tests__/__snapshots__/UnderlineNavLink.test.tsx.snap b/src/__tests__/__snapshots__/UnderlineNavLink.test.tsx.snap
deleted file mode 100644
index aaed08f5179..00000000000
--- a/src/__tests__/__snapshots__/UnderlineNavLink.test.tsx.snap
+++ /dev/null
@@ -1,118 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`UnderlineNav.Link renders consistently 1`] = `
-.c0 {
- padding: 16px 8px;
- margin-right: 16px;
- font-size: 14px;
- line-height: 1.5;
- color: #1F2328;
- text-align: center;
- border-bottom: 2px solid transparent;
- -webkit-text-decoration: none;
- text-decoration: none;
-}
-
-.c0:hover,
-.c0:focus {
- color: #1F2328;
- -webkit-text-decoration: none;
- text-decoration: none;
- border-bottom-color: rgba(175,184,193,0.2);
- -webkit-transition: border-bottom-color 0.2s ease;
- transition: border-bottom-color 0.2s ease;
-}
-
-.c0:hover .PRC-UnderlineNav-octicon,
-.c0:focus .PRC-UnderlineNav-octicon {
- color: #656d76;
-}
-
-.c0.PRC-selected {
- color: #1F2328;
- border-bottom-color: #fd8c73;
-}
-
-.c0.PRC-selected .PRC-UnderlineNav-octicon {
- color: #1F2328;
-}
-
-.c0:focus:not(:disabled) {
- box-shadow: none;
- outline: 2px solid #0969da;
- outline-offset: -8px;
-}
-
-.c0:focus:not(:disabled):not(:focus-visible) {
- outline: solid 1px transparent;
-}
-
-.c0:focus-visible:not(:disabled) {
- box-shadow: none;
- outline: 2px solid #0969da;
- outline-offset: -8px;
-}
-
-
-`;
-
-exports[`UnderlineNav.Link respects the "selected" prop 1`] = `
-.c0 {
- padding: 16px 8px;
- margin-right: 16px;
- font-size: 14px;
- line-height: 1.5;
- color: #1F2328;
- text-align: center;
- border-bottom: 2px solid transparent;
- -webkit-text-decoration: none;
- text-decoration: none;
-}
-
-.c0:hover,
-.c0:focus {
- color: #1F2328;
- -webkit-text-decoration: none;
- text-decoration: none;
- border-bottom-color: rgba(175,184,193,0.2);
- -webkit-transition: border-bottom-color 0.2s ease;
- transition: border-bottom-color 0.2s ease;
-}
-
-.c0:hover .PRC-UnderlineNav-octicon,
-.c0:focus .PRC-UnderlineNav-octicon {
- color: #656d76;
-}
-
-.c0.PRC-selected {
- color: #1F2328;
- border-bottom-color: #fd8c73;
-}
-
-.c0.PRC-selected .PRC-UnderlineNav-octicon {
- color: #1F2328;
-}
-
-.c0:focus:not(:disabled) {
- box-shadow: none;
- outline: 2px solid #0969da;
- outline-offset: -8px;
-}
-
-.c0:focus:not(:disabled):not(:focus-visible) {
- outline: solid 1px transparent;
-}
-
-.c0:focus-visible:not(:disabled) {
- box-shadow: none;
- outline: 2px solid #0969da;
- outline-offset: -8px;
-}
-
-
-`;
diff --git a/src/__tests__/__snapshots__/exports.test.ts.snap b/src/__tests__/__snapshots__/exports.test.ts.snap
index 90e28194736..2e0cfbd48ec 100644
--- a/src/__tests__/__snapshots__/exports.test.ts.snap
+++ b/src/__tests__/__snapshots__/exports.test.ts.snap
@@ -72,7 +72,6 @@ exports[`@primer/react should not update exports without a semver change 1`] = `
"TreeView",
"Truncate",
"UnderlineNav",
- "UnderlineNav2",
"merge",
"registerPortalRoot",
"sx",
@@ -109,30 +108,22 @@ exports[`@primer/react/decprecated should not update exports without a semver ch
"ButtonTableList",
"FilterList",
"FilteredSearch",
+ "UnderlineNav",
]
`;
exports[`@primer/react/drafts should not update exports without a semver change 1`] = `
[
"Blankslate",
- "Content",
"DataTable",
"Dialog",
- "Footer",
- "Header",
"Hidden",
"InlineAutocomplete",
"MarkdownEditor",
"MarkdownViewer",
"NavList",
"PageHeader",
- "Pane",
- "Root",
- "SegmentedControl",
- "SplitPageLayout",
"Table",
- "TreeView",
- "UnderlineNav",
"callbackCancelledResult",
"useCombobox",
"useDynamicTextareaHeight",
diff --git a/src/deprecated/ActionList/Item.tsx b/src/deprecated/ActionList/Item.tsx
index 573a4da70f5..0967a5b4155 100644
--- a/src/deprecated/ActionList/Item.tsx
+++ b/src/deprecated/ActionList/Item.tsx
@@ -293,7 +293,7 @@ const LeadingVisualContainer = styled(ColoredVisualContainer)`
`
const TrailingContent = styled(ColoredVisualContainer)`
- color: ${({variant, disabled}) => getItemVariant(variant, disabled).annotationColor}};
+ color: ${({variant, disabled}) => getItemVariant(variant, disabled).annotationColor};
margin-left: ${get('space.2')};
margin-right: 0;
width: auto;
diff --git a/src/deprecated/Button/Button.tsx b/src/deprecated/Button/Button.tsx
index 3a71f7f9e24..efc0e53577a 100644
--- a/src/deprecated/Button/Button.tsx
+++ b/src/deprecated/Button/Button.tsx
@@ -9,7 +9,7 @@ const Button = styled(ButtonBase)
`
color: ${get('colors.btn.text')};
background-color: ${get('colors.btn.bg')};
border: 1px solid ${get('colors.btn.border')};
- box-shadow: ${get('shadows.btn.shadow')}, ${get('shadows.btn.insetShadow')}};
+ box-shadow: ${get('shadows.btn.shadow')}, ${get('shadows.btn.insetShadow')};
&:hover {
background-color: ${get('colors.btn.hoverBg')};
diff --git a/src/deprecated/UnderlineNav/UnderlineNav.docs.json b/src/deprecated/UnderlineNav/UnderlineNav.docs.json
new file mode 100644
index 00000000000..349c1d6b8a0
--- /dev/null
+++ b/src/deprecated/UnderlineNav/UnderlineNav.docs.json
@@ -0,0 +1,57 @@
+{
+ "id": "underline_nav",
+ "name": "UnderlineNav",
+ "status": "alpha",
+ "a11yReviewed": false,
+ "stories": [],
+ "props": [
+ {
+ "name": "actions",
+ "type": "React.ReactNode",
+ "description": "Place another element, such as a button, to the opposite side of the navigation items."
+ },
+ {
+ "name": "align",
+ "type": "'right'",
+ "description": "Use `right` to have navigation items aligned right."
+ },
+ {
+ "name": "full",
+ "type": "boolean",
+ "description": "Used to make navigation fill the width of the container."
+ },
+ {
+ "name": "aria-label",
+ "type": "string",
+ "description": "Used to set the `aria-label` on the top level `