Skip to content
This repository has been archived by the owner on Aug 13, 2023. It is now read-only.

Bump prettier from 2.0.5 to 2.1.1 #3709

Merged
merged 4 commits into from
Sep 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<!-- prettier-ignore -->
| Version | Description |
|---------|-------------|
| 2.2.14 | [PR#3709](https://github.com/bbc/psammead/pull/3709) Bump prettier from 2.0.5 to 2.1.1 |
| 2.2.13 | [PR#3727](https://github.com/bbc/psammead/pull/3727) Minor & patch package updates |
| 2.2.12 | [PR#3714](https://github.com/bbc/psammead/pull/3714) Talos - Bump Dependencies - @bbc/psammead-radio-schedule |
| 2.2.11 | [PR#3713](https://github.com/bbc/psammead/pull/3713) Talos - Bump Dependencies - @bbc/psammead-brand, @bbc/psammead-bulletin, @bbc/psammead-media-player, @bbc/psammead-most-read, @bbc/psammead-radio-schedule, @bbc/psammead-timestamp-container |
Expand Down
45 changes: 12 additions & 33 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bbc/psammead",
"version": "2.2.13",
"version": "2.2.14",
"description": "Core Components Library Developed & Maintained By The Articles and Reach & Languages Team",
"main": "index.js",
"private": true,
Expand Down
1 change: 1 addition & 0 deletions packages/components/psammead-bulletin/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<!-- prettier-ignore -->
| Version | Description |
|---------|-------------|
| 3.2.13 | [PR#3709](https://github.com/bbc/psammead/pull/3709) Bump prettier from 2.0.5 to 2.1.1 |
| 3.2.12 | [PR#3712](https://github.com/bbc/psammead/pull/3712) Talos - Bump Dependencies - @bbc/psammead-story-promo |
| 3.2.11 | [PR#3710](https://github.com/bbc/psammead/pull/3710) Talos - Bump Dependencies - @bbc/psammead-story-promo, @bbc/psammead-styles |
| 3.2.10 | [PR#3707](https://github.com/bbc/psammead/pull/3707) Talos - Bump Dependencies - @bbc/psammead-styles |
Expand Down
2 changes: 1 addition & 1 deletion packages/components/psammead-bulletin/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/psammead-bulletin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bbc/psammead-bulletin",
"version": "3.2.12",
"version": "3.2.13",
"main": "dist/index.js",
"module": "esm/index.js",
"sideEffects": false,
Expand Down
2 changes: 1 addition & 1 deletion packages/components/psammead-bulletin/src/ImageStyles.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const imageGridStyles = {

const ImageGridItem = styled.div`
vertical-align: top;
display: inline-block;
display: inline-block;
width: ${fullWidthColumnsMaxScaleable};
padding: ${GEL_SPACING} ${GEL_SPACING} 0 ${GEL_SPACING};
${({ bulletinType }) => imageGridFallbackStyles[bulletinType]}
Expand Down
4 changes: 3 additions & 1 deletion packages/components/psammead-bulletin/src/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ const BulletinSummary = styled.p`
padding: 0 ${GEL_SPACING} ${GEL_SPACING_DBL};
${({ script }) => script && getLongPrimer(script)}
${({ service }) => service && getSansRegular(service)}
${({ bulletinType }) => bulletinSummaryStyles[bulletinType]}
${({
bulletinType,
}) => bulletinSummaryStyles[bulletinType]}
`;

const IconWrapper = styled.span`
Expand Down
1 change: 1 addition & 0 deletions packages/components/psammead-consent-banner/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<!-- prettier-ignore -->
| Version | Description |
|---------|-------------|
| 2.3.35 | [PR#3709](https://github.com/bbc/psammead/pull/3709) Bump prettier from 2.0.5 to 2.1.1 |
| 2.3.34 | [PR#3710](https://github.com/bbc/psammead/pull/3710) Talos - Bump Dependencies - @bbc/psammead-styles |
| 2.3.33 | [PR#3707](https://github.com/bbc/psammead/pull/3707) Talos - Bump Dependencies - @bbc/psammead-styles |
| 2.3.32 | [PR#3623](https://github.com/bbc/psammead/pull/3623) Talos - Bump Dependencies - @bbc/gel-foundations |
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/psammead-consent-banner/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bbc/psammead-consent-banner",
"version": "2.3.34",
"version": "2.3.35",
"main": "dist/index.js",
"module": "esm/index.js",
"sideEffects": false,
Expand Down
2 changes: 1 addition & 1 deletion packages/components/psammead-consent-banner/src/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const ltrRtl = (ltrValue, rtlValue) =>
`;

const Wrapper = styled.div`
${({ service }) => getSansRegular(service)}
${({ service }) => getSansRegular(service)}
background-color: ${C_CONSENT_BACKGROUND};
padding: ${GEL_SPACING_DBL} ${GEL_MARGIN_BELOW_400PX};

Expand Down
1 change: 1 addition & 0 deletions packages/components/psammead-livel-label/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<!-- prettier-ignore -->
| Version | Description |
|---------|-------------|
| 1.0.1 | [PR#3709](https://github.com/bbc/psammead/pull/3709) Bump prettier from 2.0.5 to 2.1.1 |
| 1.0.0 | [PR#3293](https://github.com/BBC/psammead/pull/3293) Remove alpha tag |
| 0.1.0-alpha.2 | [PR#3276](https://github.com/bbc/psammead/pull/3276) Remove `withOffScreenText` prop. |
| 0.1.0-alpha.1 | [PR#3224](https://github.com/bbc/psammead/pull/3224) Initial creation of package. |
2 changes: 1 addition & 1 deletion packages/components/psammead-livel-label/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/psammead-livel-label/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bbc/psammead-live-label",
"version": "1.0.0",
"version": "1.0.1",
"main": "dist/index.js",
"module": "esm/index.js",
"sideEffects": false,
Expand Down
16 changes: 8 additions & 8 deletions packages/components/psammead-livel-label/src/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import VisuallyHiddenText from '@bbc/psammead-visually-hidden-text';
const StyledSpan = styled.span.attrs(
({ ariaHidden }) => ariaHidden && { 'aria-hidden': 'true' },
)`
${({ service }) => getSansBold(service)}
color: ${C_POSTBOX};
display: inline-block;
${({ dir }) =>
dir === 'rtl'
? `margin-left: ${GEL_SPACING};`
: `margin-right: ${GEL_SPACING};`}
`;
${({ service }) => getSansBold(service)}
color: ${C_POSTBOX};
display: inline-block;
${({ dir }) =>
dir === 'rtl'
? `margin-left: ${GEL_SPACING};`
: `margin-right: ${GEL_SPACING};`}
`;

const LiveLabel = ({
service,
Expand Down
1 change: 1 addition & 0 deletions packages/components/psammead-script-link/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<!-- prettier-ignore -->
| Version | Description |
|---------|-------------|
| 1.0.20 | [PR#3709](https://github.com/bbc/psammead/pull/3709) Bump prettier from 2.0.5 to 2.1.1 |
| 1.0.19 | [PR#3710](https://github.com/bbc/psammead/pull/3710) Talos - Bump Dependencies - @bbc/psammead-styles |
| 1.0.18 | [PR#3707](https://github.com/bbc/psammead/pull/3707) Talos - Bump Dependencies - @bbc/psammead-styles |
| 1.0.17 | [PR#3623](https://github.com/bbc/psammead/pull/3623) Talos - Bump Dependencies - @bbc/gel-foundations |
Expand Down
2 changes: 1 addition & 1 deletion packages/components/psammead-script-link/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/psammead-script-link/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bbc/psammead-script-link",
"version": "1.0.19",
"version": "1.0.20",
"main": "dist/index.js",
"module": "esm/index.js",
"sideEffects": false,
Expand Down
4 changes: 2 additions & 2 deletions packages/components/psammead-script-link/src/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ const StyledSpan = styled.span`
}
/* stylelint-enable */

@media (max-width: ${GEL_GROUP_2_SCREEN_WIDTH_MAX}) {
line-height: calc(${GEL_SPACING_QUIN} - ${GEL_SPACING});
@media (max-width: ${GEL_GROUP_2_SCREEN_WIDTH_MAX}) {
line-height: calc(${GEL_SPACING_QUIN} - ${GEL_SPACING});
}
`;

Expand Down
1 change: 1 addition & 0 deletions packages/components/psammead-story-promo/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<!-- prettier-ignore -->
| Version | Description |
| ------- | ----------- |
| 6.0.9 | [PR#3709](https://github.com/bbc/psammead/pull/3709) Bump prettier from 2.0.5 to 2.1.1 |
| 6.0.8 | [PR#3710](https://github.com/bbc/psammead/pull/3710) Talos - Bump Dependencies - @bbc/psammead-styles |
| 6.0.7 | [PR#3707](https://github.com/bbc/psammead/pull/3707) Talos - Bump Dependencies - @bbc/psammead-styles |
| 6.0.6 | [PR#3623](https://github.com/bbc/psammead/pull/3623) Talos - Bump Dependencies - @bbc/gel-foundations |
Expand Down
2 changes: 1 addition & 1 deletion packages/components/psammead-story-promo/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/psammead-story-promo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bbc/psammead-story-promo",
"version": "6.0.8",
"version": "6.0.9",
"main": "dist/index.js",
"module": "esm/index.js",
"sideEffects": false,
Expand Down
18 changes: 9 additions & 9 deletions packages/components/psammead-story-promo/src/ImageStyles.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,15 @@ const imageGridFallbackStyles = {
};

const ImageGridItem = styled.div`
display: inline-block;
vertical-align: top;
position: relative;
${({ promoType }) => imageGridFallbackStyles[promoType]}

@supports (${grid}) {
width: initial;
${({ promoType }) => imageGridStyles[promoType]}
}
display: inline-block;
vertical-align: top;
position: relative;
${({ promoType }) => imageGridFallbackStyles[promoType]}

@supports (${grid}) {
width: initial;
${({ promoType }) => imageGridStyles[promoType]}
}
`;

export default ImageGridItem;
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ const StyledIndexAlsosLink = styled.a`
color: ${C_METAL};
}

& svg { margin: 0; } /* Reset Media Indicator SVG margin */
& svg {
margin: 0;
} /* Reset Media Indicator SVG margin */
`;

const IndexAlsosLink = ({
Expand Down
37 changes: 18 additions & 19 deletions packages/components/psammead-story-promo/src/TextStyles.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ const TextGridColumnsTopStory = css`
`;

const TextGridColumns = css`
grid-column: 3 / span 4;
grid-column: 3 / span 4;

${({ displayImage }) => !displayImage && `grid-column: 1 / span 6;`}
${({ displayImage }) => !displayImage && `grid-column: 1 / span 6;`}

@media (min-width: ${GEL_GROUP_4_SCREEN_WIDTH_MIN}) {
padding-top: ${({ displayImage }) => (displayImage ? GEL_SPACING : '0')}
}
@media (min-width: ${GEL_GROUP_4_SCREEN_WIDTH_MIN}) {
padding-top: ${({ displayImage }) => (displayImage ? GEL_SPACING : '0')};
}
`;

const TextGridColumnsLeadingStory = css`
Expand Down Expand Up @@ -125,24 +125,23 @@ const leadingPromoTimestampPadding = `
`;

const TextGridItem = styled.div`
display: inline-block;
vertical-align: top;
display: inline-block;
vertical-align: top;

${({ promoType }) => textGridFallbackStyles[promoType]}
${({ promoType }) => textGridFallbackStyles[promoType]}

@supports (${grid}) {
display: block;
width: initial;
padding: initial;
${({ promoType }) => textGridStyles[promoType]}
}
@supports (${grid}) {
display: block;
width: initial;
padding: initial;
${({ promoType }) => textGridStyles[promoType]}
}

${({ promoType }) =>
promoType === 'leading' && leadingPromoTimestampPadding}
${({ promoType }) => promoType === 'leading' && leadingPromoTimestampPadding}

${({ displayImage }) =>
!displayImage &&
`>div{ display:inline-block; vertical-align:initial; }
${({ displayImage }) =>
!displayImage &&
`>div{ display:inline-block; vertical-align:initial; }
& svg{ margin: 0; }`}
`;

Expand Down
3 changes: 2 additions & 1 deletion packages/components/psammead-story-promo/src/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ export const Headline = styled.h3`
margin: 0; /* Reset */
padding-bottom: ${GEL_SPACING};
${({ service }) => getSerifMedium(service)}
${({ script, promoType }) => script && headlineTypography(script)[promoType]}
${({ script, promoType }) =>
script && headlineTypography(script)[promoType]}
${({ promoHasImage }) =>
!promoHasImage &&
`display: inline;`} /* Needed for aligning Media Indicator with Headline */
Expand Down
Loading