From fc5a1547ba8e0d934e418d917aa2d7cee355df42 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Thu, 19 Feb 2015 13:44:22 -0600 Subject: [PATCH 1/5] Remove comments --- assets/styles/main.less | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/assets/styles/main.less b/assets/styles/main.less index 08ec483..6087756 100644 --- a/assets/styles/main.less +++ b/assets/styles/main.less @@ -2,17 +2,17 @@ @import "../../bower_components/bootstrap/less/bootstrap.less"; // endbower -@import "_variables"; // Variable overrides and custom variables -@import "_global"; // Base styling & custom mixins -@import "components/_buttons"; // Button tweaks -@import "components/_comments"; // Comment styling -@import "components/_forms"; // Form tweaks -@import "components/_media"; // WordPress media -@import "components/_wp-classes"; // WordPress generated classes -@import "layouts/_general"; // General styling -@import "layouts/_header"; // Header styling -@import "layouts/_sidebar"; // Sidebar styling -@import "layouts/_footer"; // Footer styling -@import "layouts/_pages"; // Page styling -@import "layouts/pages/_home"; // Home page styling -@import "layouts/_posts"; // Post styling +@import "_variables"; +@import "_global"; +@import "components/_buttons"; +@import "components/_comments"; +@import "components/_forms"; +@import "components/_media"; +@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"; From fc0509197145daab92a2cb8920c7581047197d68 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Thu, 19 Feb 2015 13:49:30 -0600 Subject: [PATCH 2/5] Gallery styling now unnecessary, move caption styling to _wp-classes --- assets/styles/components/_media.less | 13 ------------- assets/styles/components/_wp-classes.less | 18 +++++++++++++----- assets/styles/main.less | 1 - 3 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 assets/styles/components/_media.less diff --git a/assets/styles/components/_media.less b/assets/styles/components/_media.less deleted file mode 100644 index 4918f7b..0000000 --- a/assets/styles/components/_media.less +++ /dev/null @@ -1,13 +0,0 @@ -// Captions -.wp-caption { - &:extend(.thumbnail all); -} - -.wp-caption-text { - &:extend(.thumbnail .caption all); -} - -// Gallery shortcode -.gallery-row { - padding: (@line-height-computed / 2) 0; -} diff --git a/assets/styles/components/_wp-classes.less b/assets/styles/components/_wp-classes.less index d800dfc..1e8953a 100644 --- a/assets/styles/components/_wp-classes.less +++ b/assets/styles/components/_wp-classes.less @@ -1,6 +1,11 @@ // WordPress Generated Classes // http://codex.wordpress.org/CSS#WordPress_Generated_Classes +.alignnone { + margin-left: 0; + margin-right: 0; + max-width: 100%; +} .aligncenter { display: block; margin: (@line-height-computed / 2) auto; @@ -10,7 +15,7 @@ margin-bottom: (@line-height-computed / 2); } @media (min-width: @screen-sm-min) { - // Only float images if not on an extra small device like smartphones + // Only float if not on an extra small device .alignleft { float: left; margin-right: (@line-height-computed / 2); @@ -21,12 +26,15 @@ } } -figure.alignnone { - margin-left: 0; - margin-right: 0; - max-width: 100%; +// Captions +.wp-caption { + &:extend(.thumbnail all); +} +.wp-caption-text { + &:extend(.thumbnail .caption all); } +// Text meant only for screen readers .screen-reader-text { &:extend(.sr-only all); &:extend(.sr-only-focusable all); diff --git a/assets/styles/main.less b/assets/styles/main.less index 6087756..0c8fb22 100644 --- a/assets/styles/main.less +++ b/assets/styles/main.less @@ -7,7 +7,6 @@ @import "components/_buttons"; @import "components/_comments"; @import "components/_forms"; -@import "components/_media"; @import "components/_wp-classes"; @import "layouts/_general"; @import "layouts/_header"; From 17b3aa5d598bbe2c68451c71d75b04766a91da44 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Thu, 19 Feb 2015 14:17:50 -0600 Subject: [PATCH 3/5] 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"; From 7c118f856506e8fbc77b2b611032ff95375f02bc Mon Sep 17 00:00:00 2001 From: Ben Word Date: Thu, 19 Feb 2015 19:44:53 -0600 Subject: [PATCH 4/5] :scissors: --- assets/styles/common/_variables.less | 13 +------------ assets/styles/components/_wp-classes.less | 1 + assets/styles/editor-style.less | 2 +- assets/styles/layouts/_footer.less | 1 - assets/styles/layouts/_header.less | 1 - assets/styles/layouts/_posts.less | 5 ----- 6 files changed, 3 insertions(+), 20 deletions(-) diff --git a/assets/styles/common/_variables.less b/assets/styles/common/_variables.less index b46f50e..eb26cc9 100644 --- a/assets/styles/common/_variables.less +++ b/assets/styles/common/_variables.less @@ -1,17 +1,6 @@ // Grid settings -// ------------------------- - @main-sm-columns: @grid-columns; @sidebar-sm-columns: 4; - -// Brand colors -// ------------------------- - +// Colors @brand-primary: #27ae60; - - -// Glyphicons path -// ------------------------- - -@icon-font-path: "../fonts/"; diff --git a/assets/styles/components/_wp-classes.less b/assets/styles/components/_wp-classes.less index 1e8953a..83e69cd 100644 --- a/assets/styles/components/_wp-classes.less +++ b/assets/styles/components/_wp-classes.less @@ -1,6 +1,7 @@ // WordPress Generated Classes // http://codex.wordpress.org/CSS#WordPress_Generated_Classes +// Media alignment .alignnone { margin-left: 0; margin-right: 0; diff --git a/assets/styles/editor-style.less b/assets/styles/editor-style.less index 56abf72..b318c99 100644 --- a/assets/styles/editor-style.less +++ b/assets/styles/editor-style.less @@ -1,4 +1,4 @@ -@import "main.less"; +@import "main"; body { margin: 12px !important; diff --git a/assets/styles/layouts/_footer.less b/assets/styles/layouts/_footer.less index 940462d..e69de29 100644 --- a/assets/styles/layouts/_footer.less +++ b/assets/styles/layouts/_footer.less @@ -1 +0,0 @@ -.content-info { } diff --git a/assets/styles/layouts/_header.less b/assets/styles/layouts/_header.less index a6d3106..e69de29 100644 --- a/assets/styles/layouts/_header.less +++ b/assets/styles/layouts/_header.less @@ -1 +0,0 @@ -.banner { } diff --git a/assets/styles/layouts/_posts.less b/assets/styles/layouts/_posts.less index 62309b5..e69de29 100644 --- a/assets/styles/layouts/_posts.less +++ b/assets/styles/layouts/_posts.less @@ -1,5 +0,0 @@ -.hentry header { } -.hentry time { } -.hentry .byline { } -.hentry .entry-content { } -.hentry footer { } From e902b7c56616d4dff0fe4b608d807b32a8ea5833 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Thu, 19 Feb 2015 19:52:14 -0600 Subject: [PATCH 5/5] Update Sass instructions --- assets/styles/main.scss.example | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/styles/main.scss.example b/assets/styles/main.scss.example index 5a3a5d6..301b355 100644 --- a/assets/styles/main.scss.example +++ b/assets/styles/main.scss.example @@ -1,11 +1,11 @@ -// How to get started using Bootstrap Sass: +// How to get started using Sass instead of Less: // // 1. Run `bower install bootstrap-sass-official --save` // 2. Rename this file to `main.scss` and remove `main.less` -// 3. Update the `assets/manifest.json` styles dependenies to change `main.less` to `main.scss` +// 3. Rename `editor-style.less` to `editor-style.scss` +// 4. Update the `assets/manifest.json` styles dependenies from `.less` to `.scss` // -// Feel free to remove this file if you're using LESS - +// Feel free to remove this file if you're using Less // bower:sass @import "../../bower_components/bootstrap-sass-official/assets/stylesheets/_bootstrap.scss";