Skip to content

Commit

Permalink
Added p, small, ol. Also code spacing
Browse files Browse the repository at this point in the history
  • Loading branch information
bencoveney committed Dec 5, 2016
1 parent faa22a9 commit 1ae8244
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 16 deletions.
2 changes: 1 addition & 1 deletion dist/Milligrid.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/MilligridExtended.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/MilligridExtended.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 19 additions & 8 deletions src/_Text.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,21 @@ h6 {
margin-top: 1.3rem;
}

// Text element styling
p {
margin-bottom: 2.4rem;
}

small {
color: $foreground-color-lightened;
font-size: .75em;
}

// List styling
ul {
margin-bottom: 1.2rem;
ul,
ol {
margin-bottom: 2.4rem;
margin-left: $gutter-width * 3;
margin-top: 1.2rem;
}

// Code styling, both inline and multi-line
Expand All @@ -102,24 +112,25 @@ code {
@include code-font;

border-radius: .3rem;
font-size: 1.3rem;
padding: 0 .2rem;
font-size: .9em;
padding: 0 .3em;
}

pre {
@include code-font;

border-radius: 1rem;
display: block;
margin-left: -$gutter-width;
margin-right: -$gutter-width;
//margin-left: -$gutter-width;
//margin-right: -$gutter-width;

code {
@include code-font;

border-radius: 1rem;
display: block;
font-size: 1.5rem;
padding: 2.4rem;
padding: 1.2rem;
margin: 0 1.2rem 0 1.2rem;
}
}
11 changes: 6 additions & 5 deletions test/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,17 @@ <h1 class="title"><a name="top"></a>Milligrid.</h1>
<div class="container">
<div class="row">
<div class="column">
<h2>About the Grid</h2>
<h2>About <small>the Grid</small></h2>
<p>Milligrid is a responsive CSS grid system which uses flexbox as a basis for its layout. It is based on the excellent grid built into <a href="https://milligram.github.io">Milligram</a>, which was in turn based on work by <a href="http://philipwalton.github.io/solved-by-flexbox/demos/grids/">Philip Walton</a>. Milligrid aims to take the brilliant Milligram grid and provide it in a standalone package with enhanced configuration options in the form of Sass variables.</p>
</div>
</div>
<div class="row">
<div class="column">
<h2>Get Milligrid</h2>
<ul>
<ol>
<li><a href="https://github.com/bencoveney/Milligrid/releases">Download</a></li>
<li>Install with bower: <code>bower install milligrid</code></li>
</ul>
</ol>
<h2>Find out more</h2>
<p>Check out Milligrid on <a href="https://github.com/bencoveney/Milligrid">GitHub</a>.</p>
</div>
Expand Down Expand Up @@ -212,7 +212,7 @@ <h1><a name="nesting"></a>Nested Grids</h1>
</div>
</div>
</div>
<h1><a name="limits"></a>Row Item Limits</h1>
<h1><a name="limits"></a><code>.row</code> Item Limits</h1>
<div class="row">
<div class="column">
<p>A limit can be applied to the number of items that are placed on a row by using the <code>.row-#</code> classes, for example <code>.row-3</code> to limit the number of items is 3 items. Numbers which are factors of 12 will look the best (assuming the default configuration is used).</p>
Expand Down Expand Up @@ -401,7 +401,8 @@ <h3>Column Mixins</h3>
<h1><a name="extended"></a>Milligrid Extended</h1>
<div class="row">
<div class="column">
<p>The Milligrid system also includes an extended variant which goes beyond the grid system to provide base styling for other HTML elements. The system's primary aim is to establish a <em>vertical rhythm</em> to the document. The extended styles are incomplete and undocumented, however you can see them in use on this page.</p>
<p>The Milligrid system also includes an extended variant which goes beyond the grid system to provide base styling for other HTML elements.</p>
<p>The system's primary aim is to establish a <em>vertical rhythm</em> to the document. The extended styles are incomplete and undocumented, however you can see them in use on this page.</p>
</div>
<div class="column">
<p>To use Milligrid Extended on your site you must include the following google web-fonts:</p>
Expand Down

1 comment on commit 1ae8244

@bencoveney
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Resolves #2

Please sign in to comment.