Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	docs/pages/15-change-log/index.html
#	src/pages/15-change-log/_content.pug
  • Loading branch information
@Dan503
Dan503 committed Jul 18, 2018
2 parents 70c65a7 + 3bfd1a9 commit b31084d
Show file tree
Hide file tree
Showing 36 changed files with 490 additions and 511 deletions.
2 changes: 1 addition & 1 deletion docs/assets/scripts/main.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/scripts/main.js.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/assets/styles/main.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/styles/main.css.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/assets/styles/noMQs-main.legacy.css
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h2 class="TK-visHid">Site header</h2>
<p class="logo title"><span class="logo__grid grid grid--noWrap grid--align-center grid--gutter-logo grid--outerGutters-v"><span class="grid__cell logo__cell -imagery grid__cell--noGrowth">
<svg class="svg-gutter-grid-logo logo__svg grid__cell">
<use xlink:href="#svg-gutter-grid-logo"></use>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v6.0.0</code></span></span></span></p>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v7.0.0</code></span></span></span></p>
<pre class="header__npm"><code>npm install gutter-grid --save</code></pre>
<div id="container">
<h3 class="TK-visHid">Tag line</h3>
Expand Down Expand Up @@ -177,14 +177,14 @@ <h3 id="the-solution">The solution</h3>
</div><p>Looks simple enough right? Just three columns and some margin around each cell. How hard can that be?</p>
<p>Well you would be surprised. The problem comes from the edges of each cell needing to be hard up against the edges of its container.</p>
<p>With Gutter Grid installed, this is all the code you need to write to generate the layout styles for that grid:</p>
<pre><code class="lang-scss">.grid__wrapper { overflow: hidden; }
<pre><code class="lang-scss">.grid__wrapper { padding-bottom: 0.1px; }
.grid {
// Display a 3 column grid with a 20px gutter
@include grid(3, 20px);
}
</code></pre>
<p>If you wanted more control over the grids breakpoints, the above grid would be the equivalent of writing this:</p>
<pre><code class="lang-scss">.grid__wrapper { overflow: hidden; }
<pre><code class="lang-scss">.grid__wrapper { padding-bottom: 0.1px; }
.grid {
// Display a 3 column grid with a 20px gutter by default
@include grid(3, 20px, (
Expand Down
6 changes: 3 additions & 3 deletions docs/pages/00-home/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h2 class="TK-visHid">Site header</h2>
<p class="logo title"><span class="logo__grid grid grid--noWrap grid--align-center grid--gutter-logo grid--outerGutters-v"><span class="grid__cell logo__cell -imagery grid__cell--noGrowth">
<svg class="svg-gutter-grid-logo logo__svg grid__cell">
<use xlink:href="#svg-gutter-grid-logo"></use>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v6.0.0</code></span></span></span></p>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v7.0.0</code></span></span></span></p>
<pre class="header__npm"><code>npm install gutter-grid --save</code></pre>
<div id="container">
<h3 class="TK-visHid">Tag line</h3>
Expand Down Expand Up @@ -177,14 +177,14 @@ <h3 id="the-solution">The solution</h3>
</div><p>Looks simple enough right? Just three columns and some margin around each cell. How hard can that be?</p>
<p>Well you would be surprised. The problem comes from the edges of each cell needing to be hard up against the edges of its container.</p>
<p>With Gutter Grid installed, this is all the code you need to write to generate the layout styles for that grid:</p>
<pre><code class="lang-scss">.grid__wrapper { overflow: hidden; }
<pre><code class="lang-scss">.grid__wrapper { padding-bottom: 0.1px; }
.grid {
// Display a 3 column grid with a 20px gutter
@include grid(3, 20px);
}
</code></pre>
<p>If you wanted more control over the grids breakpoints, the above grid would be the equivalent of writing this:</p>
<pre><code class="lang-scss">.grid__wrapper { overflow: hidden; }
<pre><code class="lang-scss">.grid__wrapper { padding-bottom: 0.1px; }
.grid {
// Display a 3 column grid with a 20px gutter by default
@include grid(3, 20px, (
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/01-installation/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h2 class="TK-visHid">Site header</h2>
<p class="logo title"><span class="logo__grid grid grid--noWrap grid--align-center grid--gutter-logo grid--outerGutters-v"><span class="grid__cell logo__cell -imagery grid__cell--noGrowth">
<svg class="svg-gutter-grid-logo logo__svg grid__cell">
<use xlink:href="#svg-gutter-grid-logo"></use>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v6.0.0</code></span></span></span></p>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v7.0.0</code></span></span></span></p>
<pre class="header__npm"><code>npm install gutter-grid --save</code></pre>
<div id="container">
<h3 class="TK-visHid">Tag line</h3>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/02-how-to-support-legacy-browsers/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h2 class="TK-visHid">Site header</h2>
<p class="logo title"><span class="logo__grid grid grid--noWrap grid--align-center grid--gutter-logo grid--outerGutters-v"><span class="grid__cell logo__cell -imagery grid__cell--noGrowth">
<svg class="svg-gutter-grid-logo logo__svg grid__cell">
<use xlink:href="#svg-gutter-grid-logo"></use>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v6.0.0</code></span></span></span></p>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v7.0.0</code></span></span></span></p>
<pre class="header__npm"><code>npm install gutter-grid --save</code></pre>
<div id="container">
<h3 class="TK-visHid">Tag line</h3>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/03-basic-usage/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h2 class="TK-visHid">Site header</h2>
<p class="logo title"><span class="logo__grid grid grid--noWrap grid--align-center grid--gutter-logo grid--outerGutters-v"><span class="grid__cell logo__cell -imagery grid__cell--noGrowth">
<svg class="svg-gutter-grid-logo logo__svg grid__cell">
<use xlink:href="#svg-gutter-grid-logo"></use>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v6.0.0</code></span></span></span></p>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v7.0.0</code></span></span></span></p>
<pre class="header__npm"><code>npm install gutter-grid --save</code></pre>
<div id="container">
<h3 class="TK-visHid">Tag line</h3>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/04-using-columns/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h2 class="TK-visHid">Site header</h2>
<p class="logo title"><span class="logo__grid grid grid--noWrap grid--align-center grid--gutter-logo grid--outerGutters-v"><span class="grid__cell logo__cell -imagery grid__cell--noGrowth">
<svg class="svg-gutter-grid-logo logo__svg grid__cell">
<use xlink:href="#svg-gutter-grid-logo"></use>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v6.0.0</code></span></span></span></p>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v7.0.0</code></span></span></span></p>
<pre class="header__npm"><code>npm install gutter-grid --save</code></pre>
<div id="container">
<h3 class="TK-visHid">Tag line</h3>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/05-control-wrapping/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h2 class="TK-visHid">Site header</h2>
<p class="logo title"><span class="logo__grid grid grid--noWrap grid--align-center grid--gutter-logo grid--outerGutters-v"><span class="grid__cell logo__cell -imagery grid__cell--noGrowth">
<svg class="svg-gutter-grid-logo logo__svg grid__cell">
<use xlink:href="#svg-gutter-grid-logo"></use>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v6.0.0</code></span></span></span></p>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v7.0.0</code></span></span></span></p>
<pre class="header__npm"><code>npm install gutter-grid --save</code></pre>
<div id="container">
<h3 class="TK-visHid">Tag line</h3>
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/06-cells-that-span-multiple-columns/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h2 class="TK-visHid">Site header</h2>
<p class="logo title"><span class="logo__grid grid grid--noWrap grid--align-center grid--gutter-logo grid--outerGutters-v"><span class="grid__cell logo__cell -imagery grid__cell--noGrowth">
<svg class="svg-gutter-grid-logo logo__svg grid__cell">
<use xlink:href="#svg-gutter-grid-logo"></use>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v6.0.0</code></span></span></span></p>
</svg><!--[if lt IE 9]><img class="logo__backup" src="/android-chrome-192x192.png"><![endif]--></span><span class="grid__cell logo__cell -text"><span class="logo__text -gutter">Gutter</span><span class="logo__text -grid">Grid <code class="small">v7.0.0</code></span></span></span></p>
<pre class="header__npm"><code>npm install gutter-grid --save</code></pre>
<div id="container">
<h3 class="TK-visHid">Tag line</h3>
Expand Down
Loading

0 comments on commit b31084d

Please sign in to comment.