Skip to content

Commit

Permalink
migrating
Browse files Browse the repository at this point in the history
  • Loading branch information
scottkf committed Nov 26, 2013
1 parent adceef1 commit 8c0d2a2
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require 'webrick'
require 'directory_watcher'
require "term/ansicolor"
require "jekyll"
require "rdiscount"
require "redcarpet"
require "yaml"
include Term::ANSIColor
include WEBrick
Expand Down Expand Up @@ -128,7 +128,7 @@ syntax-highlighting: yes
{% for post in site.posts %}
{% for tag in post.tags %}
{%if tag == "#{tag}" %}
{%include post.html%}
{% include post.html %}
{%endif%}
{%endfor%}
{% endfor %}
Expand Down
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
exclude: ['Rakefile', 'Readme.markdown', 'src', 'config.rb', 'deploy.yml']
markdown: rdiscount
markdown: redcarpet
permalink: pretty
pygments: true
6 changes: 3 additions & 3 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
<body{% if page.title != 'Home' and page.title != 'four-oh-four' %} id="articles"{% endif %}>
<div id="container">
<header id="header-top">
developer, designer, consultant
</header>
<header id="header-bottom"></header>
<section id="content">
Expand Down Expand Up @@ -114,7 +113,8 @@
</article>
<aside>
<span class="title">contact</span>
<p>Interested in hiring me? Or perhaps you just need some more information? I'm currently interested in taking on new clients and new and interesting projects.<br /><a href="mailto:web@tesoriere.com">Get in touch!</a> You can also find me on <a href="http://www.workingwithrails.com/recommendation/new/person/20242-scott-tesoriere">Working with Rails!</a>
<p>
<a href="mailto:web@tesoriere.com">email</a>
</p>
<br />
<span class="title">photography</span>
Expand All @@ -130,7 +130,7 @@
<footer>
<nav class="bottom">
<ul>
<li><a href="/tags/portfolio">projects</a></li>
<li><a href="/tags/portfolio">sites</a></li>
<li><a href="/archive">archives</a></li>
<li><a href="http://projects.tesoriere.com/public">client access</li>
<li><a href="/">home</a></li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@ The reason it breaks is because of the way mephisto uses permanent links. It won
The first method is the quickest; using the templates to achieve this is fairly simple and straightforward. In your 'layout.liquid', which is the default template, you can add the following:

{% highlight bash %}
{% raw %}
{% if @section != nil %}
{% include 'home' %}
{% else %}
{% include 'journal'%}
{% endif %}
{% endraw %}
{% endhighlight %}
There also exists a '_home.liquid' and '_journal.liquid' template with however you want them to be designed. And that's it!
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
title: Home
---
<article class="main">
<span class="red">Scott Tesoriere</span> constructs <span class="red">web sites</span>, networks, and is able to <span class="red">diagnose and repair</span> problems relating to computers or security. Based in <span class="red">Jupiter, FL</span>.
<span class="red">Hi,</span> I am the Director of Technical Operations at <span class="red"><a href="http://gocloudlogistics.com">Cloud Logistics</a></span>. We bring modern tech to the <span class="red">Supply Chain</span> industry.
</article>
2 changes: 2 additions & 0 deletions src/screen.sass
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ body
line-height: 1.1em
font-family: Calibri, Helvetica, Arial, sans-serif
strong
a
color: $alt-link-color
nav.main
+column($nav-columns, true)
+prepend($nav-prepend)
Expand Down

0 comments on commit 8c0d2a2

Please sign in to comment.