code cleanup

4 files changed, 14 insertions, 16 deletions

diff --git a/src/base.less b/src/base.less
index 256930f..78da9f9 100644
--- a/src/base.less
+++ b/src/base.less
@@ -6,8 +6,8 @@
 }
 html {
   box-sizing: border-box;
-  font-size: 10px;
-  line-height: 1.428571429;
+  font-size: @html-font-size;
+  line-height: @html-line-height;
   -webkit-tap-highlight-color: transparent;
 }
 body {
diff --git a/src/forms.less b/src/forms.less
index 5527b52..a26fda8 100644
--- a/src/forms.less
+++ b/src/forms.less
@@ -236,7 +236,7 @@
   display: flex;
 
   .input-group-addon {
-    background: @core-border-color;
+    background: lighten(@core-border-color, 4%);
     border: .1rem solid @control-color;
     border-radius: .3rem;
     line-height: 1.6rem;
diff --git a/src/layout.less b/src/layout.less
index 6a9a643..dbc48c9 100644
--- a/src/layout.less
+++ b/src/layout.less
@@ -8,18 +8,15 @@
   width: 100%;
   &:extend(.clearfix all);
 }
-@media screen and (min-width: 981px) {
+// Grid sizes
+@media screen and (min-width: (960px + 2 * @html-font-size * @layout-gutter)) {
   .grid-960 {
-    margin-left: auto;
-    margin-right: auto;
-    width: 96rem;
+    width: 96rem + 2 * @layout-gutter;
   }
 }
-@media screen and (min-width: 481px) {
+@media screen and (min-width: (480px + 2 * @html-font-size * @layout-gutter)) {
   .grid-480 {
-    margin-left: auto;
-    margin-right: auto;
-    width: 48rem;
+    width: 48rem + 2 * @layout-gutter;
   }
 }
 
@@ -84,7 +81,7 @@
 .col-1 {
   width: 8.33333333%;
 }
-@media screen and (min-width: (@size-xs+1px)) {
+@media screen and (min-width: (@size-xs + 1px)) {
   .col-xs-12,
   .col-xs-11,
   .col-xs-10,
@@ -136,7 +133,7 @@
     width: 8.33333333%;
   }
 }
-@media screen and (min-width: (@size-sm+1px)) {
+@media screen and (min-width: (@size-sm + 1px)) {
   .col-sm-12,
   .col-sm-11,
   .col-sm-10,
@@ -188,7 +185,7 @@
     width: 8.33333333%;
   }
 }
-@media screen and (min-width: (@size-md+1px)) {
+@media screen and (min-width: (@size-md + 1px)) {
   .col-md-12,
   .col-md-11,
   .col-md-10,
@@ -240,7 +237,7 @@
     width: 8.33333333%;
   }
 }
-@media screen and (min-width: (@size-md+1px)) {
+@media screen and (min-width: (@size-md + 1px)) {
   .form-horizontal {
     padding: 1rem;
 
diff --git a/src/variables.less b/src/variables.less
index 0b32da0..bdf9ae4 100644
--- a/src/variables.less
+++ b/src/variables.less
@@ -1,6 +1,7 @@
 // Core variables
-
 // Global
+@html-font-size: 10px;
+@html-line-height: 1.428571429;
 @body-bg: #fff;
 @body-font-color: #333;
 @body-font-size: 1.4rem;