From 30601b7118ae60d8a786c31181e0d7728d7f8eec Mon Sep 17 00:00:00 2001 From: Nicolas Coden Date: Mon, 26 Nov 2018 20:30:39 +0100 Subject: [PATCH] docs: document availability of the XY Grid for X/Y/both grids Closes https://github.com/zurb/foundation-sites/issues/11601 Note: this require https://github.com/zurb/foundation-docs/pull/42 --- docs/pages/xy-grid.md | 12 ++++++------ package-lock.json | 10 +++++----- package.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pages/xy-grid.md b/docs/pages/xy-grid.md index e3cc39850..b9e2ff58d 100644 --- a/docs/pages/xy-grid.md +++ b/docs/pages/xy-grid.md @@ -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-margin-y` on the grid.

Watch this part in video @@ -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

@@ -203,7 +203,7 @@ To switch back to the auto behavior from a percentage or shrink behavior, use th --- -## Collapse Cells +## Collapse Cells X Grid only The `.[size]-[gutter-type]-collapse` class lets you remove cell gutters. @@ -222,9 +222,9 @@ There are times when you won't want each media query to be collapsed. In this ca --- -## Offsets +## Offsets X Grid only -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
@@ -235,7 +235,7 @@ Offsets work by applying `margin-left` (or `margin-top` for a vertical grid) to --- -## Block Grids +## Block Grids X Grid only 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. diff --git a/package-lock.json b/package-lock.json index 284531e48..d3494430c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5903,8 +5903,8 @@ } }, "foundation-docs": { - "version": "git+https://github.com/zurb/foundation-docs.git#9a50a61c04ae5325e0441d0b7adb880c42c9c2ff", - "from": "git+https://github.com/zurb/foundation-docs.git#9a50a61c04ae5325e0441d0b7adb880c42c9c2ff", + "version": "github:zurb/foundation-docs#96ea89b6289767ed5e285ae037489d5c8f253b39", + "from": "github:zurb/foundation-docs#96ea89b6289767ed5e285ae037489d5c8f253b39", "dev": true, "requires": { "cheerio": "^1.0.0-rc.2", @@ -11199,9 +11199,9 @@ } }, "marked": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/marked/-/marked-0.5.1.tgz", - "integrity": "sha512-iUkBZegCZou4AdwbKTwSW/lNDcz5OuRSl3qdcl31Ia0B2QPG0Jn+tKblh/9/eP9/6+4h27vpoh8wel/vQOV0vw==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.5.2.tgz", + "integrity": "sha512-fdZvBa7/vSQIZCi4uuwo2N3q+7jJURpMVCcbaX0S1Mg65WZ5ilXvC67MviJAsdjqqgD+CEq4RKo5AYGgINkVAA==", "dev": true }, "matchdep": { diff --git a/package.json b/package.json index 1ca6d4532..99b09fe85 100644 --- a/package.json +++ b/package.json @@ -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", -- 2.47.2