Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Beg-in/frow
Browse files Browse the repository at this point in the history
  • Loading branch information
codysherman committed Nov 15, 2017
2 parents 1ef928e + 747cf54 commit 9130072
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions docs/responsive-design.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ <h4>
Frow Container
</h4>
<p>
A .frow-container wraps the main content of the page and prevents it from expanding to 100% width, and adds in responsive design breakpoints at 768px, 992px and 1200px. In simplest terms, it just stops page from stetching too wide on large displays. <strong>It is optional, but encouraged.</strong>
A .frow-container wraps the main content of the page and prevents it from expanding to 100% width, and adds in responsive design breakpoints at 768px, 992px and 1200px. In simplest terms, it just stops page from stretching too wide on large displays. <strong>It is optional, but encouraged.</strong>
</p>
<div class="fake-code">
&lt;html&gt;<br>
Expand All @@ -116,10 +116,10 @@ <h4>
Frow uses four sizes as breakpoints on the grid. Each one is designed to cover a type of device, but there are crossovers.
</p>
<ul class="responsive-list bottom-margin">
<li>XS&nbsp;-&nbsp;(&nbsp;Screens&nbsp;&nbsp;0px - 767px&nbsp;&nbsp;wide&nbsp;)&nbsp;-&nbsp;Generally Phones / Small Tablets</li>
<li>SM&nbsp;-&nbsp;(&nbsp;Screens&nbsp;&nbsp;768px - 991px&nbsp;&nbsp;wide&nbsp;)&nbsp;-&nbsp;Generally Tablets</li>
<li>MD&nbsp;-&nbsp;(&nbsp;Screens&nbsp;&nbsp;992px - 1199px&nbsp;wide&nbsp;)&nbsp;-&nbsp;Generally Computers / Landscape Tablets</li>
<li>LG&nbsp;-&nbsp;(&nbsp;Screens&nbsp;1200px+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;wide&nbsp;)&nbsp;-&nbsp;Generally Widescreen Computers</li>
<li>XS&nbsp;-&nbsp;(&nbsp;Screens&nbsp;&nbsp;&nbsp;&nbsp;0px&nbsp;-&nbsp;767px&nbsp;&nbsp;wide&nbsp;)&nbsp;-&nbsp;Generally Phones / Small Tablets</li>
<li>SM&nbsp;-&nbsp;(&nbsp;Screens&nbsp;&nbsp;768px&nbsp;-&nbsp;991px&nbsp;&nbsp;wide&nbsp;)&nbsp;-&nbsp;Generally Tablets</li>
<li>MD&nbsp;-&nbsp;(&nbsp;Screens&nbsp;&nbsp;992px&nbsp;-&nbsp;1199px&nbsp;wide&nbsp;)&nbsp;-&nbsp;Generally Computers / Landscape Tablets</li>
<li>LG&nbsp;-&nbsp;(&nbsp;Screens&nbsp;1200px+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;wide&nbsp;)&nbsp;-&nbsp;Generally Widescreen Computers</li>
</ul>
<h4>
Mobile Column Stacking
Expand Down Expand Up @@ -542,4 +542,4 @@ <h4>
</p>
</div>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "frow",
"version": "3.0.0",
"version": "2.1.0",
"description": "Flex Row CSS Grid System http://frowcss.com",
"main": "sass/_frow.scss",
"scripts": {
Expand Down

0 comments on commit 9130072

Please sign in to comment.