new post + some changes to layout

WGretz · Dec 8, 2011 · 20730f0 · 20730f0
1 parent c1e42e0
commit 20730f0
Show file tree

Hide file tree

Showing 17 changed files with 80 additions and 45 deletions.
diff --git a/Rakefile b/Rakefile
@@ -4,7 +4,7 @@ end
 
 desc 'Deploy jekyll site'
 task :deploy =>["env:prod",:compile] do
-  system "cap deploy"
+  sh 'rsync -rtzh --progress --delete _site/ soulmonkey23@willgretz.com:~/willgretz.com/current'
 end
 
 namespace :compass do  

diff --git a/_config.yml b/_config.yml
@@ -1,2 +1,4 @@
-env: dev
-permalink: pretty
+env: prod
+permalink: /:year/:month/:day/:title.html
+pygments: true
+markdown: rdiscount
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,8 +1,11 @@
       <div class="push"></div>
-      <footer>
+    </div>
+    <footer>
+      <div>
         <p>&copy; 2010 Will Gretz</p>
-      </footer>
-    </div><script type="text/javascript">
+      </div>
+    </footer>
+    <script type="text/javascript">
           /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
           var disqus_developer = 1; // this would set it to developer mode
           var disqus_shortname = 'willgretz'; // required: replace example with your forum shortname

diff --git a/_includes/header-body.html b/_includes/header-body.html
@@ -1,11 +1,12 @@
 </head>
 <body>
   <div class="wrapper">
-  <header>
-    <a href="/" id="masthead">Will Gretz</a>
-    <ul>
-      <li><a href="/resume">Resume</a></li>
-      <li><a href="/about">About Me</a></li>
-      <li><a href="/">Blog</a></li>
-    </ul>
-  </header>
+    <header>
+      <a href="/" id="masthead">Will Gretz</a>
+      <ul>
+        <li><a href="/resume">Resume</a></li>
+        <li><a href="/about">About Me</a></li>
+        <li><a href="/">Blog</a></li>
+      </ul>
+    </header>
+
diff --git a/_posts/2010-04-06-introductions.mdwn → _posts/2011-04-06-introductions.mdwn b/_posts/2010-04-06-introductions.mdwn → _posts/2011-04-06-introductions.mdwn
diff --git a/_posts/2011-12-07-life-and-jekyll.mdwn b/_posts/2011-12-07-life-and-jekyll.mdwn
@@ -0,0 +1,13 @@
+---
+layout: post
+title: Life & Jekyll
+---
+So it's been 8 months since I last wrote an article.  Life got a little hectic. The company I was working for found itself with two large projects back to back.  When I originally got hired on we were just starting out upgrading there application from Rails 1.2.6 to Rails 3.  Besides just making a huge jump in the framework we were also moving some of our data from Postgres to MongoDB.  Right after this project ended we began adding functionality so that our software met government requirements so that our customers could get some stimulous checks.  Needless to say there ended up being several 80 hour weeks in the end.
+
+Well now that all that stuff is over I am finally getting back to working on my own stuff in my off time.  I decided it was time to get this site more up to date.  I'm still a big fan of Jekyll at this point and have been looking in to how to further customize it so that it meets my needs. The first thing I've implemented in the past couple of days is to remove the trailing slashes from urls.  When I first built this blog I really liked the permalink style "pretty".  But later on I realized all the links I was looking at had a trailing slash that I was not fond of.  After a little bit of research I discovered a property in apache called multiview. I found this [article](http://paulstamatiou.com/how-to-wordpress-to-jekyll) very useful when trying to implement multiview in Jekyll. I had to add this line to my .htaccess file: 
+
+{% highlight apache %}
+Options +MultiViews
+{% endhighlight %}
+
+At first I tried to just create an .htaccess file, but every time I regenerated the site the .htaccess file was not present in the newly compiled version.  One workaround I found was to name the file with out a period in front of the file and instead in the yaml for the file set the permalink to .htaccess. Another thing I learned in the process of updating this site is that code highlighting in Jekyll version 0.11.0 does not work with Liquid version 2.3.0.
diff --git a/_sass/main.scss b/_sass/main.scss
@@ -15,7 +15,7 @@
     margin-left: 30px;
   }
 }
-
+@include sticky-footer(42px, ".wrapper", ".push", "footer");
 
 $link-color: #A1C820;
 
@@ -27,7 +27,7 @@ body {
   margin: 0px;
   padding: 0px;
   background: #666;
-  font-size: 13px;
+  font-size: 14px;
   font-family: 'PT Sans';
   height: 100%;
 }
@@ -38,24 +38,18 @@ h2{
 }
 
 footer{
-  background: #000;
-  clear: both;
-  margin-top: 5px;
-  color: #fff;
-
-  .elem{
-    @include grid(4);
+  div {
+    background: #000;
+    color: #fff;
+    height: 42px;
+    width: 978px;
+    margin-right: auto;
+    margin-left : auto;
   }
-
-  .elemfirst{
-    @include grid(4,true);
-  } 
-
   p{
-    margin: 10px auto 0;
+    margin: 0px;
     padding: 10px;
     text-align: center;
-    border-top: 1px solid grey;
   }
 }
 
@@ -111,9 +105,13 @@ header {
 
 .wrapper {
   width: 978px;
-  margin: 0 auto;
-  @include radial-gradient(color_stops(#E1FFD6,#fff), top center );
-  min-height: 100%;
+  margin-right: auto;
+  margin-left: auto;
+  background: #fff;
+}
+
+.push {
+  clear: both;
 }
 
 h1 {
@@ -140,6 +138,11 @@ pre{
 
 .sidebar-module{
   @include grid(3);
+
+  h2 {
+    margin: 0px 0px 5px;
+  }
+
 }
 
 #featured-projects{

diff --git a/config.rb b/config.rb
@@ -1,12 +1,5 @@
 require "yaml"
 http_path = "/"
 sass_dir = "_sass"
-
-config = YAML.load(File.read("_config.yml"))
-if config["env"] == "dev"
-  css_dir = "_site/stylesheets"
-  output_style = :expanded
-else
-  css_dir = "stylesheets"
-  output_style = :compressed
-end
+css_dir = "stylesheets"
+output_style = :compressed
diff --git a/htaccess b/htaccess
@@ -0,0 +1,5 @@
+---
+permalink: .htaccess
+---
+RewriteEngine On
+Options +MultiViews
diff --git a/images/facebook_32.png b/images/facebook_32.png
diff --git a/images/github_32.png b/images/github_32.png
diff --git a/images/google_32.png b/images/google_32.png
diff --git a/images/linkedin_32.png b/images/linkedin_32.png
diff --git a/images/twitter_32.png b/images/twitter_32.png
diff --git a/index.html b/index.html
@@ -11,9 +11,23 @@ <h2>{{ post.title }}</h2>
     {% endfor %}
   </div>
 </div>
-<div id="column">
+<div class="sidebar-module">
+  <h2>Recent Posts</h2>
+  <ul>
   {% for post in site.nonprojectposts %}
     <li><a href="{{post.url}}">{{post.title}}</a><br />
       <span>{{post.date | date: "%B %e, %Y" }}</li>
   {% endfor %}
+  </ul>
+
+  <h2>Social Media</h2>
+  <a href="https://plus.google.com/115874712489676710214/about" target="_blank"><img src="/images/google_32.png"></a>
+  <a href="https://twitter.com/willgretz" target="_blank"><img src="/images/twitter_32.png"></a>
+  <a href="https://facebook.com/willgretz" target="_blank"><img src="/images/facebook_32.png"></a>
+  <a href="https://www.linkedin.com/in/willgretz" target="_blank"><img src="/images/linkedin_32.png"></a>
+  <a href="https://github.com/wgretz" target="_blank"><img src="/images/github_32.png"></a>
+
+  <h2>Project Euler</h2>
+  <img src="http://projecteuler.net/profile/WillGretz.png">
+  <img src="http://projecteuler.net/profile/WillGretzTcl.png">
 </div>
diff --git a/resume.html b/resume.html
@@ -1,4 +1,5 @@
 ---
 layout: default
 ---
-Something
+<h2>HTML version coming soon.</h2>
+<p>In the meantime <a href="/assets/WillGretzResume.pdf">download</a> a PDF version.</p>
diff --git a/stylesheets/main.css b/stylesheets/main.css