Merge branch 'master' into gh-pages

1 files changed, 6 insertions, 6 deletions

diff --git a/src/layout.less b/src/layout.less
index 769fd25..b101ca0 100644
--- a/src/layout.less
+++ b/src/layout.less
@@ -3,26 +3,26 @@
   width: 100%;
   margin-left: auto;
   margin-right: auto;
-  padding-left: 10px;
-  padding-right: 10px;
+  padding-left: 1rem;
+  padding-right: 1rem;
   &:extend(.clearfix all);
 }
 @media screen and (min-width: 961px) {
   .container {
     &.grid-960 {
-      width: 960px;
+      width: 96rem;
     }
   }
 }
 
 .columns {
-  margin-left: -10px;
-  margin-right: -10px;
+  margin-left: -1rem;
+  margin-right: -1rem;
   &:extend(.clearfix all);
 }
 .column {
   flex: 1;
-  padding: 10px;
+  padding: 1rem;
 }
 @media screen and (min-width: 769px) {
   .columns {