From 17b3aa5d598bbe2c68451c71d75b04766a91da44 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Thu, 19 Feb 2015 14:17:50 -0600 Subject: [PATCH] Add common folder, add grid component, remove home placeholder * New `common/` folder for `_variables` and `_global` * Move grid styles to new `_grid` component * Remove `layouts/pages/_home` --- assets/styles/{ => common}/_global.less | 0 assets/styles/{ => common}/_variables.less | 0 .../{layouts/_general.less => components/_grid.less} | 8 ++++---- assets/styles/layouts/_sidebar.less | 3 --- assets/styles/layouts/pages/_home.less | 0 assets/styles/main.less | 7 +++---- 6 files changed, 7 insertions(+), 11 deletions(-) rename assets/styles/{ => common}/_global.less (100%) rename assets/styles/{ => common}/_variables.less (100%) rename assets/styles/{layouts/_general.less => components/_grid.less} (66%) delete mode 100644 assets/styles/layouts/pages/_home.less diff --git a/assets/styles/_global.less b/assets/styles/common/_global.less similarity index 100% rename from assets/styles/_global.less rename to assets/styles/common/_global.less diff --git a/assets/styles/_variables.less b/assets/styles/common/_variables.less similarity index 100% rename from assets/styles/_variables.less rename to assets/styles/common/_variables.less diff --git a/assets/styles/layouts/_general.less b/assets/styles/components/_grid.less similarity index 66% rename from assets/styles/layouts/_general.less rename to assets/styles/components/_grid.less index c0d5dc4..dd01d79 100644 --- a/assets/styles/layouts/_general.less +++ b/assets/styles/components/_grid.less @@ -1,10 +1,10 @@ -// Content wrapper -.wrap { } - -// Main content area +// Grid system .main { .make-sm-column(@main-sm-columns); .sidebar-primary & { .make-sm-column(@main-sm-columns - @sidebar-sm-columns); } } +.sidebar { + .make-sm-column(@sidebar-sm-columns); +} diff --git a/assets/styles/layouts/_sidebar.less b/assets/styles/layouts/_sidebar.less index 0a735c9..e69de29 100644 --- a/assets/styles/layouts/_sidebar.less +++ b/assets/styles/layouts/_sidebar.less @@ -1,3 +0,0 @@ -.sidebar { - .make-sm-column(@sidebar-sm-columns); -} diff --git a/assets/styles/layouts/pages/_home.less b/assets/styles/layouts/pages/_home.less deleted file mode 100644 index e69de29..0000000 diff --git a/assets/styles/main.less b/assets/styles/main.less index 0c8fb22..8e592a6 100644 --- a/assets/styles/main.less +++ b/assets/styles/main.less @@ -2,16 +2,15 @@ @import "../../bower_components/bootstrap/less/bootstrap.less"; // endbower -@import "_variables"; -@import "_global"; +@import "common/_variables"; +@import "common/_global"; @import "components/_buttons"; @import "components/_comments"; @import "components/_forms"; +@import "components/_grid"; @import "components/_wp-classes"; -@import "layouts/_general"; @import "layouts/_header"; @import "layouts/_sidebar"; @import "layouts/_footer"; @import "layouts/_pages"; -@import "layouts/pages/_home"; @import "layouts/_posts";