@financial-times/o-grid
Advanced tools
Comparing version 5.0.0-beta.1 to 5.0.0-beta.2
@@ -28,3 +28,3 @@ { | ||
"name": "@financial-times/o-grid", | ||
"version": "5.0.0-beta.1", | ||
"version": "5.0.0-beta.2", | ||
"dependencies": { | ||
@@ -31,0 +31,0 @@ "sass-mq": "^5.0.0" |
@@ -125,6 +125,6 @@ # o-grid [![Build Status](https://circleci.com/gh/Financial-Times/o-grid.png?style=shield&circle-token=a0c7fe6f37aa937651724d1650814e45ab2662a5)](https://circleci.com/gh/Financial-Times/o-grid) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](#licence) | ||
div { | ||
@include oGridContentContainer(); | ||
@include oGridContainer(); | ||
> div { | ||
@include oGridContentRow(); | ||
@include oGridRow(); | ||
} | ||
@@ -135,7 +135,7 @@ } | ||
// Half by default, then 8 columns wide on Large layout and up | ||
@include oGridContentColspan((default: 6, L: 8)); | ||
@include oGridColspan((default: 6, L: 8)); | ||
} | ||
.second-column { | ||
// Half by default, then 4 columns wide on Large layout and up | ||
@include oGridContentColspan((default: 6, L: 4)); | ||
@include oGridColspan((default: 6, L: 4)); | ||
} | ||
@@ -157,3 +157,3 @@ ``` | ||
```scss | ||
div { @include oGridContentColspan((default: 6, L: 8)); } | ||
div { @include oGridColspan((default: 6, L: 8)); } | ||
``` | ||
@@ -173,3 +173,3 @@ | ||
```scss | ||
div { @include oGridContentColspan((default: one-half, L: two-thirds)); } | ||
div { @include oGridColspan((default: one-half, L: two-thirds)); } | ||
``` | ||
@@ -186,3 +186,3 @@ | ||
```scss | ||
div { @include oGridContentColspan((default: full-width, L: 9)); } | ||
div { @include oGridColspan((default: full-width, L: 9)); } | ||
``` | ||
@@ -197,3 +197,3 @@ | ||
```scss | ||
div { @include oGridContentColspan((default: one-half, M: 12)); } | ||
div { @include oGridColspan((default: one-half, M: 12)); } | ||
``` | ||
@@ -208,3 +208,3 @@ | ||
```scss | ||
div { @include oGridContentColspan((default: 4, M: 3, L: 2, XL: 1)); } | ||
div { @include oGridColspan((default: 4, M: 3, L: 2, XL: 1)); } | ||
``` | ||
@@ -219,3 +219,3 @@ | ||
```scss | ||
div { @include oGridContentColspan((M: 6)); } | ||
div { @include oGridColspan((M: 6)); } | ||
``` | ||
@@ -258,3 +258,3 @@ | ||
```scss | ||
div { @include oGridContentColspan((default: hide, L: 12, XL: hide)); } | ||
div { @include oGridColspan((default: hide, L: 12, XL: hide)); } | ||
``` | ||
@@ -272,6 +272,6 @@ | ||
.my-column { | ||
@include oGridContentCenter; | ||
@include oGridCenter; | ||
@include oGridRespondTo(L) { | ||
@include oGridContentUncenter; | ||
@include oGridUncenter; | ||
} | ||
@@ -291,4 +291,4 @@ } | ||
.content { | ||
@include oGridContentColspan(8); | ||
@include oGridContentPush(4); // outputs left: -33.333333333%; | ||
@include oGridColspan(8); | ||
@include oGridPush(4); // outputs left: -33.333333333%; | ||
} | ||
@@ -298,4 +298,4 @@ | ||
.sidebar { | ||
@include oGridContentColspan(4); | ||
@include oGridContentPull(8); // outputs right: -66.666666667%; | ||
@include oGridColspan(4); | ||
@include oGridPull(8); // outputs right: -66.666666667%; | ||
} | ||
@@ -313,5 +313,5 @@ ``` | ||
.content { | ||
@include oGridContentColspan((L: 8)); | ||
@include oGridColspan((L: 8)); | ||
@include oGridRespondTo(L) { | ||
@include oGridContentPush(4); // outputs left: -33.333333333%; | ||
@include oGridPush(4); // outputs left: -33.333333333%; | ||
} | ||
@@ -322,5 +322,5 @@ } | ||
.sidebar { | ||
@include oGridContentColspan((L: 4)); | ||
@include oGridColspan((L: 4)); | ||
@include oGridRespondTo(L) { | ||
@include oGridContentPull(8); // outputs right: -66.666666667%; | ||
@include oGridPull(8); // outputs right: -66.666666667%; | ||
} | ||
@@ -342,11 +342,11 @@ } | ||
div { | ||
@include oGridContentColspan(8); | ||
@include oGridContentOffset(4); // outputs margin-left: 33.333333333%; | ||
@include oGridColspan(8); | ||
@include oGridOffset(4); // outputs margin-left: 33.333333333%; | ||
} | ||
div { | ||
@include oGridContentColspan((L: 8)); | ||
@include oGridColspan((L: 8)); | ||
@include oGridRespondTo(L) { | ||
@include oGridContentOffset(4); // outputs margin-left: 33.333333333%; | ||
@include oGridOffset(4); // outputs margin-left: 33.333333333%; | ||
} | ||
@@ -380,3 +380,3 @@ } | ||
To remove gutters from in between columns in a row, use the `o-grid-row--compact` class or the `oGridContentRowCompact()` mixin: | ||
To remove gutters from in between columns in a row, use the `o-grid-row--compact` class or the `oGridRowCompact()` mixin: | ||
@@ -393,11 +393,11 @@ ```html | ||
div { | ||
@include oGridContentContainer(); | ||
@include oGridContainer(); | ||
> div { | ||
@include oGridContentRow(); | ||
@include oGridContentRowCompact('.column'); | ||
@include oGridRow(); | ||
@include oGridRowCompact('.column'); | ||
} | ||
.column { | ||
@include oGridContentColspan((default: full-width, S: 3)); | ||
@include oGridColspan((default: full-width, S: 3)); | ||
} | ||
@@ -427,3 +427,3 @@ } | ||
```scss | ||
el { @include oGridContentColspan(); } | ||
el { @include oGridColspan(); } | ||
``` | ||
@@ -452,3 +452,3 @@ | ||
```scss | ||
el { @include oGridContentColspan($span: 4); } | ||
el { @include oGridColspan($span: 4); } | ||
``` | ||
@@ -482,3 +482,3 @@ | ||
el { | ||
@include oGridContentColspan(( | ||
@include oGridColspan(( | ||
default: full-width, | ||
@@ -578,7 +578,7 @@ M: 6 | ||
.un-rowify { | ||
@include oGridContentResetRow; | ||
@include oGridResetRow; | ||
} | ||
.de-columnify { | ||
@include oGridContentResetColumn; | ||
@include oGridResetColumn; | ||
} | ||
@@ -585,0 +585,0 @@ ``` |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
451104