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

Fix grid styles #3992

Merged
merged 4 commits into from
Nov 16, 2020
Merged

Fix grid styles #3992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f17f872
Add missing semicolon to grid component
Nov 13, 2020
6b47235
Bump version and changelog
Nov 13, 2020
e64edd3
Update changelog
Nov 13, 2020
fbdcd42
Remove web-vitals change
Nov 13, 2020
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 packages/components/psammead-grid/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<!-- prettier-ignore -->
| Version | Description |
|---------|-------------|
| 3.0.4 | [PR#3992](https://github.com/bbc/psammead/pull/3992) Add missing semicolon |
| 3.0.3 | [PR#3944](https://github.com/bbc/psammead/pull/3944) Talos - Bump Dependencies - @bbc/psammead-styles |
| 3.0.2 | [PR#3925](https://github.com/bbc/psammead/pull/3925) Talos - Bump Dependencies - @bbc/psammead-styles |
| 3.0.1 | [PR#3891](https://github.com/bbc/psammead/pull/3894) Update snapshots. |
Expand Down
2 changes: 1 addition & 1 deletion packages/components/psammead-grid/package-lock.json
View file
Open in desktop

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-grid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bbc/psammead-grid",
"version": "3.0.3",
"version": "3.0.4",
"description": "Grid component",
"main": "dist/index.js",
"module": "esm/index.js",
Expand Down
72 changes: 48 additions & 24 deletions packages/components/psammead-grid/src/__snapshots__/index.test.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,47 +943,53 @@ exports[`Grid component should render Grid with Grid items including nested non-
@media (max-width:14.9375rem) {
.emotion-2 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:15rem) and (max-width:24.9375rem) {
.emotion-2 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:25rem) and (max-width:37.4375rem) {
.emotion-2 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:37.5rem) and (max-width:62.9375rem) {
.emotion-2 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:63rem) and (max-width:79.9375rem) {
.emotion-2 {
width: calc(75%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:80rem) {
.emotion-2 {
width: calc(60%);
margin-left: 20% display:inline-block;
margin-left: 20%;
display: inline-block;
vertical-align: top;
}
}
Expand Down Expand Up @@ -1165,47 +1171,53 @@ exports[`Grid component should render Grid with Grid items including nested non-
@media (max-width:14.9375rem) {
.emotion-6 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:15rem) and (max-width:24.9375rem) {
.emotion-6 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:25rem) and (max-width:37.4375rem) {
.emotion-6 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:37.5rem) and (max-width:62.9375rem) {
.emotion-6 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:63rem) and (max-width:79.9375rem) {
.emotion-6 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:80rem) {
.emotion-6 {
width: calc(100% - 33.333333333333336%);
margin-left: 33.333333333333336% display:inline-block;
margin-left: 33.333333333333336%;
display: inline-block;
vertical-align: top;
}
}
Expand Down Expand Up @@ -1279,47 +1291,53 @@ exports[`Grid component should render Grid with Grid items including nested non-
@media (max-width:14.9375rem) {
.emotion-10 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:15rem) and (max-width:24.9375rem) {
.emotion-10 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:25rem) and (max-width:37.4375rem) {
.emotion-10 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:37.5rem) and (max-width:62.9375rem) {
.emotion-10 {
width: calc(83.33333333333333%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:63rem) and (max-width:79.9375rem) {
.emotion-10 {
width: calc(83.33333333333333%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:80rem) {
.emotion-10 {
width: calc(83.33333333333333%);
margin-left: 33.333333333333336% display:inline-block;
margin-left: 33.333333333333336%;
display: inline-block;
vertical-align: top;
}
}
Expand Down Expand Up @@ -1393,47 +1411,53 @@ exports[`Grid component should render Grid with Grid items including nested non-
@media (max-width:14.9375rem) {
.emotion-18 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:15rem) and (max-width:24.9375rem) {
.emotion-18 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:25rem) and (max-width:37.4375rem) {
.emotion-18 {
width: calc(100% - 0%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:37.5rem) and (max-width:62.9375rem) {
.emotion-18 {
width: calc(83.33333333333333%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:63rem) and (max-width:79.9375rem) {
.emotion-18 {
width: calc(62.5%);
margin-left: 0% display:inline-block;
margin-left: 0%;
display: inline-block;
vertical-align: top;
}
}

@media (min-width:80rem) {
.emotion-18 {
width: calc(50%);
margin-left: 20% display:inline-block;
margin-left: 20%;
display: inline-block;
vertical-align: top;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/psammead-grid/src/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ const childrenFallback = (
? `margin-${dir === 'ltr' ? 'left' : 'right'}: ${startOffsetPercentage(
parentColumnsGroup,
gridStartOffsetGroup,
)}`
)};`
: ``
}
display: inline-block;
Expand Down