From 0038ab93902b473d0833c4f0688c37b77912b535 Mon Sep 17 00:00:00 2001 From: Vince Picone Date: Fri, 1 Nov 2019 11:53:05 -0500 Subject: [PATCH] Rm row margin bottom (#486) * v1.16.0-alpha.1 * chore: remove row margin-bottom * chore: remove list margin-bottom --- lerna.json | 2 +- packages/example/package.json | 4 ++-- packages/gatsby-theme-carbon/package.json | 2 +- .../src/components/markdown/Markdown.module.scss | 12 ------------ .../gatsby-theme-carbon/src/components/markdown/P.js | 8 ++------ 5 files changed, 6 insertions(+), 22 deletions(-) diff --git a/lerna.json b/lerna.json index 9ded7b830..fdd96456d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "packages": ["packages/*"], - "version": "1.16.0-alpha.0", + "version": "1.16.0-alpha.1", "npmClient": "yarn", "useWorkspaces": true, "publish": { diff --git a/packages/example/package.json b/packages/example/package.json index 308fa69c2..224131785 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -1,7 +1,7 @@ { "name": "example", "private": true, - "version": "1.16.0-alpha.0", + "version": "1.16.0-alpha.1", "license": "Apache 2.0", "scripts": { "develop": "gatsby develop", @@ -15,7 +15,7 @@ }, "dependencies": { "gatsby": "^2.4.2", - "gatsby-theme-carbon": "^1.16.0-alpha.0", + "gatsby-theme-carbon": "^1.16.0-alpha.1", "react": "^16.8.6", "react-dom": "^16.8.6" } diff --git a/packages/gatsby-theme-carbon/package.json b/packages/gatsby-theme-carbon/package.json index c2640e4ee..fd0b4541d 100644 --- a/packages/gatsby-theme-carbon/package.json +++ b/packages/gatsby-theme-carbon/package.json @@ -1,6 +1,6 @@ { "name": "gatsby-theme-carbon", - "version": "1.16.0-alpha.0", + "version": "1.16.0-alpha.1", "main": "index.js", "author": "vpicone (@vpicone)", "repository": { diff --git a/packages/gatsby-theme-carbon/src/components/markdown/Markdown.module.scss b/packages/gatsby-theme-carbon/src/components/markdown/Markdown.module.scss index 4d251df74..05769fab4 100644 --- a/packages/gatsby-theme-carbon/src/components/markdown/Markdown.module.scss +++ b/packages/gatsby-theme-carbon/src/components/markdown/Markdown.module.scss @@ -1,9 +1,6 @@ //--------------------------------------- // P //--------------------------------------- -.paragraph-row { - margin-bottom: $spacing-06; -} .paragraph { @include carbon--type-style('body-long-02'); @@ -84,15 +81,6 @@ } } -//--------------------------------------- -// List items / ol / ul / li -//--------------------------------------- - -:global(.bx--list--ordered).list, -:global(.bx--list--unordered).list { - margin-bottom: $spacing-06; -} - :global(.bx--list--ordered) .list-item, :global(.bx--list--unordered) .list-item { @include carbon--type-style('body-long-02'); diff --git a/packages/gatsby-theme-carbon/src/components/markdown/P.js b/packages/gatsby-theme-carbon/src/components/markdown/P.js index e0359efe5..67321677f 100644 --- a/packages/gatsby-theme-carbon/src/components/markdown/P.js +++ b/packages/gatsby-theme-carbon/src/components/markdown/P.js @@ -3,11 +3,7 @@ import PropTypes from 'prop-types'; import classnames from 'classnames'; import { Row } from '../Grid'; -import { - paragraph, - paragraphResponsive, - paragraphRow, -} from './Markdown.module.scss'; +import { paragraph, paragraphResponsive } from './Markdown.module.scss'; export default class P extends React.Component { static propTypes = { @@ -33,7 +29,7 @@ export default class P extends React.Component { }); return ( - +

{children}