Skip to content

Commit

Permalink
Merge pull request #8 from bjankord/box-sizing-cleanup
Browse files Browse the repository at this point in the history
Clean up box-sizing code and bump version
  • Loading branch information
bjankord committed Feb 25, 2014
2 parents c9e8563 + 18f6494 commit 80d2d56
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2.4.0 / 2014-02-24
==================

* Update Style Guide Boilerplate to use box-sizing border-box globally

2.3.0 / 2013-08-24
==================

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Style-Guide-Boilerplate v2.3.0
Style-Guide-Boilerplate v2.4.0
==============================

A starting point for crafting living style guides.
Expand Down
8 changes: 5 additions & 3 deletions css/sg-style.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@
/* -------------------------------------------------------------------------
Layout
---------------------------------------------------------------------------- */
* {
-moz-box-sizing: border-box;
box-sizing: border-box;
/* http:/paulirish.com/2012/box-sizing-border-box-ftw/ */
*, *:before, *:after {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}

body {margin: 0;}
Expand Down

0 comments on commit 80d2d56

Please sign in to comment.