Skip to content

Commit 75fe060

Browse files
committed
Fix content
1 parent 09487d4 commit 75fe060

139 files changed

Lines changed: 305 additions & 188 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

_includes/collections/animations.html

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

_includes/collections/box-model.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

_includes/collections/flexbox.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

_includes/collections/positioning.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

_includes/collections/transitions.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

_includes/collections/typography.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

_includes/lists/main-list.html

Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.

_includes/lists/menu-list.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

css/website.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

property/align-content/index.html

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<section id="align-content" class="property">
77
<header class="property-header">
88
<nav class="property-links">
9-
<a class="property-links-direct" href="{{site.url}}/property/align-content/" data-property-name="align-content" data-tooltip="Single page for this property" target="_blank">Link</a>
9+
<a class="property-links-direct" href="{{site.url}}/property/align-content/" data-property-name="align-content" data-tooltip="Single page for this property" target="_blank">Pop out</a>
1010
<a class="property-share" data-tooltip="Share on Twitter or Facebook" data-property-name="align-content">Share</a>
1111
<a target="_blank" href="https://developer.mozilla.org/en/docs/Web/CSS/align-content" data-tooltip="See on Mozilla Developer Network" rel="external">MDN</a>
1212
</nav>
@@ -37,6 +37,16 @@ <h2 class="property-name">
3737
<div class="example-description">
3838
<p>Each line will stretch to <em>fill</em> the remaining space.</p>
3939
<p>In this case, the container is <code>300px</code> high. All boxes are <code>50px</code> high, apart from the second one who is <code>100px</code> high.</p>
40+
<ul>
41+
<li>The first line is <strong>100px</strong> high</li>
42+
<li>The second line is <strong>50px</strong> high</li>
43+
<li>The remaing space is <strong>150px</strong></li>
44+
</ul>
45+
<p>This remaining space is distributed equally amongst the two lines:</p>
46+
<ul>
47+
<li>The first line is now <strong>175px</strong> high</li>
48+
<li>The second line is now <strong>125px</strong> high</li>
49+
</ul>
4050

4151
</div>
4252
</header>
@@ -48,6 +58,7 @@ <h2 class="property-name">
4858
</div>
4959
</aside>
5060
<style type="text/css">#align-content-stretch{ align-content:stretch;}</style>
61+
<style type="text/css">#align-content-stretch .box--red { height: 175px; }#align-content-stretch .box--green { height: 125px;top: 175px; }</style>
5162
</section>
5263
<section class="example">
5364
<header class="example-header">

0 commit comments

Comments
 (0)