From 70e0bebf3c35677fe0509ab0a9af6083c9e8a614 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 18 Nov 2022 21:56:15 +0000 Subject: [PATCH 1/5] Adding PVC to dependencies --- package.json | 3 ++- yarn.lock | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 618df32bd1..e7390cc812 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,8 @@ "storybook": "cd docs && yarn && yarn storybook" }, "dependencies": { - "@primer/primitives": "^7.9.0" + "@primer/primitives": "^7.9.0", + "@primer/view-components": "^0.0.111" }, "devDependencies": { "@changesets/changelog-github": "0.4.6", diff --git a/yarn.lock b/yarn.lock index 037a81157c..5c96f34cb2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -783,11 +783,58 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" +"@github/auto-complete-element@^3.3.4": + version "3.3.4" + resolved "https://registry.yarnpkg.com/@github/auto-complete-element/-/auto-complete-element-3.3.4.tgz#b762f13342b8ea5e03609f75b5a8d417080355eb" + integrity sha512-b9SBCLIQGfCI3G0pGYE8rBSUDON5iFKUgHXgAtVdgZii0dnLFxNl5tn1R/RaBEFdzBQPDl9vqu41TF/Hs3w8FA== + dependencies: + "@github/combobox-nav" "^2.0.2" + +"@github/catalyst@^1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@github/catalyst/-/catalyst-1.6.0.tgz#378734d1d2b6a85af169d7e66c1a2a604bf1e82c" + integrity sha512-u8A+DameixqpeyHzvnJWTGj+wfiskQOYHzSiJscCWVfMkIT3rxnbHMtGh3lMthaRY21nbUOK71WcsCnCrXhBJQ== + +"@github/clipboard-copy-element@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@github/clipboard-copy-element/-/clipboard-copy-element-1.1.2.tgz#7a6e8042749471504d4e7cfcc47097a781db2bdb" + integrity sha512-L6CMrcA5we0udafvoSuRCE/Ci/3xrLWKYRGup2IlhxF771bQYsQ2EB1of182pI8ZWM4oxgwzu37+igMeoZjN/A== + +"@github/combobox-nav@^2.0.2": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@github/combobox-nav/-/combobox-nav-2.1.5.tgz#905598cc681e016eddfcd8adcb39e4d81c907577" + integrity sha512-dmG1PuppNKHnBBEcfylWDwj9SSxd/E/qd8mC1G/klQC3s7ps5q6JZ034mwkkG0LKfI+Y+UgEua/ROD776N400w== + +"@github/details-menu-element@^1.0.12": + version "1.0.13" + resolved "https://registry.yarnpkg.com/@github/details-menu-element/-/details-menu-element-1.0.13.tgz#d62263077b16bc7edc386e7b23f0ce41af1301b4" + integrity sha512-gMkii86w/oUP5dq8yOWZn1sgbgtFj3AYETxxtpsqRggZktgd8te4+npAn4Hm+936c/lxmEzXqfjARL/CzGR4+w== + +"@github/image-crop-element@^5.0.0": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@github/image-crop-element/-/image-crop-element-5.0.0.tgz#6ae2c31f1e7dc355c41c3140554fb76ca7a71ef7" + integrity sha512-Vgm2OwWAs1ESoib/t5sjxsAYo6YTOxxAjWDRxswX7qrqoyCejTZ3hshdo4Ep5e+Mz/GVTZC3rdMtg06dk/eT4g== + +"@github/mini-throttle@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@github/mini-throttle/-/mini-throttle-2.1.0.tgz#583a1d5e383caa21a1c067a649f15f7ab575dccf" + integrity sha512-iEeR2OdVCPkdIPUszL8gJnKNu4MR8ANh7y0u/LPyaatYezgaWxUZEzhFntloqQq+HE6MZkFy+cl+xzCNuljOdw== + "@github/prettier-config@0.0.4": version "0.0.4" resolved "https://registry.yarnpkg.com/@github/prettier-config/-/prettier-config-0.0.4.tgz#cbfddb36a7f29a81c5af155dc5827e95b23b9ccd" integrity sha512-ZOJ+U771Mw68qp2GPbcqPt2Xg0LEl0YwiIFHXwVLAFm2TgDnsgcCHhXO8PIxOWPqSFO4S7xIMD9CBobfaWGASA== +"@github/tab-container-element@^3.1.2": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@github/tab-container-element/-/tab-container-element-3.2.0.tgz#d2d33da09ee3d7f4245a9f77479fe4969b137ae5" + integrity sha512-to5ZJuywKK3KX53X1ifOcWjvUTQcBGdQ6Qkhm8L97xQ3ovICag1048M3YMpc+QSdr8xWeCBMnLeMnENqotB0Og== + +"@github/time-elements@^3.1.2": + version "3.3.0" + resolved "https://registry.yarnpkg.com/@github/time-elements/-/time-elements-3.3.0.tgz#134d69e359bc150938a5edfe6525e051e0b5ed35" + integrity sha512-ru9YsaRfikuljnLWv69Ao7FrQ8dyxf7gDcqQ+3peGOMYMKIQMb4VPpM2ULR9vzxuTDLsqvoEFJVQ7Teu1wdy4A== + "@humanwhocodes/config-array@^0.10.5": version "0.10.7" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.10.7.tgz#6d53769fd0c222767e6452e8ebda825c22e9f0dc" @@ -1124,6 +1171,11 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@primer/behaviors@^1.2.0": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@primer/behaviors/-/behaviors-1.3.1.tgz#febae28e5f7824f1fa547389b3ff8563e171da58" + integrity sha512-aMRDUQ350lk0FxtL5gJWPFHHOSSzDbJ6uNJVIt8XSqiGe1pxuW5mVVfrEp1uvzZ0pCHkCdm9fycjnfOeMeIrOQ== + "@primer/primitives@^7.9.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@primer/primitives/-/primitives-7.9.0.tgz#c8a27287488c8308b1715a7d73214629c331544a" @@ -1147,6 +1199,21 @@ stylelint-scss "^4.0.0" tap-map "^1.0.0" +"@primer/view-components@^0.0.111": + version "0.0.111" + resolved "https://registry.yarnpkg.com/@primer/view-components/-/view-components-0.0.111.tgz#99753e40523983c1964a0cbbc264fc2d5df303d8" + integrity sha512-C2M7sKXeOd4lH6NXsQgPHlwoV1zRJOGateLjTaRRIvw6mOFe75m4Y6sqMazvTyu+mj+ibzqHEW21rWE9irWQqA== + dependencies: + "@github/auto-complete-element" "^3.3.4" + "@github/catalyst" "^1.6.0" + "@github/clipboard-copy-element" "^1.1.2" + "@github/details-menu-element" "^1.0.12" + "@github/image-crop-element" "^5.0.0" + "@github/mini-throttle" "^2.1.0" + "@github/tab-container-element" "^3.1.2" + "@github/time-elements" "^3.1.2" + "@primer/behaviors" "^1.2.0" + "@sinclair/typebox@^0.24.1": version "0.24.20" resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.20.tgz#11a657875de6008622d53f56e063a6347c51a6dd" From 78226a8f9fc35eb23f802086313958b68a983565 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 18 Nov 2022 21:56:28 +0000 Subject: [PATCH 2/5] Import blankslate from PVC --- src/blankslate/blankslate.scss | 89 ---------------------------------- src/blankslate/index.scss | 2 +- 2 files changed, 1 insertion(+), 90 deletions(-) delete mode 100644 src/blankslate/blankslate.scss diff --git a/src/blankslate/blankslate.scss b/src/blankslate/blankslate.scss deleted file mode 100644 index 68e5d1b8e6..0000000000 --- a/src/blankslate/blankslate.scss +++ /dev/null @@ -1,89 +0,0 @@ -// stylelint-disable selector-max-type -.blankslate { - position: relative; - padding: $spacer-5; - text-align: center; - - p { - color: var(--color-fg-muted); - } - - code { - // stylelint-disable-next-line primer/spacing - padding: 2px 5px 3px; - font-size: $h5-size; - background: var(--color-canvas-default); - border: $border-width $border-style var(--color-border-muted); - border-radius: $border-radius; - } - - img { - width: 56px; - height: 56px; - } -} - -.blankslate-icon { - margin-right: $spacer-1; - margin-bottom: $spacer-2; - margin-left: $spacer-1; - color: var(--color-fg-muted); -} - -.blankslate-image { - margin-bottom: $spacer-3; -} - -.blankslate-heading { - margin-bottom: $spacer-1; -} - -.blankslate-action { - margin-top: $spacer-3; - - &:first-of-type { - margin-top: $spacer-4; - } - - &:last-of-type { - margin-bottom: $spacer-2; - } -} - -.blankslate-capped { - border-radius: 0 0 $border-radius $border-radius; -} - -.blankslate-spacious { - padding: ($spacer-6 * 2) $spacer-6; -} - -.blankslate-narrow { - max-width: 485px; - margin: 0 auto; -} - -// was .large-format -// QUESTION: should we deprecate this? -.blankslate-large { - img { - width: 80px; - height: 80px; - } - - h3 { - margin: $spacer-3 0; - //font-size: $h3-size; // This doesn't actually make the text larger. Should this be $h2-size? - font-size: $h2-size; - } - - p { - font-size: $h4-size; - } -} - -// was .clean-background -// TO DO: deprecate this and use utility instead -.blankslate-clean-background { - border: 0; -} diff --git a/src/blankslate/index.scss b/src/blankslate/index.scss index 80af25794d..443c087d23 100644 --- a/src/blankslate/index.scss +++ b/src/blankslate/index.scss @@ -1,2 +1,2 @@ @import '../support/index.scss'; -@import './blankslate.scss'; +@import '@primer/view-components/app/components/primer/beta/blankslate'; From 696d6ed848d44030471f2d90d729a9c46731e832 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 18 Nov 2022 21:57:33 +0000 Subject: [PATCH 3/5] Don't need the support import anymore here --- src/blankslate/index.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/blankslate/index.scss b/src/blankslate/index.scss index 443c087d23..a573a11de5 100644 --- a/src/blankslate/index.scss +++ b/src/blankslate/index.scss @@ -1,2 +1 @@ -@import '../support/index.scss'; @import '@primer/view-components/app/components/primer/beta/blankslate'; From 881929f09c062c267879150dd0f76238add6a013 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Fri, 18 Nov 2022 14:15:53 -0800 Subject: [PATCH 4/5] Create quiet-impalas-drive.md --- .changeset/quiet-impalas-drive.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/quiet-impalas-drive.md diff --git a/.changeset/quiet-impalas-drive.md b/.changeset/quiet-impalas-drive.md new file mode 100644 index 0000000000..b9a794d497 --- /dev/null +++ b/.changeset/quiet-impalas-drive.md @@ -0,0 +1,5 @@ +--- +"@primer/css": patch +--- + +Import blankslate styles from primer/view-components From 30c35730c137cf981f2528f4b98a3fe160f162f6 Mon Sep 17 00:00:00 2001 From: Jon Rohan Date: Tue, 22 Nov 2022 10:08:46 -0800 Subject: [PATCH 5/5] Update quiet-impalas-drive.md --- .changeset/quiet-impalas-drive.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/quiet-impalas-drive.md b/.changeset/quiet-impalas-drive.md index b9a794d497..1a562a66ca 100644 --- a/.changeset/quiet-impalas-drive.md +++ b/.changeset/quiet-impalas-drive.md @@ -1,5 +1,5 @@ --- -"@primer/css": patch +"@primer/css": minor --- Import blankslate styles from primer/view-components