From 62a55be62d03f56a1f988c50669ae7fc3d7a075f Mon Sep 17 00:00:00 2001 From: TJ Egan Date: Thu, 1 Jul 2021 09:03:46 -0400 Subject: [PATCH] fix(Typography): fix issues with inline copy button (#2433) --- package.json | 12 +-- src/components/TypesetStyle/TypesetExample.js | 6 +- .../TypesetStyle/typeset-example.scss | 2 + yarn.lock | 80 +++++-------------- 4 files changed, 29 insertions(+), 71 deletions(-) diff --git a/package.json b/package.json index 1cbfc85d315..5e16807851a 100644 --- a/package.json +++ b/package.json @@ -38,22 +38,22 @@ ], "resolutions": { "carbon-components": "^10.38.0", - "carbon-components-react": "^7.37.1", + "carbon-components-react": "^7.38.0", "@carbon/elements": "^10.37.0", - "@carbon/icons": "^10.33.0", + "@carbon/icons": "^10.34.0", "@carbon/icons-react": "^10.34.0", "gatsby-remark-images": "^3.3.33" }, "dependencies": { "@carbon/charts-react": "0.41.65", - "@carbon/elements": "^10.36.0", + "@carbon/elements": "^10.37.0", "@carbon/icons": "^10.34.0", - "@carbon/icons-react": "^10.33.0", + "@carbon/icons-react": "^10.34.0", "@carbon/pictograms": "^11.12.0", "@carbon/pictograms-react": "^11.12.0", "@loadable/component": "^5.12.0", "@slack/web-api": "^5.11.0", - "carbon-components": "^10.37.0", + "carbon-components": "^10.38.0", "carbon-components-react": "^7.38.0", "change-case": "^4.1.1", "classnames": "^2.2.6", @@ -62,7 +62,7 @@ "fuse.js": "^6.4.1", "gatsby": "^2.19.8", "gatsby-image": "^2.4.15", - "gatsby-theme-carbon": "^1.29.2", + "gatsby-theme-carbon": "^1.30.1", "lodash-es": "^4.17.15", "markdown-it": "^9.0.1", "nanoid": "^2.1.11", diff --git a/src/components/TypesetStyle/TypesetExample.js b/src/components/TypesetStyle/TypesetExample.js index f51f072fa97..845827c8130 100644 --- a/src/components/TypesetStyle/TypesetExample.js +++ b/src/components/TypesetStyle/TypesetExample.js @@ -143,14 +143,14 @@ const TypesetExample = (props) => (
Size: {displaySpecs.fontSize}
- Line-height: {displaySpecs.lineHeight} + Line height: {displaySpecs.lineHeight}
Weight:{' '} {displaySpecs.fontWeight}
- Letter-spacing: {displaySpecs.letterSpacing}px + Letter spacing: {displaySpecs.letterSpacing}px {displaySpecs.warning != null ? (
@@ -164,7 +164,7 @@ const TypesetExample = (props) => (
)}
- + ${type.name.split(' ')[0]}
diff --git a/src/components/TypesetStyle/typeset-example.scss b/src/components/TypesetStyle/typeset-example.scss index df4368c2078..2b1f2d2d1a1 100644 --- a/src/components/TypesetStyle/typeset-example.scss +++ b/src/components/TypesetStyle/typeset-example.scss @@ -1,3 +1,5 @@ +@import '~carbon-components/scss/components/copy-button/copy-button'; + .bx--typeset-example-container { margin-top: $spacing-05; } diff --git a/yarn.lock b/yarn.lock index 9ca5d6b1384..6cada324884 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1175,17 +1175,12 @@ resolved "https://registry.yarnpkg.com/@carbon/colors/-/colors-10.24.0.tgz#1966a4a0181d7a9b7196ad236f1e6a15e139a807" integrity sha512-8dcFsrguFYcWE6lrecB0+kqVS0a5dSknaE4yM4F/P45ilFsd6FUenW+1uB8a9m7Dk/c38rj/FzpgwQ0Hfm6fmQ== -"@carbon/colors@^10.26.0": - version "10.26.0" - resolved "https://registry.yarnpkg.com/@carbon/colors/-/colors-10.26.0.tgz#efa1401d845cacbffc16ec490afdcdbbc79d3af8" - integrity sha512-3R3mKbepxLBL5+t7Hvq3BzYw5IKkkUVvQepdE1pZWmpTI+wEjVGefifXOVIEt5BsKMq1ujrXb0LLOrO65VnLfg== - "@carbon/colors@^10.27.0": version "10.27.0" resolved "https://registry.yarnpkg.com/@carbon/colors/-/colors-10.27.0.tgz#cfb0c392f95ba6acc28ab7488bc0086dd93898e3" integrity sha512-/3sFdwBadWJOMUbGWLwXD7VwqXtEcEmiQMqhmBl3fH3bYm9+j2FnLS1ZYu3RnCIXZTmWHXylcElDZ5Lwlcjdyw== -"@carbon/elements@^10.32.0", "@carbon/elements@^10.36.0", "@carbon/elements@^10.37.0": +"@carbon/elements@^10.32.0", "@carbon/elements@^10.37.0": version "10.37.0" resolved "https://registry.yarnpkg.com/@carbon/elements/-/elements-10.37.0.tgz#15a027696f8cee34924d3d4564764030cc1f87e0" integrity sha512-BKlUr85592u3G2oktJayF6RDLmZzTmb1N9fa8slT91vi6kP7WDjj3cWBGtp23mQyYHyQ3xIjBSVOBISP8h5uBw== @@ -1204,14 +1199,6 @@ resolved "https://registry.yarnpkg.com/@carbon/feature-flags/-/feature-flags-0.5.0.tgz#726e9d411e7650e3f4ca0c63e1ffc527bb5e93f8" integrity sha512-AEmsE2bUfl7ycWIep4Yu+DFLXLTRZf9UbhfBiJTncsbnAKPpYnD9XZXi1S4EgLrGKvHyFgKDvomf4hAd3yIe5A== -"@carbon/grid@^10.29.0": - version "10.29.0" - resolved "https://registry.yarnpkg.com/@carbon/grid/-/grid-10.29.0.tgz#f6afdcc66518192ab6e968e292051bc8919dcb5b" - integrity sha512-lD77IBevviq8jwOQJiLBKKgY6DYziZICOWE+Wp2MDrK4OtfLgQ5Soi8t1vt0IJ3NPgZTN3EHIUcMwjZ51Ga/LA== - dependencies: - "@carbon/import-once" "^10.6.0" - "@carbon/layout" "^10.25.0" - "@carbon/grid@^10.30.0": version "10.30.0" resolved "https://registry.yarnpkg.com/@carbon/grid/-/grid-10.30.0.tgz#383c5c337f7f440b82b53b48a65793f9ece813a3" @@ -1220,17 +1207,12 @@ "@carbon/import-once" "^10.6.0" "@carbon/layout" "^10.26.0" -"@carbon/icon-helpers@^10.18.0": - version "10.18.0" - resolved "https://registry.yarnpkg.com/@carbon/icon-helpers/-/icon-helpers-10.18.0.tgz#afdc469948c3be34450b49d826169b9df7479255" - integrity sha512-tgnUIT0WliaVipk1SjxpcdsaHLOnGIFz3KP+OCE4nZAErufGDQe5EAACrcvXA/DlRc7XIIcAzC5uV2HK78UICg== - "@carbon/icon-helpers@^10.19.0": version "10.19.0" resolved "https://registry.yarnpkg.com/@carbon/icon-helpers/-/icon-helpers-10.19.0.tgz#f6b608b181b4ca4aeeadac72ec11b7cf530b4d1c" integrity sha512-2eIecDuoEEx+nORHtTBmj5lV/N4Q1kP7XCZUkF15WfXxZHx2RI6KhS4HnMPDoylguhavnRjSIK1gl6oG3Z3wSQ== -"@carbon/icons-react@^10.30.0", "@carbon/icons-react@^10.33.0", "@carbon/icons-react@^10.34.0": +"@carbon/icons-react@^10.30.0", "@carbon/icons-react@^10.34.0": version "10.34.0" resolved "https://registry.yarnpkg.com/@carbon/icons-react/-/icons-react-10.34.0.tgz#6c9b8f9def1713077e8a8307d1f380274f9d06cc" integrity sha512-lHkTT8tSWOO441eCXD6STUEeUCLNHrVU4WR/sfkzr0InWdNuaBKvXb/DhYa18SRljC1XbfQ0fjTHrACHQQCmSg== @@ -1239,10 +1221,12 @@ "@carbon/telemetry" "0.0.0-alpha.6" prop-types "^15.7.2" -"@carbon/icons@^10.33.0", "@carbon/icons@^10.34.0": - version "10.33.0" - resolved "https://registry.yarnpkg.com/@carbon/icons/-/icons-10.33.0.tgz#316131e4a95377ddd23df1d44aef7156ad3d29c6" - integrity sha512-EKzNi6h6xQid1y4uLAkjc+FVsDA0eFHFum+uqT6QWdqK8ZapXt+qQmVuy8Aedf8UhLbmyc+VnxvdJW8nA9Lt7Q== +"@carbon/icons@^10.34.0": + version "10.34.0" + resolved "https://registry.yarnpkg.com/@carbon/icons/-/icons-10.34.0.tgz#8f746af52f6771dc7a47ce2c6d5463a5ab81402b" + integrity sha512-7H/L2o4Lo8S8cml0D5KVHnqK8RQum4B4z9uUYFI89/dj4+et+7alV+C5WFcrcKFN22vL7Eq2dwJjlTp+uJMiOw== + dependencies: + svgson "^5.2.1" "@carbon/import-once@^10.6.0": version "10.6.0" @@ -1254,21 +1238,11 @@ resolved "https://registry.yarnpkg.com/@carbon/layout/-/layout-10.23.0.tgz#7af99758abc780d1509ab109b0491bdd19623e9f" integrity sha512-oO7okc7c7QPWpC0k6DeZFG219DWv4ioMYtgZ189rH81e8bjKIwc5uJh63uSZ9ITMI9+pvDu6hXaiHYIGsLza3w== -"@carbon/layout@^10.25.0": - version "10.25.0" - resolved "https://registry.yarnpkg.com/@carbon/layout/-/layout-10.25.0.tgz#1dca882cda96a2000d854f8ce0242093c3050257" - integrity sha512-r7sOyOSFptT0qJ878AEzBacEfOhZTwID5m8Yc0azaf6pgOyX3FBPZhFevf+LdEY9D8wp7m7Sinn8ngG/ehP2eQ== - "@carbon/layout@^10.26.0": version "10.26.0" resolved "https://registry.yarnpkg.com/@carbon/layout/-/layout-10.26.0.tgz#74af12646395aab903dda2aedf658cc7e90e5e9a" integrity sha512-rfQTjuIYZ3TF7HO/gHs249mEsC5WOI2kFXT0ua9KLAZ3Nw2IhCwTwfk0uNYz8SBhQiqulWkvppRpuUgrk25DgA== -"@carbon/motion@^10.19.0": - version "10.19.0" - resolved "https://registry.yarnpkg.com/@carbon/motion/-/motion-10.19.0.tgz#b016437d8a88848f5412ce9714b65aa5364c62a5" - integrity sha512-xAV6wFKvUGEO1vCDa2fZsPmF4slotJDB0bwvy7HgSGm9Ss++eBirADrZ6XH9CLw90dI60j/COvu2P2gu1XY0/A== - "@carbon/motion@^10.20.0": version "10.20.0" resolved "https://registry.yarnpkg.com/@carbon/motion/-/motion-10.20.0.tgz#3bea4e387f5893eb92fdce67732ed78951005469" @@ -1314,16 +1288,6 @@ "@carbon/type" "^10.27.0" color "^3.1.2" -"@carbon/themes@^10.36.0": - version "10.36.0" - resolved "https://registry.yarnpkg.com/@carbon/themes/-/themes-10.36.0.tgz#73453e6d55ff01676875742000f537fd1c1ea3c3" - integrity sha512-/LA82LrAeyRwtsfVvynXsAvw3IKqkUBaYrquuC1+u4HJv2Nz8sKiw+h2Uw5rESuSEfpwCEsULA1+cDfOMOKQcQ== - dependencies: - "@carbon/colors" "^10.26.0" - "@carbon/layout" "^10.25.0" - "@carbon/type" "^10.29.0" - color "^3.1.2" - "@carbon/themes@^10.37.0": version "10.37.0" resolved "https://registry.yarnpkg.com/@carbon/themes/-/themes-10.37.0.tgz#ba2f377fe9d507c9513ddc04a2fee2155b4f4ae9" @@ -1342,14 +1306,6 @@ "@carbon/import-once" "^10.6.0" "@carbon/layout" "^10.23.0" -"@carbon/type@^10.29.0": - version "10.29.0" - resolved "https://registry.yarnpkg.com/@carbon/type/-/type-10.29.0.tgz#1ced5e6cb2083f884e20e43bd038cbc05f366a04" - integrity sha512-yFgfdZK4FhtlnTGTl7Iswx+ea2tB+SdSyKtquwybgGbP7tGYDjBNi/TyFPG25t9a6jIibHIM6q2BJ7B3dk67UQ== - dependencies: - "@carbon/import-once" "^10.6.0" - "@carbon/layout" "^10.25.0" - "@carbon/type@^10.30.0": version "10.30.0" resolved "https://registry.yarnpkg.com/@carbon/type/-/type-10.30.0.tgz#8a7477987192acd9e6ea928ba03fb055c61bbcda" @@ -4296,13 +4252,13 @@ capture-stack-trace@^1.0.0: resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d" integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw== -carbon-components-react@^7.33.0, carbon-components-react@^7.37.1, carbon-components-react@^7.38.0: - version "7.37.1" - resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-7.37.1.tgz#7a2c2164e7115ebee7364cba6f0f97796490009e" - integrity sha512-ZA6vYsAjMpJuxGtc1dU+GVpyoAGyBfxgX0xqWYr3dftiQqfJJzmZF/tZFJQMxUlIOY1rmu1AtZz02ra6PPoS9g== +carbon-components-react@^7.33.0, carbon-components-react@^7.38.0: + version "7.38.0" + resolved "https://registry.yarnpkg.com/carbon-components-react/-/carbon-components-react-7.38.0.tgz#d9ba9963d29049323b3f44fe6ddb1ef333349668" + integrity sha512-cO6qtAzRekHW7TNRWm4DiYut6hFSOWrEpw46Ne7tPRahJC0cZZUa8tvtuRVNrNbGXX3uUEiElKwLfdS+EvfS6w== dependencies: "@carbon/feature-flags" "^0.5.0" - "@carbon/icons-react" "^10.33.0" + "@carbon/icons-react" "^10.34.0" "@carbon/telemetry" "0.0.0-alpha.6" classnames "2.3.1" copy-to-clipboard "^3.3.1" @@ -4318,7 +4274,7 @@ carbon-components-react@^7.33.0, carbon-components-react@^7.37.1, carbon-compone use-resize-observer "^6.0.0" window-or-global "^1.0.1" -carbon-components@^10.33.0, carbon-components@^10.37.0, carbon-components@^10.38.0: +carbon-components@^10.33.0, carbon-components@^10.38.0: version "10.38.0" resolved "https://registry.yarnpkg.com/carbon-components/-/carbon-components-10.38.0.tgz#f275192f70eccf0d0052a192113ee20059594d4f" integrity sha512-o5Ns3M2LQMuQ41UJiT+WFU+t/hAerde+77LKmrBpiPRBHJ+/VEBAfKmjB5TiH5QM/VWVDWo0Dvr8gc6yNKRqug== @@ -8633,10 +8589,10 @@ gatsby-telemetry@^1.6.0, gatsby-telemetry@^1.9.0: node-fetch "^2.6.1" uuid "3.4.0" -gatsby-theme-carbon@^1.29.2: - version "1.29.2" - resolved "https://registry.npmjs.org/gatsby-theme-carbon/-/gatsby-theme-carbon-1.29.2.tgz#d638b0379755cfe00de6fd0605baa7daafbbdc2c" - integrity sha512-F5WZZ8L+PRziZdD0qBP0IbbGF/sCFQ4C5l5KsiXU+R9C6LM9quZjVYGia6Zj0qAmtu7rM3CGP8qYdF9IosUwaQ== +gatsby-theme-carbon@^1.30.1: + version "1.30.1" + resolved "https://registry.yarnpkg.com/gatsby-theme-carbon/-/gatsby-theme-carbon-1.30.1.tgz#ef25966f4c7d644a665047e2087153451220e020" + integrity sha512-+6zpZGdfMkI4uJIx72U0HIc7PYXAKCQfDk5ldffi0+26k2QW75ckjRIl3zd4wV8/Gxs4sTcxVBrtQT+GSX8fdQ== dependencies: "@babel/core" "^7.10.4" "@carbon/elements" "^10.32.0"