Merge pull request #1808 from roots/remove-grid-defaults

Remove grid defaults
This commit is contained in:
Ben Word
2017-01-13 11:34:28 -07:00
committed by GitHub
5 changed files with 2 additions and 22 deletions

View File

@@ -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))

View File

@@ -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';

View File

@@ -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);
}
}

View File

@@ -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";

View File

@@ -5,7 +5,7 @@
@php(do_action('get_header'))
@include('partials.header')
<div class="wrap container" role="document">
<div class="content row">
<div class="content">
<main class="main">
@yield('content')
</main>