From b1974bb0c5b2651dde4b0dd2dfac7448cfae17c7 Mon Sep 17 00:00:00 2001
From: Thomas Burleson <ThomasBurleson@Gmail.com>
Date: Thu, 1 Oct 2015 16:07:02 -0500
Subject: [PATCH] fix(layout): add border-box style to  to all `.flex` variants

*  also allow build of Layout css deprecated standalone usages.
---
 gulp/config.js                       | 2 +-
 src/core/services/layout/layout.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gulp/config.js b/gulp/config.js
index c4ade2b9993..dd0c2d72ee8 100644
--- a/gulp/config.js
+++ b/gulp/config.js
@@ -32,7 +32,7 @@ module.exports = {
     'src/core/services/layout/layout.scss'
   ],
   scssStandaloneFiles: [
-    'src/core/services/layout/standalone.scss'
+    'src/core/services/layout/layout.scss'
   ],
   scssTestFiles: [
     'src/core/services/layout/layout.scss'
diff --git a/src/core/services/layout/layout.scss b/src/core/services/layout/layout.scss
index 9b1d8298f5f..1f617881913 100644
--- a/src/core/services/layout/layout.scss
+++ b/src/core/services/layout/layout.scss
@@ -192,7 +192,7 @@
   @for $i from 0 through 20 {
     $value : #{$i * 5 + '%'};
 
-    .#{$flexName}-#{$i * 5}                              { flex: 0 0 #{$value}; }
+    .#{$flexName}-#{$i * 5}                              { box-sizing: border-box; flex: 0 0 #{$value}; }
 
     .md-layout-row > .#{$flexName}-#{$i * 5},
     .md-layout#{$name}-row > .#{$flexName}-#{$i * 5}     { flex: 0 0 #{$value};  max-width: #{$value};  max-height: 100%;  }