Skip to content

Commit

Permalink
Merge branch 'master' of github.com:carbon-design-system/gatsby-theme…
Browse files Browse the repository at this point in the history
…-carbon
  • Loading branch information
vpicone committed Nov 1, 2019
2 parents 5d05404 + 0038ab9 commit 015e54b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 18 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
//---------------------------------------
// P
//---------------------------------------
.paragraph-row {
margin-bottom: $spacing-06;
}

.paragraph {
@include carbon--type-style('body-long-02');
Expand Down Expand Up @@ -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');
Expand Down
8 changes: 2 additions & 6 deletions packages/gatsby-theme-carbon/src/components/markdown/P.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -33,7 +29,7 @@ export default class P extends React.Component {
});

return (
<Row className={paragraphRow}>
<Row>
<p className={paragraphClasses} {...rest}>
{children}
</p>
Expand Down

0 comments on commit 015e54b

Please sign in to comment.