From 4f7d73ee416841f5a027b5ff63b2ce52874ebf94 Mon Sep 17 00:00:00 2001 From: Brandon Romano Date: Wed, 14 Oct 2020 07:26:32 -0700 Subject: [PATCH] Update the subnav (#670) * Update the subnav * Remove site level overrides for components * Update the stackmenu to fix a small bug --- website/package-lock.json | 49 +++++++++++++++++++++++++-------------- website/package.json | 4 ++-- website/pages/style.css | 24 +------------------ 3 files changed, 35 insertions(+), 42 deletions(-) diff --git a/website/package-lock.json b/website/package-lock.json index 68b4d16857..66fb64d016 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -1616,9 +1616,9 @@ "integrity": "sha512-CBLEL2PnjMHaT2XT7rLs/QvkamcIKD3ckvUWcCf9mSiYHTuTNbb8gJpQvVSEenN+ISFxAt1FVRQ7aJnnBYjVWg==" }, "@hashicorp/react-hashi-stack-menu": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@hashicorp/react-hashi-stack-menu/-/react-hashi-stack-menu-1.0.4.tgz", - "integrity": "sha512-YtmZqNpt11e4MzPXi59zom6G+UXv7feZoZ2h0xGc3Htqq/TlRsLPvoxTAe5rqFztxhtDCS5FK3eKV5hSvLVunw==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@hashicorp/react-hashi-stack-menu/-/react-hashi-stack-menu-1.0.5.tgz", + "integrity": "sha512-Gmd0KBidYLSCo4q/RIqoamNsBjKUSAW0aygVmO+qbPLhOC5VzYpGvKHcb3d8LS6LxoskSXaFDgN+ps7nvyhyXA==", "requires": { "@hashicorp/react-inline-svg": "^4.0.2", "slugify": "1.3.4" @@ -1765,24 +1765,32 @@ } }, "@hashicorp/react-subnav": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@hashicorp/react-subnav/-/react-subnav-3.3.1.tgz", - "integrity": "sha512-AzVuXwwzrcKNcT5kLeaF9Kk6PSDyLenEd/lrWKxN7VKOOJ0HAWv8DhVRpJSJ5i2y4h3YybbIhHaKvNB+h0p04w==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@hashicorp/react-subnav/-/react-subnav-5.0.0.tgz", + "integrity": "sha512-axX8wkOSoiESnbUQaYlMvhPzqrxuujd5ytYcwGMXTDULgfAlVrPVPnWulD5QrM98wuXZhludiHti1YYRlM5Zwg==", "requires": { - "@hashicorp/react-button": "^2.2.6", - "@hashicorp/react-global-styles": "^4.5.0", + "@hashicorp/react-button": "^2.2.4", + "@hashicorp/react-global-styles": "^4.4.2", "@hashicorp/react-inline-svg": "^1.0.2", "@hashicorp/react-link-wrap": "^1.0.2", "isomorphic-unfetch": "^3.0.0" }, "dependencies": { "@hashicorp/react-button": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@hashicorp/react-button/-/react-button-2.3.0.tgz", - "integrity": "sha512-1C6V8OxadkdDAkwgItDfNxx7ns9EB6znK39V94RBiPvElmsNLCEG7zujcQX71V2n+HMSv1JPgDvXp4WLICzK+Q==", + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/@hashicorp/react-button/-/react-button-2.2.8.tgz", + "integrity": "sha512-dEn1L/q4OEB35ttc/MmfewXm/SWSD8S3lVTum67GHoaQdxxIU5DFI1GzE+7soQJuIkAqoqMk6s5BvBUW966ksQ==", "requires": { - "@hashicorp/react-inline-svg": "^1.0.0", + "@hashicorp/react-global-styles": "^4.6.1", + "@hashicorp/react-inline-svg": "^1.0.2", "slugify": "^1.3.6" + }, + "dependencies": { + "@hashicorp/react-global-styles": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/@hashicorp/react-global-styles/-/react-global-styles-4.6.1.tgz", + "integrity": "sha512-a2eWgjLwGAC2LjUHE7Xt6sRGGjyTWfrc4N+qVxsyZw4eE0EiNhMIKDYHWjmtb+tGh8r8j+ca3tSjsuOUePVPUw==" + } } }, "@hashicorp/react-inline-svg": { @@ -7962,12 +7970,19 @@ } }, "isomorphic-unfetch": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.0.0.tgz", - "integrity": "sha512-V0tmJSYfkKokZ5mgl0cmfQMTb7MLHsBMngTkbLY0eXvKqiVRRoZP04Ly+KhKrJfKtzC9E6Pp15Jo+bwh7Vi2XQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz", + "integrity": "sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==", "requires": { - "node-fetch": "^2.2.0", - "unfetch": "^4.0.0" + "node-fetch": "^2.6.1", + "unfetch": "^4.2.0" + }, + "dependencies": { + "unfetch": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz", + "integrity": "sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==" + } } }, "isurl": { diff --git a/website/package.json b/website/package.json index 30f6921dcd..e6a143d569 100644 --- a/website/package.json +++ b/website/package.json @@ -12,14 +12,14 @@ "@hashicorp/react-content": "5.1.0", "@hashicorp/react-docs-page": "6.2.0", "@hashicorp/react-global-styles": "4.5.0", - "@hashicorp/react-hashi-stack-menu": "^1.0.4", + "@hashicorp/react-hashi-stack-menu": "^1.0.5", "@hashicorp/react-head": "1.1.3", "@hashicorp/react-hero": "^3.1.9", "@hashicorp/react-image": "3.0.1", "@hashicorp/react-product-downloader": "4.1.3", "@hashicorp/react-product-features-list": "^2.1.0", "@hashicorp/react-section-header": "2.0.2", - "@hashicorp/react-subnav": "3.3.1", + "@hashicorp/react-subnav": "5.0.0", "@hashicorp/react-tabs": "^0.6.1", "@hashicorp/react-use-cases": "2.0.1", "@hashicorp/react-vertical-text-block-list": "2.0.3", diff --git a/website/pages/style.css b/website/pages/style.css index eeb2da2e73..099a34f264 100644 --- a/website/pages/style.css +++ b/website/pages/style.css @@ -15,7 +15,7 @@ @import '~@hashicorp/react-vertical-text-block-list/dist/style.css'; @import '~@hashicorp/react-docs-sidenav/style.css'; @import '~@hashicorp/react-content/style.css'; -@import '~@hashicorp/react-subnav/dist/style.css'; +@import '~@hashicorp/react-subnav/style.css'; @import '~@hashicorp/react-tabs/dist/style.css'; @import '~@hashicorp/react-enterprise-alert/dist/style.css'; @import '~@hashicorp/react-docs-page/style.css'; @@ -134,28 +134,6 @@ font-weight: 400; } -/* - * TODO, eventually remove: - * Temporary Boundary Branding - */ -.g-docs-sidenav { - --highlight-color: var(--red); -} - -.g-subnav { - & a.variant-primary { - border-color: var(--red); - background-color: var(--red); - } - & .g-subnav-inner { - & .style-menu-item { - & .text::after { - background: var(--red); - } - } - } -} - .boundary-clickthrough-video { display: block; width: 100%;