Skip to content

Commit 9b23f26

Browse files
author
mrmrs
committed
Merge branch 'master' of github.com:tachyons-css/tachyons-css.github.io
2 parents 69a36fb + c50370b commit 9b23f26

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

css/tachyons.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1990,7 +1990,7 @@ code, .code { font-family: Consolas, monaco, monospace; }
19901990
.nested-headline-line-height h5, .nested-headline-line-height h6 { line-height: 1.25; }
19911991
.nested-list-reset ul, .nested-list-reset ol { padding-left: 0; margin-left: 0; list-style-type: none; }
19921992
.nested-copy-indent p+p { text-indent: 1em; margin-top: 0; margin-bottom: 0; }
1993-
.nested-copy-seperator p+p { margin-top: 1.5em; }
1993+
.nested-copy-separator p+p { margin-top: 1.5em; }
19941994
.nested-img img { width: 100%; max-width: 100%; display: block; }
19951995
.nested-links a { color: #357edd; transition: color .15s ease-in; }
19961996
.nested-links a:hover { color: #96ccff; transition: color .15s ease-in; }

css/tachyons.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/table-of-properties/index.html

+1-1
Large diffs are not rendered by default.

docs/table-of-styles/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ <h3 class="ttu tracked f4">Table of Styles</h3>
289289
.nested-headline-line-height h4,
290290
.nested-headline-line-height h5,
291291
.nested-headline-line-height h6</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">line-height:1.25</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-nested" title="nested">nested</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.nested-list-reset ul,
292-
.nested-list-reset ol</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">padding-left:0<br>margin-left:0<br>list-style-type:none</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-nested" title="nested">nested</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.nested-copy-indent p+p</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">text-indent:1em<br>margin-top:0<br>margin-bottom:0</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-nested" title="nested">nested</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.nested-copy-seperator p+p</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">margin-top:1.5em</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-nested" title="nested">nested</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.nested-img img</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">width:100%<br>max-width:100%<br>display:block</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-nested" title="nested">nested</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.nested-links a</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">color:var(--blue)<br>transition:color .15s ease-in</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-nested" title="nested">nested</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.nested-links a:hover,
292+
.nested-list-reset ol</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">padding-left:0<br>margin-left:0<br>list-style-type:none</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-nested" title="nested">nested</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.nested-copy-indent p+p</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">text-indent:1em<br>margin-top:0<br>margin-bottom:0</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-nested" title="nested">nested</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.nested-copy-separator p+p</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">margin-top:1.5em</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-nested" title="nested">nested</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.nested-img img</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">width:100%<br>max-width:100%<br>display:block</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-nested" title="nested">nested</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.nested-links a</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">color:var(--blue)<br>transition:color .15s ease-in</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-nested" title="nested">nested</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.nested-links a:hover,
293293
.nested-links a:focus</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">color:var(--light-blue)<br>transition:color .15s ease-in</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-nested" title="nested">nested</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.debug *</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">outline:1px solid gold</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-debug-children" title="debug-children">debug-children</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.debug-white *</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">outline:1px solid white</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-debug-children" title="debug-children">debug-children</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.debug-black *</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">outline:1px solid black</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-debug-children" title="debug-children">debug-children</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.debug-grid</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">background:transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAYAAADED76LAAAAFElEQVR4AWPAC97/9x0eCsAEPgwAVLshdpENIxcAAAAASUVORK5CYII=) repeat top left</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-debug-grid" title="debug-grid">debug-grid</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.debug-grid-16</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">background:transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAMklEQVR4AWOgCLz/b0epAa6UGuBOqQHOQHLUgFEDnAbcBZ4UGwDOkiCnkIhdgNgNxAYAiYlD+8sEuo8AAAAASUVORK5CYII=) repeat top left</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-debug-grid" title="debug-grid">debug-grid</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.debug-grid-8-solid</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">background:white url(data:image/gif;base64,R0lGODdhCAAIAPEAAADw/wDx/////wAAACwAAAAACAAIAAACDZQvgaeb/lxbAIKA8y0AOw==) repeat top left</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-debug-grid" title="debug-grid">debug-grid</a></td></tr><tr><td class="bb b--black-05 pv3"><pre class="f6 f5-l">.debug-grid-16-solid</pre></td><td class="bb b--black-05 pv3 mw6"><pre class="f6 f5-l" style="white-space:pre-wrap; word-wrap:break-word;">background:white url(data:image/gif;base64,R0lGODdhEAAQAPEAAADw/wDx/xXy/////ywAAAAAEAAQAAACIZyPKckYDQFsb6ZqD85jZ2+BkwiRFKehhqQCQgDHcgwEBQA7) repeat top left</pre></td><td class="bb b--black-05 pv2"><a class="link blue dim f6 f5-l" href="https://github.com/tachyons-css/tachyons-debug-grid" title="debug-grid">debug-grid</a></td></tr>
294294
</tbody>
295295
</table>

docs/typography/font-family/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ <h4 class="f4 mv0 fw6 dib mr4">tachyons-font-family</h4>
239239
<dd class="db pl0 ml0 f4 f2-ns b">1</dd>
240240
</dl>
241241
</div>
242-
<kbd>src/_font-families.css</kbd>
242+
<kbd>src/_font-family.css</kbd>
243243
</header>
244244
<pre class="ph3 ph5-ns">
245245
<code class="code" style="font-size: .75rem;">

src/css/_nested.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
margin-bottom: 0;
3535
}
3636

37-
.nested-copy-seperator p+p {
37+
.nested-copy-separator p+p {
3838
margin-top: 1.5em;
3939
}
4040

src/templates/docs/font-family/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ <h4 class="f4 mv0 fw6 dib mr4"><%= name %></h4>
187187
<dd class="db pl0 ml0 f4 f2-ns b"><%= moduleObj.rules.size.average %></dd>
188188
</dl>
189189
</div>
190-
<kbd>src/_font-families.css</kbd>
190+
<kbd>src/_font-family.css</kbd>
191191
</header>
192192
<pre class="ph3 ph5-ns">
193193
<code class="code" style="font-size: .75rem;">

0 commit comments

Comments
 (0)