Improve sass structure

robbinjohansson · Jun 18, 2017 · b544bd9 · b544bd9
1 parent 62813b5
commit b544bd9
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v0.2.5
+## 06/18/2017
+
+1. [](#improved)
+    * Improve sass structure
+
 # v0.2.4
 ## 06/07/2017
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,14 +1,14 @@
 name: Haywire
-version: 0.2.4
-description: Starter theme/boilerplate for developers to get up and running quickly on new projects using modern frameworks and tools such as laravel-mix, vuejs & bootstrap-sass.
+version: 0.2.5
+description: Starter theme/boilerplate for developers to get up and running quickly on new Grav projects using modern frameworks and tools such as laravel-mix, vuejs & bootstrap-sass.
 icon: empire
 author:
   name: Robbin Johansson
   email: [email protected]
   url: https://haywire.me
 homepage: https://github.com/robbinfellow/haywire-grav
 demo: https://grav.haywire.me/
-keywords: haywire, boilerplate, starter-theme, vuejs, vue, laravel-mix, bootstrap-sass
+keywords: haywire, boilerplate, starter-theme, vuejs, laravel-mix, bootstrap-sass
 bugs: https://github.com/robbinfellow/haywire-grav/issues
 docs: https://github.com/robbinfellow/haywire-grav/blob/master/README.md
 license: MIT

diff --git a/dist/css/app.css b/dist/css/app.css
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "haywire",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "repository": "https://github.com/robbinfellow/haywire-grav.git",
   "author": "Robbin Johansson <[email protected]>",
   "scripts": {

diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -0,0 +1,10 @@
+/**
+* Use this file to override bootstrap variables
+*/
+
+// Base
+$body-bg: #fff;
+
+// Typography
+$font-size-base: 16px;
+$line-height-base: 1.8;
diff --git a/scss/app.scss b/scss/app.scss
@@ -1,19 +1,13 @@
-// BOOTSTRAP COMPONENTS
+@import "variables";
 
+// Import npm dependencies
 @import "../node_modules/bootstrap-sass/assets/stylesheets/bootstrap";
 
-//-------------------------------------------
-
-// TEMPLATE COMPONENTS
-
 // Global helper classes
-@import "template/global";
+@import "common/global";
+@import "common/utilities";
 
 // Header
-@import "template/header";
-
-// Footer
-@import "template/footer";
-
-// Custom style
-@import "template/custom";
+@import "partials/header";
+@import "partials/footer";
+@import "partials/posts";
diff --git a/scss/template/_header.scss → scss/common/_global.scss b/scss/template/_header.scss → scss/common/_global.scss
diff --git a/scss/template/_global.scss → scss/common/_utilities.scss b/scss/template/_global.scss → scss/common/_utilities.scss
diff --git a/scss/template/_footer.scss → scss/partials/_footer.scss b/scss/template/_footer.scss → scss/partials/_footer.scss
diff --git a/scss/partials/_header.scss b/scss/partials/_header.scss
diff --git a/scss/partials/_posts.scss b/scss/partials/_posts.scss
@@ -0,0 +1,26 @@
+.posts {
+    margin-top: 20px;
+
+    .post {
+        margin-bottom: 40px;
+        padding-bottom: 40px;
+        border-bottom: solid 1px #eeeeee;
+        h3 {
+            a {
+                color: #000;
+
+                &:hover {
+                color: #23527c;
+                }
+            }
+        }
+
+        .summary {
+            color: #76787d;
+        }
+
+        .post-content {
+            padding-right: 40px;
+        }
+    }
+}
diff --git a/scss/template/_custom.scss b/scss/template/_custom.scss