Merge branch 'latest' into remove-code-owners

BBC-archive · May 17, 2019 · 7e5c4c2 · 7e5c4c2
2 parents 8c0a04d + 3fe3feb
commit 7e5c4c2
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 7 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 
 def dockerRegistry = "329802642264.dkr.ecr.eu-west-1.amazonaws.com"
-def nodeImageVersion = "0.0.1"
+def nodeImageVersion = "0.0.2"
 def nodeImage = "${dockerRegistry}/bbc-news/node-10-lts:${nodeImageVersion}"
 
 def nodeName

diff --git a/packages/components/psammead-caption/CHANGELOG.md b/packages/components/psammead-caption/CHANGELOG.md
@@ -3,6 +3,7 @@
 <!-- prettier-ignore -->
 | Version | Description |
 |---------|-------------|
+| 1.1.5 | [PR#524](https://github.com/bbc/psammead/pull/524) Add spacing for nested paragraph |
 | 1.1.4 | [PR#515](https://github.com/bbc/psammead/pull/515) Update story to use dirDecorator |
 | 1.1.3 | [PR#491](https://github.com/bbc/psammead/pull/491) Remove bottom padding from paragraphs within Caption |
 | 1.1.2 | [PR#498](https://github.com/bbc/psammead/pull/498) Update stories to use new input provider |

diff --git a/packages/components/psammead-caption/package-lock.json b/packages/components/psammead-caption/package-lock.json
diff --git a/packages/components/psammead-caption/package.json b/packages/components/psammead-caption/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bbc/psammead-caption",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "main": "dist/index.js",
   "description": "React styled components for a Caption",
   "repository": {

diff --git a/packages/components/psammead-caption/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-caption/src/__snapshots__/index.test.jsx.snap
@@ -22,6 +22,11 @@ exports[`Caption should render with some offscreen text 1`] = `
   width: 100%;
 }
 
+.c0 > p {
+  padding-bottom: 1.5rem;
+  margin: 0;
+}
+
 .c0 > p:last-child {
   padding-bottom: 0;
 }
@@ -90,6 +95,11 @@ exports[`Caption should render with some offscreen text and arabic script typogr
   width: 100%;
 }
 
+.c0 > p {
+  padding-bottom: 1.5rem;
+  margin: 0;
+}
+
 .c0 > p:last-child {
   padding-bottom: 0;
 }

diff --git a/packages/components/psammead-caption/src/index.jsx b/packages/components/psammead-caption/src/index.jsx
@@ -2,6 +2,7 @@ import styled, { css } from 'styled-components';
 import { shape } from 'prop-types';
 import {
   GEL_SPACING,
+  GEL_SPACING_TRPL,
   GEL_MARGIN_ABOVE_400PX,
   GEL_MARGIN_BELOW_400PX,
 } from '@bbc/gel-foundations/spacings';
@@ -36,6 +37,10 @@ const Caption = styled.figcaption`
   @media (min-width: ${GEL_GROUP_4_SCREEN_WIDTH_MIN}) {
     padding: ${GEL_SPACING} 0 0;
   }
+  & > p {
+    padding-bottom: ${GEL_SPACING_TRPL};
+    margin: 0; /* reset */
+  }
   & > p:last-child {
     padding-bottom: 0;
   }

diff --git a/packages/components/psammead-caption/src/index.stories.jsx b/packages/components/psammead-caption/src/index.stories.jsx
@@ -3,7 +3,6 @@ import { storiesOf } from '@storybook/react';
 import { withKnobs } from '@storybook/addon-knobs';
 import { inputProvider, dirDecorator } from '@bbc/psammead-storybook-helpers';
 import InlineLink from '@bbc/psammead-inline-link';
-import Paragraph from '@bbc/psammead-paragraph';
 import VisuallyHiddenText from '@bbc/psammead-visually-hidden-text';
 import notes from '../README.md';
 import Caption from '.';
@@ -66,10 +65,10 @@ storiesOf('Caption', module)
     'containing multiple paragraphs',
     inputProvider([], (inputs, script) => (
       <Caption script={script}>
-        <Paragraph>Paragraph with padding bottom.</Paragraph>
-        <Paragraph>
+        <p>Paragraph with padding bottom.</p>
+        <p>
           Last paragraph - <i>without padding bottom</i>.
-        </Paragraph>
+        </p>
       </Caption>
     )),
     { notes, knobs: { escapeHTML: false } },