Skip to content

Commit

Permalink
Merge branch 'release/v5.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
bramsmulders committed May 10, 2022
2 parents 269ed6f + 7c031bf commit 0b826de
Show file tree
Hide file tree
Showing 4 changed files with 1,025 additions and 1,345 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

All notable changes to this project will be documented in this file.

## 5.5.0 - 10-may-2022

- Removed `o-layout` block axis gaps with native row-gap property
- General housekeeping, package update

## 5.4.0 - 11-february-2022

- Fixed a bug where `responsive.lock` didn't work on any root element.
Expand Down
6 changes: 1 addition & 5 deletions objects/layout/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ $selector: '> *';
flex-flow: row wrap;
align-items: flex-start;
padding: 0; /* [1] */
margin-block-start: calc(-1 * var(--layout-block-gap));
row-gap: var(--layout-block-gap);
margin-inline-start: calc(-1 * var(--layout-inline-gap)); /* [1,2] */
list-style: none; /* [1] */

Expand All @@ -68,12 +68,10 @@ $selector: '> *';
--colspan: var(--columns);
--offset: 0;
--layout-igi: var(--layout-inline-gap); /* [4] */
--layout-bgi: var(--layout-block-gap); /* [4] */
flex-basis: calc(
(100% / var(--columns) * var(--colspan)) - var(--layout-igi)
); /* [1] */
min-inline-size: 0; /* [2] */
margin-block-start: var(--layout-bgi);
margin-inline-start: calc(
100% / var(--columns) * var(--offset) + var(--layout-igi)
); /* [3] */
Expand Down Expand Up @@ -134,8 +132,6 @@ $selector: '> *';
*/
.o-layout__cell {
--layout-igi: 0px; // stylelint-disable-line
--layout-bgi: 0px; // stylelint-disable-line
padding-block-start: var(--layout-block-gap);
padding-inline-start: var(--layout-inline-gap);

// Old way to stretch inner items
Expand Down
Loading

0 comments on commit 0b826de

Please sign in to comment.