Skip to content

Commit

Permalink
Merge pull request foundation#11610 from ncoden/docs/xy-grid-x-vs-y-f…
Browse files Browse the repository at this point in the history
…eatures

docs: add availability of features in the XY Grid (X/Y/both)
  • Loading branch information
ncoden authored Nov 28, 2018
2 parents 56051d3 + ff2943b commit 618c95c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions docs/pages/xy-grid.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ The structure of XY grid uses `.grid-x`, `.grid-y`, and `.cell` as its base. Wit
## Gutters

The defining feature of the XY grid is the ability to use margin AND padding grids in harmony.
To define a grid type, simply set `.grid-margin-x` or `.grid-padding-x` on the grid.
To define a grid type, simply set `.grid-margin-x`/`.grid-margin-y` or `.grid-padding-x`/`.grid-padding-y` on the grid.

<p>
<a class="" data-open-video="5:43"><img src="{{root}}assets/img/icons/watch-video-icon.svg" class="video-icon" height="30" width="30" alt=""> Watch this part in video</a>
Expand All @@ -105,7 +105,7 @@ To define a grid type, simply set `.grid-margin-x` or `.grid-padding-x` on the g

## Grid Container

The grid defaults to the full width of the available space. To contain it use the `grid-container` class. The container will be centered and have a max-width equal to your `$grid-container` setting (1200px by default), along with padding on the left/right equal to half your `$grid-container-padding` setting.
The grid defaults to the full width of the available space. To contain it horizontally use the `grid-container` class. The container will be centered and have a max-width equal to your `$grid-container` setting (1200px by default), along with padding on the left/right equal to half your `$grid-container-padding` setting.

```html
<div class="grid-container">
Expand Down Expand Up @@ -203,7 +203,7 @@ To switch back to the auto behavior from a percentage or shrink behavior, use th

---

## Collapse Cells
## Collapse Cells <span class="label secondary">X Grid only</span>

The `.[size]-[gutter-type]-collapse` class lets you remove cell gutters.

Expand All @@ -222,9 +222,9 @@ There are times when you won't want each media query to be collapsed. In this ca

---

## Offsets
## Offsets <span class="label secondary">X Grid only</span>

Offsets work by applying `margin-left` (or `margin-top` for a vertical grid) to a grid.
Offsets work by applying `margin-left` to a grid.

```html_example
<div class="grid-x grid-margin-x">
Expand All @@ -235,7 +235,7 @@ Offsets work by applying `margin-left` (or `margin-top` for a vertical grid) to

---

## Block Grids
## Block Grids <span class="label secondary">X Grid only</span>

To define cell widths within a direction-level, instead of the individual cell level, add the class `.[size]-up-[n]` to a `grid-x`, where `[n]` is the number of cells to display per direction, and `[size]` is the breakpoint at which to apply the effect.

Expand Down
10 changes: 5 additions & 5 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 @@ -48,7 +48,7 @@
"corejs-typeahead": "^1.1.1",
"cz-conventional-changelog": "^2.1.0",
"doiuse": "~4.1.0",
"foundation-docs": "git+https://github.com/zurb/foundation-docs.git#9a50a61c04ae5325e0441d0b7adb880c42c9c2ff",
"foundation-docs": "github:zurb/foundation-docs#96ea89b6289767ed5e285ae037489d5c8f253b39",
"gulp": "^4.0.0",
"gulp-add-src": "^1.0.0",
"gulp-babel": "^8.0.0",
Expand Down

0 comments on commit 618c95c

Please sign in to comment.