diff --git a/Gemfile.lock b/Gemfile.lock index 5ec0b89bf2..0ef2a79d5d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - zurb-foundation (3.0.7.rc3) + zurb-foundation (3.0.7.rc4) compass (>= 0.12.2) rake sass (>= 3.2.0.alpha.244) diff --git a/lib/foundation/version.rb b/lib/foundation/version.rb index a76b3562c3..f3d26d2bde 100644 --- a/lib/foundation/version.rb +++ b/lib/foundation/version.rb @@ -1,3 +1,3 @@ module Foundation - VERSION = "3.0.7.rc4" + VERSION = "3.0.7.rc5" end diff --git a/templates/project/sass/app.scss b/templates/project/sass/app.scss index 9a892c019c..0b50d4e319 100644 --- a/templates/project/sass/app.scss +++ b/templates/project/sass/app.scss @@ -19,22 +19,25 @@ // Control which mixins you have access too -// @import "foundation/mixins/respond-to"; // @import "foundation/mixins/css-triangle"; // @import "foundation/mixins/font-size"; + +// Must include next three for semantic grid to work + +// @import "foundation/mixins/respond-to"; // @import "foundation/mixins/clearfix"; // @import "foundation/mixins/semantic-grid"; +// Must include the grid for any responsiveness + +// @import "foundation/components/grid"; + // Control which common styles get compiled // @import "foundation/common/globals"; // @import "foundation/common/typography"; // @import "foundation/common/forms"; -// Must include the grid for any responsiveness - -// @import "foundation/components/grid"; - // Control which components you get if customizing // @import "foundation/components/modules/buttons";