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

Update Grid Stories #2315

Merged
merged 28 commits into from
Oct 15, 2019
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c618ae6
Add usage of group0
sareh Oct 4, 2019
f5c2881
Add all groups to story
sareh Oct 4, 2019
6c9ded3
Ensure examples have groups 0-5 defined
sareh Oct 4, 2019
a944b92
Add groups 0-5 to stories
sareh Oct 4, 2019
27cdabf
Merge branch 'latest' into grid-stories-fix
sareh Oct 4, 2019
355600d
Update test examples to have all groups - fixes the width NaN% error
sareh Oct 4, 2019
8f75c85
Merge branch 'latest' of github.com:bbc/psammead into grid-stories-fix
DenisHdz Oct 8, 2019
e3c9917
Update PR number
DenisHdz Oct 8, 2019
ee7aa5a
Display just five promos in the `Normal slice layout for 1 or 5 items…
DenisHdz Oct 8, 2019
62a8406
Merge branch 'latest' of github.com:bbc/psammead into grid-stories-fix
DenisHdz Oct 8, 2019
68cff8d
Reverted `Normal slice layout for 2, 6 or 10 items`, but adding all t…
DenisHdz Oct 8, 2019
2a0d1ee
Remove duplicated story
DenisHdz Oct 8, 2019
327d9d6
Merge branch 'latest' of github.com:bbc/psammead into grid-stories-fix
DenisHdz Oct 9, 2019
2efb81f
Merge branch 'latest' of github.com:bbc/psammead into grid-stories-fix
DenisHdz Oct 10, 2019
727ad93
Merge branch 'latest' of github.com:bbc/psammead into grid-stories-fix
DenisHdz Oct 10, 2019
ccf03ab
Add story with story promos
DenisHdz Oct 10, 2019
8d3e6bc
Rewrite normal slice layout for 1 or 5 items
DenisHdz Oct 10, 2019
e82649b
Merge branch 'latest' of github.com:bbc/psammead into grid-stories-fix
DenisHdz Oct 10, 2019
4f8f258
Bump story-promo in the base package.json
DenisHdz Oct 14, 2019
1911c48
Merge branch 'latest' into grid-stories-fix
oluoluoxenfree Oct 14, 2019
f3a2b9d
Merge branch 'latest' into grid-stories-fix
DenisHdz Oct 14, 2019
3f7abb2
Update snapshot
DenisHdz Oct 15, 2019
8eb7314
Update snapshot
DenisHdz Oct 15, 2019
8b30944
Bump story-promo-list
DenisHdz Oct 15, 2019
d80a5e7
Use implicit return
DenisHdz Oct 15, 2019
4fe139b
Bump base package.json
DenisHdz Oct 15, 2019
0b40ab1
Update snapshot
DenisHdz Oct 15, 2019
cbc7276
Finally update the snapshot
DenisHdz Oct 15, 2019
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
6 changes: 3 additions & 3 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
Expand Up @@ -60,7 +60,7 @@
"@bbc/psammead-locales": "^2.23.0",
"@bbc/psammead-media-indicator": "^2.6.4",
"@bbc/psammead-paragraph": "^2.2.13",
"@bbc/psammead-story-promo": "2.7.18",
"@bbc/psammead-story-promo": "2.8.0-alpha.1",
"@bbc/psammead-storybook-helpers": "^6.0.3",
"@bbc/psammead-styles": "^4.0.1",
"@bbc/psammead-test-helpers": "^3.0.2",
Expand Down
1 change: 1 addition & 0 deletions packages/components/psammead-grid/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
<!-- prettier-ignore -->
| Version | Description |
|---------|-------------|
| 1.0.0-alpha.2 | [PR#2315](https://github.com/bbc/psammead/pull/2315) Update usage of group0 (0-239px) & fix Storybook stories. |
| 1.0.0-alpha.1 | [PR#2289](https://github.com/bbc/psammead/pull/2289) Talos - Bump Dependencies - @bbc/psammead-styles |
| 1.0.0-alpha.0 | [PR#2213](https://github.com/bbc/psammead/pull/2213) Initial package creation - Grid export. |
4 changes: 2 additions & 2 deletions packages/components/psammead-grid/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Psammead Grid is a component that you can use to set out column-based layouts us
<!-- prettier-ignore -->
| Argument | Type | Required | Default | Example |
| -------- | ---- | -------- | ------- | ------- |
| columns | object | yes | N/A | { group1: 6, group2: 6, group3: 6, group4: 8, group5: 20 } |
| startOffset | object | no | Sets all values as 1 for each of the groups defined in `columns` | { group1: 1, group2: 1, group3: 1, group4: 2, group5: 5 } |
| columns | object | yes | N/A | { group0: 6, group1: 6, group2: 6, group3: 6, group4: 8, group5: 20 } |
| startOffset | object | no | Sets all values as 1 for each of the groups defined in `columns` | { group0: 1, group1: 1, group2: 1, group3: 1, group4: 2, group5: 5 } |
| item | boolean | no | false | `item` |
| enableGelGutters | boolean | no | false | `enableGelGutter` |
| enableGelMargins | boolean | no | false | `enableGelMargins` |
Expand Down
2 changes: 1 addition & 1 deletion packages/components/psammead-grid/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-grid/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bbc/psammead-grid",
"version": "1.0.0-alpha.1",
"version": "1.0.0-alpha.2",
"publishConfig": {
"tag": "alpha"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,30 @@ exports[`Grid component should render Grid with Grid items 1`] = `
}
}

@media (max-width:14.9375rem) {
.c1 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:15rem) and (max-width:24.9375rem) {
.c1 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:25rem) and (max-width:37.4375rem) {
.c1 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:37.5rem) and (max-width:62.9375rem) {
.c1 {
display: inline-block;
Expand Down Expand Up @@ -64,6 +88,30 @@ exports[`Grid component should render Grid with Grid items 1`] = `
}
}

@media (max-width:14.9375rem) {
.c4 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:15rem) and (max-width:24.9375rem) {
.c4 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:25rem) and (max-width:37.4375rem) {
.c4 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:37.5rem) and (max-width:62.9375rem) {
.c4 {
display: inline-block;
Expand Down Expand Up @@ -94,10 +142,26 @@ exports[`Grid component should render Grid with Grid items 1`] = `
}
}

@media (max-width:14.9375rem) {
.c5 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:15rem) and (max-width:24.9375rem) {
.c5 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:25rem) and (max-width:37.4375rem) {
.c5 {
display: inline-block;
width: NaN%;
width: 100%;
vertical-align: top;
}
}
Expand Down Expand Up @@ -132,10 +196,26 @@ exports[`Grid component should render Grid with Grid items 1`] = `
}
}

@media (max-width:14.9375rem) {
.c6 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:15rem) and (max-width:24.9375rem) {
.c6 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:25rem) and (max-width:37.4375rem) {
.c6 {
display: inline-block;
width: NaN%;
width: 100%;
vertical-align: top;
}
}
Expand Down Expand Up @@ -356,6 +436,30 @@ exports[`Grid component should render Grid with Grid items including nested non-
}
}

@media (max-width:14.9375rem) {
.c1 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:15rem) and (max-width:24.9375rem) {
.c1 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:25rem) and (max-width:37.4375rem) {
.c1 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:37.5rem) and (max-width:62.9375rem) {
.c1 {
display: inline-block;
Expand Down Expand Up @@ -393,6 +497,30 @@ exports[`Grid component should render Grid with Grid items including nested non-
}
}

@media (max-width:14.9375rem) {
.c5 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:15rem) and (max-width:24.9375rem) {
.c5 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:25rem) and (max-width:37.4375rem) {
.c5 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:37.5rem) and (max-width:62.9375rem) {
.c5 {
display: inline-block;
Expand Down Expand Up @@ -423,10 +551,26 @@ exports[`Grid component should render Grid with Grid items including nested non-
}
}

@media (max-width:14.9375rem) {
.c6 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:15rem) and (max-width:24.9375rem) {
.c6 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:25rem) and (max-width:37.4375rem) {
.c6 {
display: inline-block;
width: NaN%;
width: 100%;
vertical-align: top;
}
}
Expand Down Expand Up @@ -461,10 +605,26 @@ exports[`Grid component should render Grid with Grid items including nested non-
}
}

@media (max-width:14.9375rem) {
.c7 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:15rem) and (max-width:24.9375rem) {
.c7 {
display: inline-block;
width: 100%;
vertical-align: top;
}
}

@media (min-width:25rem) and (max-width:37.4375rem) {
.c7 {
display: inline-block;
width: NaN%;
width: 100%;
vertical-align: top;
}
}
Expand Down
Loading