jekyll-theme-charcoal 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8965ca5c83b22a9d32d141305dd489ba9a06808f
-  data.tar.gz: 53d48d44c867bfd18d57c4169954d4e1d7c4a704
+  metadata.gz: 454f31bc1fedb12781c32c49b4baefb8a64d5e87
+  data.tar.gz: c60343bbfafcfc7d7c4a4ca81c4008ed20371afb
 SHA512:
-  metadata.gz: 56e4160304f965a685d392ce69fa7c39eff795d370e084acaf463a46900e0beaed0acb9398788a4be40228309cf03be751a3cfc625ab7697389b5d450f5d2e46
-  data.tar.gz: 8d799f0d1818fa3e6e9640952914c6dfc0d60badadce2f3c41b67ec33e749880700a0c79cd74b5bc9126afb7f0c125b7d04c08e01c6b197942a8349a4413b717
+  metadata.gz: b1ac40efca154fd993aaf23ed685620feee4c5c320a8cdea8f0b5fe69d13c3d3e7753a37ea583988e39cd4795e97aa23d5b5de2fb4ce3bd13786f58595e0774c
+  data.tar.gz: 670e28a70d3501d7579b7d6facec44e0101f452fef72e7ff74d83b397a6538cbea4b7457eb02c35d76d8a2a1f8736beb209212484e1cd74f60d27c0158b9b563

data/README.md

@@ -67,6 +67,7 @@ Ours is configured to display in the most friendly manner.
 You can configure a default author for pages and posts in your `_config.yml`:
 
 ```yaml
+image: /images/image.jpg              # Adds a small thumbnail image to the site header (a picture or logo)
 toc: true                             # Sets whether to adds a table of contents to the left sidebar of the page by default
 author_name: Greg Gibeling            # Sets the name of the default author, which can be overriden on each page
 author_url: https://github.com/gdgib/ # An optional link to a page specific to the default author, can be overriden on each page
@@ -134,15 +135,16 @@ user@localhost ~/charcoal
 $ bundle install
 ```
 
-In order to test your changes locally you will 
-After that you can see your handiwork by viewing this page with any modifications you've made.
-Please note that you will need to reload the page after changes as is normal with jekyll.
+In order to test your changes locally run:
 
 ```
 user@localhost ~/charcoal
 $ bundle exec jekyll serve
 ```
 
+After that you can see your handiwork by viewing this page with any modifications you've made.
+Please note that you will need to reload the page after changes as is normal with jekyll.
+
 ## Build
 
 To build the gem and install it for local development testing run:

data/_includes/header.html

@@ -3,7 +3,7 @@
 		<div id="title">
 			<h1><a class="site-title" rel="project" href="{{ "/" | relative_url }}">
 				{% if site.image %}
-					<img class="site-image" src="{{ site.image }}"/>
+					<img class="site-image" src="{{ site.image | prepend:site.baseurl }}"/>
 				{% endif %}
 				{{ site.title | default: site.github.repository_name | escape }}
 			</a></h1>

data/_sass/jekyll-theme-charcoal.scss

@@ -27,17 +27,13 @@ p, table, pre, ul, ol, dl {
   margin: 0 0 20px;
 }
 ul, ol, dl {
-	ul, ol, dl {
-		margin: 0;
-	}
+  ul, ol, dl {
+    margin: 0;
+  }
 }
 
 h1, h2, h3, h4, h5, h6 {
-  position: relative;
-  z-index: -1;
   color: lighten($charcoal-color-text, 20%);
-  padding-top: $charcoal-header-height + 10px;
-  margin: -$charcoal-header-height - 10px 0 10px;
   font-family: 'OpenSansRegular', "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-weight: normal;
 }
@@ -161,6 +157,13 @@ dt {
   font-weight: normal;
 }
 
+@mixin header_padding {
+  position: relative;
+  z-index: 0;
+  padding-top: $charcoal-header-height + 10px;
+  margin: -$charcoal-header-height - 10px 0 10px;
+}
+
 #header {
   z-index: 100;
   position: fixed;
@@ -173,18 +176,22 @@ dt {
   border-bottom: 4px solid lighten($charcoal-color-background, 20%);
   box-shadow: 0px 1px 3px rgba(0,0,0,.25);
   
+  h1, h2, h3, h4, h5, h6 {
+    @include header_padding
+  }
+  
   #title {
     margin: 0 0 0 0;
     
-	h1 {
-	  position: relative;
-	  z-index: 100;
+    h1 {
+      position: relative;
+      z-index: 100;
       text-align: left;
       line-height: 40px;
-	}
-	
-	p { text-align: left; }
-	.site-image {
+  }
+  
+  p { text-align: left; }
+  .site-image {
       width: 40px;
       border-radius: 2px;
       vertical-align: middle;
@@ -247,9 +254,14 @@ section {
   margin-top: $charcoal-header-height + 10px;
   
   img { max-width: 100%; }
-  
-  .content { display: flex; }
+  .content {
+    display: flex;
+    .post-list h2 {
+      margin: 0;
+    }
+  }
   .sidebar { flex: 20%; }
+  .main { flex: 80%; }
 }
 
 #title {
@@ -258,6 +270,9 @@ section {
   margin: 0 0 15px 0;
   padding: 0 0 5px 0;
 
+  h1, h2, h3, h4, h5, h6 {
+    @include header_padding
+  }
   h1 {
     font-family: 'OpenSansLight', "Helvetica Neue", Helvetica, Arial, sans-serif;
     font-weight: normal;
@@ -295,7 +310,7 @@ footer {
   border-top: 4px solid lighten($charcoal-color-background, 20%);
   
   .wrapper {
-  	display: flex;
+    display: flex;
     .footer-col-1 {
       width: -webkit-calc(20% - (#{$spacing-unit} / 2));
       width:         calc(20% - (#{$spacing-unit} / 2));
@@ -325,18 +340,56 @@ footer {
 
 @media print, screen and (max-width: 480px) {
   #header {
-  	height: $charcoal-header-height - 65px;
-  	#title {
-  	  p { display: none; }
-  	  .credits { display: none; }
+    position: static;
+    height: $charcoal-header-height - 10px;
+    width: 100%;
+    
+    h1, h2, h3, h4, h5, h6 {
+      position: static;
+      z-index: 0;
+      padding-top: 0;
+      margin: 0;
+    }
+    
+    #title {
+      margin: 0 0 0 0;
+      h1 {
+        position: static;
+        text-align: left;
+        line-height: 40px;
+      }
+      .credits { display: none; }
+      p { display: none; }
+      nav { display: none; }
     }
   }
-  section { margin-top: $charcoal-header-height - 65px; }
-  nav { display: none; }
+  section {
+    max-width: none;
+  	margin-top: 0;
+  	.content { display: block; }
+  	.sidebar { display: none; }
+  }
   footer {
       .wrapper {
-      	flex-wrap: wrap;
+        flex-wrap: wrap;
         .footer-col { width: 100%; }
       }
   }
+  .wrapper {
+    max-width: none;
+  }
+  
+  .about_image {
+    display: block;
+    align-items: stretch;
+    
+    .about_image_col { float: none; }
+    .about_image_content { margin-left: auto; }
+    .about_image_image {
+      margin-left: 10%;
+      margin-right: 10%;
+      width: 80%;
+      border-radius: 15px;
+    }
+  }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-charcoal
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Greg Gibeling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll