* { Box-sizing: Border-box } FTW

3 files changed, 13 insertions, 3 deletions

diff --git a/scss/_reset.scss b/scss/_reset.scss
index dce28d6..fcf2bf0 100644
--- a/scss/_reset.scss
+++ b/scss/_reset.scss
@@ -23,7 +23,7 @@ time, mark, audio, video {
 	font: inherit;
 	vertical-align: baseline;
 }
-/* HTML5 display-role reset for older browsers */
+// HTML5 display-role reset for older browsers
 article, aside, details, figcaption, figure, 
 footer, header, hgroup, menu, nav, section {
 	display: block;
@@ -46,3 +46,8 @@ table {
 	border-collapse: collapse;
 	border-spacing: 0;
 }
+// Apply a natural box layout model to all elements
+// from: http://www.paulirish.com/2012/box-sizing-border-box-ftw/
+*, *:before, *:after {
+  -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
+}
diff --git a/scss/style.scss b/scss/style.scss
index 9bdbb47..7d51660 100755
--- a/scss/style.scss
+++ b/scss/style.scss
@@ -23,7 +23,7 @@ body {
 .container {
   margin: 0 auto;
   max-width: 740px;
-  //padding: 0 20px;
+  padding: 0 10px;
   width: 100%;
 }
 
diff --git a/style.css b/style.css
index 7123d0b..daa9f20 100644
--- a/style.css
+++ b/style.css
@@ -9,7 +9,6 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
   font: inherit;
   vertical-align: baseline; }
 
-/* HTML5 display-role reset for older browsers */
 article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
   display: block; }
 
@@ -30,6 +29,11 @@ table {
   border-collapse: collapse;
   border-spacing: 0; }
 
+*, *:before, *:after {
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box; }
+
 /*/
 /* BASE RULES
 /*/
@@ -44,6 +48,7 @@ body {
 .container {
   margin: 0 auto;
   max-width: 740px;
+  padding: 0 10px;
   width: 100%; }
 
 h1, h2, h3, h4, h5, h6 {