diff --git a/CHANGELOG.md b/CHANGELOG.md index ac2d47c..79b1e7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### 9.0.0-beta.2: January 11th, 2016 +* Remove grid defaults ([#1808](https://github.com/roots/sage/pull/1808)) * Fix for `publicPath` ([#1806](https://github.com/roots/sage/pull/1806)) * Update clean task name ([#1800](https://github.com/roots/sage/pull/1800)) * Allow browser versions to be configured in `config.json` ([#1798](https://github.com/roots/sage/pull/1798)) diff --git a/assets/styles/common/_variables.scss b/assets/styles/common/_variables.scss index 5d6c21d..11facd2 100644 --- a/assets/styles/common/_variables.scss +++ b/assets/styles/common/_variables.scss @@ -1,9 +1,5 @@ // Colors $brand-primary: #27ae60; -// Grid settings -$main-sm-columns: 12; -$sidebar-sm-columns: 4; - // Vendor variables $fa-font-path: '~font-awesome/fonts'; diff --git a/assets/styles/components/_grid.scss b/assets/styles/components/_grid.scss deleted file mode 100644 index 9831582..0000000 --- a/assets/styles/components/_grid.scss +++ /dev/null @@ -1,16 +0,0 @@ -// Grid system -.main { - @include make-col-ready(); - @include media-breakpoint-up(sm) { - @include make-col($main-sm-columns); - .sidebar-primary & { - @include make-col($main-sm-columns - $sidebar-sm-columns); - } - } -} -.sidebar { - @include make-col-ready(); - @include media-breakpoint-up(sm) { - @include make-col($sidebar-sm-columns); - } -} diff --git a/assets/styles/main.scss b/assets/styles/main.scss index d2e5cbc..8a09844 100644 --- a/assets/styles/main.scss +++ b/assets/styles/main.scss @@ -8,7 +8,6 @@ @import "components/buttons"; @import "components/comments"; @import "components/forms"; -@import "components/grid"; @import "components/wp-classes"; @import "layouts/header"; @import "layouts/sidebar"; diff --git a/templates/layouts/base.blade.php b/templates/layouts/base.blade.php index ae76e95..12ab253 100644 --- a/templates/layouts/base.blade.php +++ b/templates/layouts/base.blade.php @@ -5,7 +5,7 @@ @php(do_action('get_header')) @include('partials.header')