Merge pull request #99 from kybishop/use-width-for-column-sizes-inste…

…ad-of-max-width fix(css) use width instead of max-width for column sizes
html-next · Dec 28, 2016 · 2e6a065 · 2e6a065
2 parents 2e4e94b + 9ebd008
commit 2e6a065
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/addon/styles/grid/_mixins.scss b/addon/styles/grid/_mixins.scss
@@ -4,7 +4,7 @@
   padding-right: pixel($gutter-padding / 2);
   padding-left:  pixel($gutter-padding / 2);
   @include flex(1 0 percentage($size / $columns));
-  max-width: percentage($size / $columns);
+  width: percentage($size / $columns);
 }
 
 

diff --git a/tests/dummy/app/routes/tests/sustain-b/route.js b/tests/dummy/app/routes/tests/sustain-b/route.js
@@ -2,6 +2,6 @@ import Ember from 'ember';
 
 export default Ember.Route.extend({
   model() {
-    return { foo: 456, bar: { foo: 'xyz' }};
+    return { foo: 456, bar: { foo: 'xyz' } };
   }
 });
diff --git a/tests/dummy/app/routes/tests/sustain/route.js b/tests/dummy/app/routes/tests/sustain/route.js
@@ -2,6 +2,6 @@ import Ember from 'ember';
 
 export default Ember.Route.extend({
   model() {
-    return { foo: 123, bar: { foo: 'abc' }};
+    return { foo: 123, bar: { foo: 'abc' } };
   }
 });