From 4f8e3dad096b5ce103df4a5560ab64651d43772d Mon Sep 17 00:00:00 2001 From: Jeff Escalante Date: Wed, 20 May 2020 15:18:42 -0400 Subject: [PATCH] css tinkering, nextjs-scripts upgrade --- .../components/temporary_text-split/index.jsx | 2 +- .../temporary_text-split/style.module.css | 1 + website/package-lock.json | 144 +++++++++--------- website/package.json | 2 +- website/pages/home/index.jsx | 24 ++- website/pages/home/style.module.css | 81 +++++----- 6 files changed, 126 insertions(+), 128 deletions(-) diff --git a/website/components/temporary_text-split/index.jsx b/website/components/temporary_text-split/index.jsx index a98ef3b28..ec7e58fb2 100644 --- a/website/components/temporary_text-split/index.jsx +++ b/website/components/temporary_text-split/index.jsx @@ -4,7 +4,7 @@ export default function TextSplit({ text, reverse, children }) { return (
-
{text.tag}
+
{text.tag}

{text.headline}

{text.text}

diff --git a/website/components/temporary_text-split/style.module.css b/website/components/temporary_text-split/style.module.css index 5d98c0ce9..c1447ffe8 100644 --- a/website/components/temporary_text-split/style.module.css +++ b/website/components/temporary_text-split/style.module.css @@ -16,6 +16,7 @@ } .tag { + composes: g-type-label from global; display: inline-block; background: black; color: white; diff --git a/website/package-lock.json b/website/package-lock.json index 6ffa95185..963594f77 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -138,18 +138,18 @@ } }, "@babel/core": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz", - "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", + "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", "requires": { "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.0", + "@babel/generator": "^7.9.6", "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.0", - "@babel/parser": "^7.9.0", + "@babel/helpers": "^7.9.6", + "@babel/parser": "^7.9.6", "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.0", - "@babel/types": "^7.9.0", + "@babel/traverse": "^7.9.6", + "@babel/types": "^7.9.6", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.1", @@ -487,9 +487,9 @@ } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz", - "integrity": "sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==", + "version": "7.9.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz", + "integrity": "sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==", "requires": { "@babel/helper-plugin-utils": "^7.8.3", "@babel/plugin-syntax-object-rest-spread": "^7.8.0", @@ -1209,9 +1209,9 @@ "integrity": "sha512-/Mgw6ufzjsysw5U0v7c0tCXMQeE4BSbGeasDaTuh1r6jQ+2Cokl1XhPqKqXn4+xkcx3CIVdyoUYOSLmgzutn3Q==" }, "@hashicorp/nextjs-scripts": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@hashicorp/nextjs-scripts/-/nextjs-scripts-8.0.0.tgz", - "integrity": "sha512-cdCeJJjvMQeLCTwGzwOdjnqI+W8P04YBp7J1su7wesEZ4BVqyL0KTTlR3vnnCPAmQmXGIGAXBp5GLi4qWP+Yqw==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@hashicorp/nextjs-scripts/-/nextjs-scripts-8.1.0.tgz", + "integrity": "sha512-9PTBm7F9AGbFXoxmxUbQ45vRrcu/EryFdw/hZ/NpBc6G/HMGKVwe0sPi73syv3aVkxbWe1G/FGXHbbbVrg+mgA==", "requires": { "@bugsnag/js": "7.0.2", "@bugsnag/plugin-react": "7.0.1", @@ -1483,33 +1483,33 @@ } }, "@mdx-js/loader": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@mdx-js/loader/-/loader-1.6.1.tgz", - "integrity": "sha512-v1+q2NEjHQYiMAQVdCw9TA41I9XRJkJYAm8vPKyDIqAqqlq3QAvsAHyHKMpjXldzREfAMW1yckFqIl2ym10AEw==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@mdx-js/loader/-/loader-1.6.3.tgz", + "integrity": "sha512-u64IEQPNPSbbifhhTmKkkqVoC9bYhyOP1Z6gZU0FLSD8FhlEjxlf11xcyL7DxBFmbKuYwmH+oU66+v2zWT6J5A==", "requires": { - "@mdx-js/mdx": "^1.6.1", - "@mdx-js/react": "^1.6.1", + "@mdx-js/mdx": "^1.6.3", + "@mdx-js/react": "^1.6.3", "loader-utils": "2.0.0" } }, "@mdx-js/mdx": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.1.tgz", - "integrity": "sha512-DLnHbYZGoXSzfIHKgEtsO4qP8029YbdyJvC746PwfPNrRyGciPsqgWmfz/nEXt/fg+UMBG/6/cZaZx/hvyxnyg==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@mdx-js/mdx/-/mdx-1.6.3.tgz", + "integrity": "sha512-LiICL1raWTvY4fQosiIlfW2WGhb34pIm8CSPpqA5WMm0wo1XGcMJx4OgdlsQfdc+gCfTX48OL2bAdq7mvRwJDQ==", "requires": { - "@babel/core": "7.9.0", + "@babel/core": "7.9.6", "@babel/plugin-syntax-jsx": "7.8.3", "@babel/plugin-syntax-object-rest-spread": "7.8.3", - "@mdx-js/util": "^1.6.1", - "babel-plugin-apply-mdx-type-prop": "^1.6.1", - "babel-plugin-extract-import-names": "^1.6.1", + "@mdx-js/util": "^1.6.3", + "babel-plugin-apply-mdx-type-prop": "^1.6.3", + "babel-plugin-extract-import-names": "^1.6.3", "camelcase-css": "2.0.1", "detab": "2.0.3", "hast-util-raw": "5.0.2", "lodash.uniq": "4.5.0", - "mdast-util-to-hast": "8.2.0", + "mdast-util-to-hast": "9.1.0", "remark-footnotes": "1.0.0", - "remark-mdx": "^1.6.1", + "remark-mdx": "^1.6.3", "remark-parse": "8.0.2", "remark-squeeze-paragraphs": "4.0.0", "style-to-object": "0.3.0", @@ -1583,14 +1583,14 @@ } }, "@mdx-js/react": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.1.tgz", - "integrity": "sha512-jXBSWdWFPK2fs3johKb0hQFsf/x/C24XQYQwMhj8FxwlBgf7+NGATwXFs6pGkKd5/JfK9HXmbOcQ78MYoIZyxA==" + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-1.6.3.tgz", + "integrity": "sha512-O95a2/vUp1JUWBMeS8uGwTI9BYMmqcUBFcH/H/qk5gmh0Ar71oRn3xGN3o4YbW9LTDzOfkwQQZchMefyI3yRuA==" }, "@mdx-js/util": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.1.tgz", - "integrity": "sha512-A3TBBjg5iVo8S4TTG0VrW8G9YNLob4+M6rALKjY8Sxr9zPExWQ7iTPUSvJVE7YhF9E08EQMubx1vRal3jtpJ9Q==" + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@mdx-js/util/-/util-1.6.3.tgz", + "integrity": "sha512-kCtAleJxvUNJ1HZuc/cEMsiFosTVW/A3FgLhlxPPh70O/kCKg5T4I5gABOMUPL1erO3Ao7yDk+Dbaw4XIKNeZg==" }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", @@ -2268,6 +2268,13 @@ "ms": "^2.0.0", "remove-trailing-slash": "^0.1.0", "uuid": "^3.2.1" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + } } }, "anser": { @@ -2750,12 +2757,12 @@ } }, "babel-plugin-apply-mdx-type-prop": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.1.tgz", - "integrity": "sha512-chjmLo1x7fCpDRICGUlbkwf2E6sMVG9jjG6PtPBWnQfMEjgV03Gh0jSVGbZJsEUxcMqOpHSsIXvPz1sYip6X3g==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.3.tgz", + "integrity": "sha512-FX0AbaDjWXbtFPudIqs/KyUDE5OjcpTnXGaTnXYJzjaQqjKAlIXW+aB8I00tzsFxd/q4dM8VQDlbFKCwvN4ElA==", "requires": { "@babel/helper-plugin-utils": "7.8.3", - "@mdx-js/util": "^1.6.1" + "@mdx-js/util": "^1.6.3" } }, "babel-plugin-dynamic-import-node": { @@ -2767,9 +2774,9 @@ } }, "babel-plugin-extract-import-names": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.1.tgz", - "integrity": "sha512-u0uRrPyygx4RlNva1aqz7DM9UBpsQJQZ4NyakHVJF18s73H/iiyXuc+X7k+9tHeN0WKLsohQUGzGLli6z5a0Zw==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/babel-plugin-extract-import-names/-/babel-plugin-extract-import-names-1.6.3.tgz", + "integrity": "sha512-9LcaoCE2vQRJa1rummorAe3sUVCpA/2Lh+n2CgZ6cniZfEmCFYgD5Eu03ORxguerrWnpHnsHm6u+VrKsGGzw0A==", "requires": { "@babel/helper-plugin-utils": "7.8.3" } @@ -8554,9 +8561,9 @@ } }, "listr2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-2.0.3.tgz", - "integrity": "sha512-2dKxql0jPuiAyMLYUkzzvoDroenO+aiecNnNfjn+S4jK5P9uuHKN55u4eVX8Czb9JsgAjGx7yPQYMIEzHMmKSA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-2.0.4.tgz", + "integrity": "sha512-oJaAcplPsa72rKW0eg4P4LbEJjhH+UO2I8uqR/I2wzHrVg16ohSfUy0SlcHS21zfYXxtsUpL8YXGHjyfWMR0cg==", "requires": { "@samverschueren/stream-to-observable": "^0.3.0", "chalk": "^4.0.0", @@ -8567,11 +8574,11 @@ "figures": "^3.2.0", "indent-string": "^4.0.0", "log-update": "^4.0.0", - "nanoid": "^3.1.9", "p-map": "^4.0.0", "pad": "^3.2.0", "rxjs": "^6.5.5", - "through": "^2.3.8" + "through": "^2.3.8", + "uuid": "^7.0.2" } }, "load-json-file": { @@ -8939,21 +8946,23 @@ } }, "mdast-util-definitions": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-2.0.1.tgz", - "integrity": "sha512-Co+DQ6oZlUzvUR7JCpP249PcexxygiaKk9axJh+eRzHDZJk2julbIdKB4PXHVxdBuLzvJ1Izb+YDpj2deGMOuA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-3.0.1.tgz", + "integrity": "sha512-BAv2iUm/e6IK/b2/t+Fx69EL/AGcq/IG2S+HxHjDJGfLJtd6i9SZUS76aC9cig+IEucsqxKTR0ot3m933R3iuA==", "requires": { "unist-util-visit": "^2.0.0" } }, "mdast-util-to-hast": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-8.2.0.tgz", - "integrity": "sha512-WjH/KXtqU66XyTJQ7tg7sjvTw1OQcVV0hKdFh3BgHPwZ96fSBCQ/NitEHsN70Mmnggt+5eUUC7pCnK+2qGQnCA==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-9.1.0.tgz", + "integrity": "sha512-Akl2Vi9y9cSdr19/Dfu58PVwifPXuFt1IrHe7l+Crme1KvgUT+5z+cHLVcQVGCiNTZZcdqjnuv9vPkGsqWytWA==", "requires": { + "@types/mdast": "^3.0.0", + "@types/unist": "^2.0.3", "collapse-white-space": "^1.0.0", "detab": "^2.0.0", - "mdast-util-definitions": "^2.0.0", + "mdast-util-definitions": "^3.0.0", "mdurl": "^1.0.0", "trim-lines": "^1.0.0", "unist-builder": "^2.0.0", @@ -9353,11 +9362,6 @@ "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", "optional": true }, - "nanoid": { - "version": "3.1.9", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.9.tgz", - "integrity": "sha512-fFiXlFo4Wkuei3i6w9SQI6yuzGRTGi8Z2zZKZpUxv/bQlBi4jtbVPBSNFZHQA9PNjofWqtIa8p+pnsc0kgZrhQ==" - }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -12172,15 +12176,15 @@ "integrity": "sha512-X9Ncj4cj3/CIvLI2Z9IobHtVi8FVdUrdJkCNaL9kdX8ohfsi18DXHsCVd/A7ssARBdccdDb5ODnt62WuEWaM/g==" }, "remark-mdx": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.1.tgz", - "integrity": "sha512-UyCqqYFv9l5dstX29QpdqMprBHyUYUEQHOUe0MdFUIm1XATxfVGHbRPtVBFz4ccd5NV1UL/rmsruo9WOswwmpQ==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/remark-mdx/-/remark-mdx-1.6.3.tgz", + "integrity": "sha512-VLVTZgjZnmAAlp9RopHOnhuM0aLl0phmj70k2g8IdYHn+8E+E8hkbSKQJksQDoQU5YwY7iKqJn+uQC5y5BGedw==", "requires": { - "@babel/core": "7.9.0", + "@babel/core": "7.9.6", "@babel/helper-plugin-utils": "7.8.3", - "@babel/plugin-proposal-object-rest-spread": "7.9.5", + "@babel/plugin-proposal-object-rest-spread": "7.9.6", "@babel/plugin-syntax-jsx": "7.8.3", - "@mdx-js/util": "^1.6.1", + "@mdx-js/util": "^1.6.3", "is-alphabetical": "1.0.4", "remark-parse": "8.0.2", "unified": "9.0.0" @@ -12584,9 +12588,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sanitize.css": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-11.0.0.tgz", - "integrity": "sha512-Ox0X2lk0kOGeODJgT9S9HFv0j5Cz89ir9ILylj62/vejHPdMmahmetfocoQwyiAnseeXyDa+KIbO6ZQJe5n2Lg==" + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-11.0.1.tgz", + "integrity": "sha512-Q762QXJGHIyFLayll6zUueGKslmGxNpbEDpSB/sdaZ9Xgz+v6AYlVc5P49sorc9cPR9y47npHBfXswGo1I32tg==" }, "sass-loader": { "version": "8.0.2", @@ -15022,9 +15026,9 @@ "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz", + "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==" }, "v8-compile-cache": { "version": "2.1.0", diff --git a/website/package.json b/website/package.json index d82321cc5..5de620afa 100644 --- a/website/package.json +++ b/website/package.json @@ -4,7 +4,7 @@ "version": "1.0.0", "author": "HashiCorp", "dependencies": { - "@hashicorp/nextjs-scripts": "^8.0.0", + "@hashicorp/nextjs-scripts": "^8.1.0", "@hashicorp/react-button": "^2.2.0", "@hashicorp/react-code-block": "^1.2.7", "@hashicorp/react-consent-manager": "^2.1.0", diff --git a/website/pages/home/index.jsx b/website/pages/home/index.jsx index e5dd1b436..663a63782 100644 --- a/website/pages/home/index.jsx +++ b/website/pages/home/index.jsx @@ -9,21 +9,22 @@ export default function HomePage() {
- Vagrant Logo + Vagrant Logo

Development Environments Made Easy

-
@@ -66,11 +67,7 @@ $ vagrant ssh }} reverse={true} > - Server Parity Diagram + Server Parity Diagram
@@ -88,7 +85,6 @@ $ vagrant ssh {['apple', 'linux', 'windows'].map((platform) => ( {`${platform} @@ -99,7 +95,7 @@ $ vagrant ssh
-
Trusted at Scale
+
Trusted at Scale

Trusted By

Vagrant is trusted by thousands of developers, operators, and diff --git a/website/pages/home/style.module.css b/website/pages/home/style.module.css index 28101897e..e87307b53 100644 --- a/website/pages/home/style.module.css +++ b/website/pages/home/style.module.css @@ -1,49 +1,45 @@ -/* hero section */ +.block { + padding: 100px 0; +} .hero { display: flex; align-items: center; text-align: center; margin: 150px 0; -} -.logo { - max-width: 445px; -} + & img { + max-width: 445px; + } -.buttons > * { - margin-right: 15px; - margin-top: 25px; + & .buttons > * { + margin-right: 15px; + margin-top: 25px; - @media (max-width: 500px) { - width: 100%; - margin-top: 20px; + & > *:last-child { + margin-right: 0; + } + + @media (max-width: 500px) { + width: 100%; + margin-top: 20px; + } } } -.buttons > *:last-child { - margin-right: 0; -} - -.block { - padding: 100px 0; -} - -/* unified workflow section */ - .unifiedWorkflow { composes: block; background: var(--vagrant); color: white; -} -.unifiedWorkflow :global(.g-code-block) { - width: 100%; - margin-left: 50px; - overflow: scroll; + & :global(.g-code-block) { + width: 100%; + margin-left: 50px; + overflow: scroll; - @media (max-width: 1000px) { - margin-left: 0; + @media (max-width: 1000px) { + margin-left: 0; + } } } @@ -51,10 +47,10 @@ .enforceConsistency { composes: block; -} -.parity { - max-width: 70%; + & img { + max-width: 70%; + } } /* cross-platform section */ @@ -64,7 +60,7 @@ background: #0d44cc; color: white; - & .platformImg { + & img { max-width: 130px; min-width: 20px; height: auto; @@ -79,9 +75,20 @@ composes: block; background: var(--black); color: white; + + & .customerImg { + max-width: 80%; + margin: 50px auto 0 auto; + display: block; + + @media (max-width: 800px) { + max-width: 100%; + } + } } .tag { + composes: g-type-label from global; display: inline-block; background: white; color: black; @@ -92,13 +99,3 @@ composes: g-type-display-2 from global; margin: 20px 0 10px 0; } - -.customerImg { - max-width: 80%; - margin: 50px auto 0 auto; - display: block; - - @media (max-width: 800px) { - max-width: 100%; - } -}