Skip to content
Browse files

indent fixes

  • Loading branch information...
1 parent 6fd0ff3 commit 1a9d0f2f6b2da43249aa9006d209224cb97d400b @amerine committed Oct 5, 2010
Showing with 434 additions and 713 deletions.
  1. +81 −99 _layouts/master.html
  2. +44 −48 _layouts/post.html
  3. +111 −111 about.html
  4. +9 −9 archive.html
  5. +44 −44 blog.html
  6. +71 −71 index.html
  7. +66 −66 open-source.html
  8. +0 −257 stylesheets/master.css
  9. +3 −3 stylesheets/style.css
  10. +5 −5 talks.html
View
180 _layouts/master.html
@@ -1,105 +1,87 @@
<!DOCTYPE html>
<html lang="en">
-<head>
- <meta charset="utf-8" />
- <meta name="verify-v1" content="riVGrnjA4Bvi402jBurzJvLHRlpw2R0w0mOWbhD3Doc=" />
- <meta name="msvalidate.01" content="0AB2BBF805D2AD8CC3235417D0520F94" />
- <meta name="description" content="Mark Turner is amerine on the internet" />
- <link rel="icon" type="image/gif" href="favicon.gif" />
- <title>Mark Turner - {{page.title}}</title>
-
- <link href="/stylesheets/style.css" rel="stylesheet" type="text/css" />
- <link href="/stylesheets/syntax.css" rel="stylesheet" type="text/css" />
- <script type="text/javascript" src="/javascripts/jquery.js"></script>
- <script type="text/javascript" src="/javascripts/jquery.scrollTo.js"></script>
- <script type="text/javascript" src="/javascripts/jquery.animate-colors.js"></script>
- <script type="text/javascript" src="/javascripts/jquery.github.js"></script>
- <script type="text/javascript" src="/javascripts/jquery.tweet.js"></script>
-
- <!--[if IE]>
- <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
- <![endif]-->
-
- <link rel='alternate' type='application/rss+xml' href='http://feeds.feedburner.com/amerine' />
-
- <script type='text/javascript'>
- $(document).ready(function(){
- $(".tweet").tweet({
- username: "amerine",
- join_text: "auto",
- avatar_size: 32,
- count: 1,
- auto_join_text_default: "I said,",
- auto_join_text_ed: "I",
- auto_join_text_ing: "I was",
- auto_join_text_reply: "I replied to",
- auto_join_text_url: "I was checking out",
- loading_text: "loading tweets..."
- });
- });
- </script>
-</head>
+ <head>
+ <meta charset="utf-8" />
+ <meta name="verify-v1" content="riVGrnjA4Bvi402jBurzJvLHRlpw2R0w0mOWbhD3Doc=" />
+ <meta name="msvalidate.01" content="0AB2BBF805D2AD8CC3235417D0520F94" />
+ <meta name="description" content="Mark Turner is amerine on the internet" />
+ <link rel="icon" type="image/gif" href="favicon.gif" />
+ <title>Mark Turner - {{page.title}}</title>
+
+ <link href="/stylesheets/style.css" rel="stylesheet" type="text/css" />
+ <link href="/stylesheets/syntax.css" rel="stylesheet" type="text/css" />
+ <script type="text/javascript" src="/javascripts/jquery.js"></script>
+ <script type="text/javascript" src="/javascripts/jquery.scrollTo.js"></script>
+ <script type="text/javascript" src="/javascripts/jquery.animate-colors.js"></script>
+ <script type="text/javascript" src="/javascripts/jquery.github.js"></script>
+ <script type="text/javascript" src="/javascripts/jquery.tweet.js"></script>
+
+ <!--[if IE]>
+ <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
+ <![endif]-->
+
+ <link rel='alternate' type='application/rss+xml' href='http://feeds.feedburner.com/amerine' />
+
+ <script type='text/javascript'>
+ $(document).ready(function(){
+ $(".tweet").tweet({
+ username: "amerine",
+ join_text: "auto",
+ avatar_size: 32,
+ count: 1,
+ auto_join_text_default: "I said,",
+ auto_join_text_ed: "I",
+ auto_join_text_ing: "I was",
+ auto_join_text_reply: "I replied to",
+ auto_join_text_url: "I was checking out",
+ loading_text: "loading tweets..."
+ });
+ });
+ </script>
+ </head>
<body>
-<div id="top">
-<div id="topwrapper">
- <div id="logo">
-
- <p class="title">Mark Turner</p>
- <p class="slogan">Amerine on the Internet</p>
- </div>
- <nav>
- <ul id="menu" >
- <li class="current"><a href="/index.html">Home</a></li>
- <li><a href="/blog.html">blog</a></li>
- <li><a href="/open-source.html">open source</a></li>
- <li><a href="/talks.html">talks</a></li>
- <li><a href="http://github.com/amerine" target="_blank">code</a></li>
- <li><a href="/about.html">about</a></li>
- <!--<li><a href="pages_intro.html">open source</a>
- <ul>
- <li><a href="pages_intro.html">Intro</a></li>
- <li><a href="pages_columns.html">Columns</a></li>
- <li class="last"><a href="pages_elements.html">Elements</a></li>
- </ul>
- </li>
- <li><a href="page_amerine_black.html">Projects</a>
- <ul>
- <li><a href="page_amerine_black.html">Standard Page</a></li>
- <li><a href="page_amerine_black_wwhite.html">Black with white</a></li>
- <li><a href="page_amerine_black_combined.html">Combined</a></li>
- <li><a href="page_amerine_white.html">Standard White</a></li>
- <li><a href="page_amerine_white_wblack.html">White with black</a></li>
- <li class="last"><a href="page_amerine_white_combined.html">Combined white</a></li>
- </ul>
- </li>
- <li><a href="portfolio.html">Code</a></li>-->
- </ul>
+ <div id="top">
+ <div id="topwrapper">
+ <div id="logo">
+
+ <p class="title">Mark Turner</p>
+ <p class="slogan">Amerine on the Internet</p>
+ </div>
+ <nav>
+ <ul id="menu" >
+ <li class="current"><a href="/index.html">Home</a></li>
+ <li><a href="/blog.html">blog</a></li>
+ <li><a href="/open-source.html">open source</a></li>
+ <li><a href="/talks.html">talks</a></li>
+ <li><a href="http://github.com/amerine" target="_blank">code</a></li>
+ <li><a href="/about.html">about</a></li>
+ </ul>
- <br class="clear" />
- </nav>
-</div>
-</div>
-<div id="content">
- {{content}}
-</div> <!-- end content -->
+ <br class="clear" />
+ </nav>
+ </div>
+ </div>
+ <div id="content">
+ {{content}}
+ </div> <!-- end content -->
-<footer>
- <div>
- <p>Copyright &#169; 2010 <a href="http://amerine.net">Mark Turner</a>. All Rights Reserved. Hosted by <a href='http://github.com/amerine/amerine.github.com/' target='_blank'>GitHub</a> and powered by <a href='http://github.com/mojombo/jekyll'>Jekyll</a>.</p>
- </div>
-</footer> <!-- end footer -->
-<script type="text/javascript">
- var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
- document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
- </script>
- <script type="text/javascript">
- try {
- var pageTracker = _gat._getTracker("UA-251920-6");
- pageTracker._trackPageview();
- } catch(err) {}</script>
- <script src="http://static.getclicky.com/js" type="text/javascript"></script>
- <script type="text/javascript">clicky.init(119896);</script>
- <noscript><p><img alt="Clicky" width="1" height="1" src="http://in.getclicky.com/119896ns.gif" /></p></noscript>
-</body>
-</html>
+ <footer>
+ <div>
+ <p>Copyright &#169; 2010 <a href="http://amerine.net">Mark Turner</a>. All Rights Reserved. Hosted by <a href='http://github.com/amerine/amerine.github.com/' target='_blank'>GitHub</a> and powered by <a href='http://github.com/mojombo/jekyll'>Jekyll</a>.</p>
+ </div>
+ </footer> <!-- end footer -->
+ <script type="text/javascript">
+ var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+ </script>
+ <script type="text/javascript">
+ try {
+ var pageTracker = _gat._getTracker("UA-251920-6");
+ pageTracker._trackPageview();
+ } catch(err) {}</script>
+ <script src="http://static.getclicky.com/js" type="text/javascript"></script>
+ <script type="text/javascript">clicky.init(119896);</script>
+ <noscript><p><img alt="Clicky" width="1" height="1" src="http://in.getclicky.com/119896ns.gif" /></p></noscript>
+ </body>
+</html>
View
92 _layouts/post.html
@@ -2,54 +2,50 @@
layout: master
---
<section id="header">
- <h1>Marks Blog</h1>
+<h1>Marks Blog</h1>
</section>
- <section class="blog">
- <div id="posts">
- <article>
- <div class="title">
- <h1><a href="{{page.url}}">{{page.title}}</a></h1>
- <time datetime="{{post.date}}">{{page.date | date: "%d"}}<br/><span>{{page.date | date: "%b"}}</span></time>
- <div class="clear"></div>
- </div>
- <div class="elements">
- {{content}}
- </div>
- <hr/>
- <script type="text/javascript" charset="utf-8">
- var disqus_url = "http://amerine.net{{page.url}}";
- </script>
- <div id="disqus_thread"></div>
- <script type="text/javascript" src="http://disqus.com/forums/amerine/embed.js"></script>
- <noscript><a href="http://amerine.disqus.com/?url=ref">View the discussion thread.</a></noscript>
- <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
- </article>
-
- <div class="clear"></div>
- <div class="prevnext">
- <div class="prev"><a href="#" class="prev">Prev Posts</a></div>
- <div class="next"><a href="#" class="next">Next Posts</a></div>
- </div>
- </div><!-- posts -->
- <aside>
- <div class="rss block">
- <a href="#">RSS Feed</a>
- </div>
- <div class="tweet block">
- <h2><div>Latest tweet</div></h2>
- </div>
- {% include popular-posts.html %}
- <div class="archives block">
- <h2>Archives</h2>
- <ul>
- <li><a href="/archive.html">View Archive</a></li>
- </ul>
- </div>
- <div class="ad">
- {% include ad-block.markdown %}
- </div>
- </aside>
- <div class="clear"></div>
+<section class="blog">
+<div id="posts">
+ <article>
+ <div class="title">
+ <h1><a href="{{page.url}}">{{page.title}}</a></h1>
+ <time datetime="{{post.date}}">{{page.date | date: "%d"}}<br/><span>{{page.date | date: "%b"}}</span></time>
+ <div class="clear"></div>
+ </div>
+ <div class="elements">
+ {{content}}
+ </div>
+ <hr/>
+ <script type="text/javascript" charset="utf-8">
+ var disqus_url = "http://amerine.net{{page.url}}";
+ </script>
+ <div id="disqus_thread"></div>
+ <script type="text/javascript" src="http://disqus.com/forums/amerine/embed.js"></script>
+ <noscript><a href="http://amerine.disqus.com/?url=ref">View the discussion thread.</a></noscript>
+ <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+ </article>
-</section>
+ <div class="clear"></div>
+ </div><!-- posts -->
+ <aside>
+ <div class="rss block">
+ <a href="#">RSS Feed</a>
+ </div>
+ <div class="tweet block">
+ <h2><div>Latest tweet</div></h2>
+ </div>
+ {% include popular-posts.html %}
+ <div class="archives block">
+ <h2>Archives</h2>
+ <ul>
+ <li><a href="/archive.html">View Archive</a></li>
+ </ul>
+ </div>
+ <div class="ad">
+ {% include ad-block.markdown %}
+ </div>
+ </aside>
+ <div class="clear"></div>
+
+ </section>
View
222 about.html
@@ -10,115 +10,115 @@
<section class="pageamerine white">
- <div class="elements">
- <h1>Hacker, Rubyist, Sys Admin, Wizard</h1>
- <p class="big">Mark has an extensive past in the information technology world from software engineering to network &amp; system administration and project management. He speaks at a number of events and local tech groups on topics ranging from <a href="http://bendug.org">Unix/Linux</a> to <a href="http://git-scm.com">Git</a> and <a href="http://www.ruby-lang.org">Ruby</a> to <a href="http://rubyonrails.org/">Rails</a>. </p>
- </div>
-
- <br/>
- <div class="box white two_quarter">
- <div class="contents">
- <img src="/images/mark-eris1.jpg" />
- <div class="title"><h2>Me and my daughter.</h2></div>
- </div>
- </div>
-
- <div class="box black one_quarter">
- <div class="contents">
- <div class="title"><h2>Current Gig</h2></div>
- <h3>IT Director for <a href="http://www.bendbulletin.com/apps/pbcs.dll/article?AID=/99999999/ABOUT/50830004">Western Communication Inc.</a> (aka Wescom)</h3>
- <p>I'm currently focused on developing innovative solutions to the complex problems the newspaper/publishing industry is facing.
- <br /><br />
- From software development to network security, I lead an expert team of IT professionals that manage and develop the complicated systems that keep Wescom running day in and day out.
- </p>
- </div>
- </div>
-
- <div class="box black one_quarter">
- <div class="contents">
- <div class="title"><h2>Get in touch</h2></div>
- <div class="citem">
- <h3>Phone</h3>
- <p>+1 (541) 306-3355</p>
- </div>
- <div class="citem">
- <h3>Email</h3>
- <p><a href="mailto:mark@amerine.net">mark@amerine.net</a></p>
- </div>
- <div class="citem last">
- <h3>Gtalk</h3>
- <p>mark@amerine.net</p>
- </div>
- <div class="citem last">
- <h3>IRC</h3>
- <p>amerine on freenode</p>
- </div>
- <br />
- <div class="clear"></div>
-
- <div class="icons">
- <a href="http://twitter.com/amerine" class="social"><img src="/images/social_icon_twitter.png" /></a>
- <a href="http://www.flickr.com/photos/mark_turner/" class="social"><img src="/images/social_icon_flickr.png" /></a>
- <a href="http://www.linkedin.com/in/markaturner" class="social"><img src="/images/social_icon_linkedin.png" /></a>
- <a href="http://vimeo.com/amerine" class="social"><img src="/images/social_icon_vimeo.png" /></a>
- <div class="clear"></div>
- </div>
- </div>
- </div>
-
- <div class="clear"></div>
- <br/>
-
- <div class="elements">
- <blockquote>I'm not currently looking for any consulting work or a new gig. You can always email me at <a href="mailto:mark@amerine.net">mark@amerine.net</a> if you think you're working on something interesting, but don't expect a response if you're a recruiter.</blockquote>
- <br />
- <h2>Other Projects and Organizations I'm involved with</h2>
- <p>In addition to my full-time gig at Wescom I'm also the co-founder of a couple of small startups and an active member of the local tech community. You'll usually find me working on interesting new ideas with friends. </p>
- <br/>
- <h3>Local Tech Groups I'm involved with</h3>
- <ul>
- <li><a href="http://cowpu.org">Central Oregon Web Professionals User Group</a></li>
- <li><a href="http://bendug.org">Bend Linux/Unix Users Group</a></li>
- <li><a href="http://bendrb.com">Bend Ruby Hackers</a></li>
- <li><a href="http://www.coisug.info/">Central Oregon Information Systems User Group</a></li>
- </ul>
- <br/>
- <h3>Companies I'm Involved With</h3>
- </div>
- <div class="box black one_third">
- <div class="contents">
- <div class="title"><h2>nVariable</h2></div>
- <img src="/images/nvariable.png" alt="nvariable logo"/>
- <h3>Software Consultancy &amp; Product Incubator</h3>
- <p>I co-founded nVariable Inc. to put an official name on the software consultancy and development practice my parter <a href="http://dipperstove.com">Josh Sullivan</a> and I were growing. We develop custom
- applications for ourselves and clients with a current focus on Web and Mobile.
- </p>
- </div>
- </div>
- <div class="box white one_third">
- <div class="contents">
- <div class="title"><h2>ARTFLINGS</h2></div>
- <img src="/images/artflings_logo.png" alt="artflings logo" />
- <h3>connects art to people like you</h3>
- <p>
- If you’re looking for unique pieces for your office, or an ever changing collection at home, Artflings will introduce you to a completely new way to share art.
- <br /><br />
- We're launching Artflings to help local artists get their work showcased throughout their communities in an entirely new way that we believe will turn the art world on its head.
- </p>
- </div>
- </div>
- <div class="box black one_third">
- <div class="contents">
- <div class="title"><h2>The Past</h2></div>
- <p>Each of the companies below are no longer operating, but are listed here for posterity.</p>
- <br /><br />
- <ul>
- <li>Bendango</li>
- <li>BendLinux Consulting</li>
- <li>Amerine Media Group Inc.</li>
- </ul>
- </div>
- </div>
- <div class="clear"></div>
+<div class="elements">
+ <h1>Hacker, Rubyist, Sys Admin, Wizard</h1>
+ <p class="big">Mark has an extensive past in the information technology world from software engineering to network &amp; system administration and project management. He speaks at a number of events and local tech groups on topics ranging from <a href="http://bendug.org">Unix/Linux</a> to <a href="http://git-scm.com">Git</a> and <a href="http://www.ruby-lang.org">Ruby</a> to <a href="http://rubyonrails.org/">Rails</a>. </p>
+</div>
-</section>
+<br/>
+<div class="box white two_quarter">
+ <div class="contents">
+ <img src="/images/mark-eris1.jpg" />
+ <div class="title"><h2>Me and my daughter.</h2></div>
+ </div>
+</div>
+
+<div class="box black one_quarter">
+ <div class="contents">
+ <div class="title"><h2>Current Gig</h2></div>
+ <h3>IT Director for <a href="http://www.bendbulletin.com/apps/pbcs.dll/article?AID=/99999999/ABOUT/50830004">Western Communication Inc.</a> (aka Wescom)</h3>
+ <p>I'm currently focused on developing innovative solutions to the complex problems the newspaper/publishing industry is facing.
+ <br /><br />
+ From software development to network security, I lead an expert team of IT professionals that manage and develop the complicated systems that keep Wescom running day in and day out.
+ </p>
+ </div>
+</div>
+
+<div class="box black one_quarter">
+ <div class="contents">
+ <div class="title"><h2>Get in touch</h2></div>
+ <div class="citem">
+ <h3>Phone</h3>
+ <p>+1 (541) 306-3355</p>
+ </div>
+ <div class="citem">
+ <h3>Email</h3>
+ <p><a href="mailto:mark@amerine.net">mark@amerine.net</a></p>
+ </div>
+ <div class="citem last">
+ <h3>Gtalk</h3>
+ <p>mark@amerine.net</p>
+ </div>
+ <div class="citem last">
+ <h3>IRC</h3>
+ <p>amerine on freenode</p>
+ </div>
+ <br />
+ <div class="clear"></div>
+
+ <div class="icons">
+ <a href="http://twitter.com/amerine" class="social"><img src="/images/social_icon_twitter.png" /></a>
+ <a href="http://www.flickr.com/photos/mark_turner/" class="social"><img src="/images/social_icon_flickr.png" /></a>
+ <a href="http://www.linkedin.com/in/markaturner" class="social"><img src="/images/social_icon_linkedin.png" /></a>
+ <a href="http://vimeo.com/amerine" class="social"><img src="/images/social_icon_vimeo.png" /></a>
+ <div class="clear"></div>
+ </div>
+ </div>
+</div>
+
+<div class="clear"></div>
+<br/>
+
+<div class="elements">
+ <blockquote>I'm not currently looking for any consulting work or a new gig. You can always email me at <a href="mailto:mark@amerine.net">mark@amerine.net</a> if you think you're working on something interesting, but don't expect a response if you're a recruiter.</blockquote>
+ <br />
+ <h2>Other Projects and Organizations I'm involved with</h2>
+ <p>In addition to my full-time gig at Wescom I'm also the co-founder of a couple of small startups and an active member of the local tech community. You'll usually find me working on interesting new ideas with friends. </p>
+ <br/>
+ <h3>Local Tech Groups I'm involved with</h3>
+ <ul>
+ <li><a href="http://cowpu.org">Central Oregon Web Professionals User Group</a></li>
+ <li><a href="http://bendug.org">Bend Linux/Unix Users Group</a></li>
+ <li><a href="http://bendrb.com">Bend Ruby Hackers</a></li>
+ <li><a href="http://www.coisug.info/">Central Oregon Information Systems User Group</a></li>
+ </ul>
+ <br/>
+ <h3>Companies I'm Involved With</h3>
+</div>
+<div class="box black one_third">
+ <div class="contents">
+ <div class="title"><h2>nVariable</h2></div>
+ <img src="/images/nvariable.png" alt="nvariable logo"/>
+ <h3>Software Consultancy &amp; Product Incubator</h3>
+ <p>I co-founded nVariable Inc. to put an official name on the software consultancy and development practice my parter <a href="http://dipperstove.com">Josh Sullivan</a> and I were growing. We develop custom
+ applications for ourselves and clients with a current focus on Web and Mobile.
+ </p>
+ </div>
+</div>
+<div class="box white one_third">
+ <div class="contents">
+ <div class="title"><h2>ARTFLINGS</h2></div>
+ <img src="/images/artflings_logo.png" alt="artflings logo" />
+ <h3>connects art to people like you</h3>
+ <p>
+ If you’re looking for unique pieces for your office, or an ever changing collection at home, Artflings will introduce you to a completely new way to share art.
+ <br /><br />
+ We're launching Artflings to help local artists get their work showcased throughout their communities in an entirely new way that we believe will turn the art world on its head.
+ </p>
+ </div>
+</div>
+<div class="box black one_third">
+ <div class="contents">
+ <div class="title"><h2>The Past</h2></div>
+ <p>Each of the companies below are no longer operating, but are listed here for posterity.</p>
+ <br /><br />
+ <ul>
+ <li>Bendango</li>
+ <li>BendLinux Consulting</li>
+ <li>Amerine Media Group Inc.</li>
+ </ul>
+ </div>
+</div>
+<div class="clear"></div>
+
+</section>
View
18 archive.html
@@ -10,14 +10,14 @@
<section class="pageamerine white">
- <div class="elements">
- {% for post in site.posts %}
- <time datetime="{{post.date}}">{{post.date | date: "%d %b %Y"}}</time>
- <h3><a href="{{post.url}}">{{ post.title }}</a></h3>
- <br />
- {% endfor %}
- </div>
+<div class="elements">
+ {% for post in site.posts %}
+ <time datetime="{{post.date}}">{{post.date | date: "%d %b %Y"}}</time>
+ <h3><a href="{{post.url}}">{{ post.title }}</a></h3>
+ <br />
+ {% endfor %}
+</div>
- <div class="clear"></div>
+<div class="clear"></div>
-</section>
+</section>
View
88 blog.html
@@ -4,51 +4,51 @@
full_posts: 10
---
<section id="header">
- <h1>Mark's Blog</h1>
+<h1>Mark's Blog</h1>
</section>
- <section class="blog">
- <div id="posts">
- {% for post in site.posts %}
- {% if forloop.index < page.full_posts %}
- <article>
- <div class="title">
- <h1><a href="{{post.url}}">{{post.title}}</a></h1>
- <time datetime="{{post.date}}">{{post.date | date: "%d"}}<br/><span>{{post.date | date: "%b"}}</span></time>
- <div class="clear"></div>
- </div>
- <div class="elements">
- {{post.content}}
- <footer>
- <div class="coms"><a href="{{post.url}}#disqus_thread">Comments</a></div>
- </footer>
- </div>
- </article>
- {% endif %}
- {% endfor %}
- <div class="clear"></div>
- <div class="prevnext">
- <div class="prev"><a href="/archive.html" class="prev">View Archive</a></div>
- </div>
- </div><!-- posts -->
- <aside>
- <div class="rss block">
- <a href="http://feeds2.feedburner.com/amerine">RSS Feed</a>
- </div>
- <div class="tweet block">
- <h2><div>Latest tweet</div></h2>
- </div>
- {% include popular-posts.html %}
- <div class="archives block">
- <h2>Archives</h2>
- <ul>
- <li><a href="/archive.html">View Archive</a></li>
- </ul>
- </div>
- <div class="ad">
- {% include ad-block.markdown %}
- </div>
- </aside>
- <div class="clear"></div>
+<section class="blog">
+<div id="posts">
+ {% for post in site.posts %}
+ {% if forloop.index < page.full_posts %}
+ <article>
+ <div class="title">
+ <h1><a href="{{post.url}}">{{post.title}}</a></h1>
+ <time datetime="{{post.date}}">{{post.date | date: "%d"}}<br/><span>{{post.date | date: "%b"}}</span></time>
+ <div class="clear"></div>
+ </div>
+ <div class="elements">
+ {{post.content}}
+ <footer>
+ <div class="coms"><a href="{{post.url}}#disqus_thread">Comments</a></div>
+ </footer>
+ </div>
+ </article>
+ {% endif %}
+ {% endfor %}
+ <div class="clear"></div>
+ <div class="prevnext">
+ <div class="prev"><a href="/archive.html" class="prev">View Archive</a></div>
+ </div>
+</div><!-- posts -->
+<aside>
+<div class="rss block">
+ <a href="http://feeds2.feedburner.com/amerine">RSS Feed</a>
+</div>
+<div class="tweet block">
+ <h2><div>Latest tweet</div></h2>
+</div>
+{% include popular-posts.html %}
+<div class="archives block">
+ <h2>Archives</h2>
+ <ul>
+ <li><a href="/archive.html">View Archive</a></li>
+ </ul>
+</div>
+<div class="ad">
+ {% include ad-block.markdown %}
+</div>
+</aside>
+<div class="clear"></div>
</section>
View
142 index.html
@@ -5,80 +5,80 @@
---
<section id="intro">
- <h1>Welcome</h1>
- <p>Mark Turner is a hacker, sys admin and all around geek. He is currently the IT Director at Wescom, an Oregon based publisher with various publications throughout Oregon and California.</p>
+<h1>Welcome</h1>
+<p>Mark Turner is a hacker, sys admin and all around geek. He is currently the IT Director at Wescom, an Oregon based publisher with various publications throughout Oregon and California.</p>
</section>
<section id="header">
- <h1>Latest Blog Post</h1>
+<h1>Latest Blog Post</h1>
</section>
- <section class="main">
+<section class="main">
+
+<div class="three_quarter white">
+ <h2>{{site.posts.first.title}}</h2>
+ <div class="elements">
+ {{ site.posts.first.content }}
+ <a href='{{site.posts.first.url}}#disqus_thread'>Comments</a>
+ </div>
+</div>
+<div class="one_quarter black">
+ <div class="title"><h2>Find me on twitter</h2></div>
+ <div class="elements">
+ <p class="tweet"></p>
+ </div>
+ <div class="title"><h2 class="normal">Connect with me</h2></div>
+ <div class="icons">
+ <a href="http://twitter.com/amerine" class="social"><img src="/images/social_icon_twitter.png" /></a>
+ <a href="http://www.flickr.com/photos/mark_turner/" class="social"><img src="/images/social_icon_flickr.png" /></a>
+ <a href="http://www.linkedin.com/in/markaturner" class="social"><img src="/images/social_icon_linkedin.png" /></a>
+ <a href="http://vimeo.com/amerine" class="social"><img src="/images/social_icon_vimeo.png" /></a>
+ <div class="clear"></div>
+ </div>
+ <div class="rss"><img src="/images/icon_rss.png" /><a href='http://feeds2.feedburner.com/amerine' class='float-right'>RSS Feed</a></div>
+</div>
+<div class="clear"></div>
- <div class="three_quarter white">
- <h2>{{site.posts.first.title}}</h2>
- <div class="elements">
- {{ site.posts.first.content }}
- <a href='{{site.posts.first.url}}#disqus_thread'>Comments</a>
- </div>
- </div>
- <div class="one_quarter black">
- <div class="title"><h2>Find me on twitter</h2></div>
- <div class="elements">
- <p class="tweet"></p>
- </div>
- <div class="title"><h2 class="normal">Connect with me</h2></div>
- <div class="icons">
- <a href="http://twitter.com/amerine" class="social"><img src="/images/social_icon_twitter.png" /></a>
- <a href="http://www.flickr.com/photos/mark_turner/" class="social"><img src="/images/social_icon_flickr.png" /></a>
- <a href="http://www.linkedin.com/in/markaturner" class="social"><img src="/images/social_icon_linkedin.png" /></a>
- <a href="http://vimeo.com/amerine" class="social"><img src="/images/social_icon_vimeo.png" /></a>
- <div class="clear"></div>
- </div>
- <div class="rss"><img src="/images/icon_rss.png" /><a href='http://feeds2.feedburner.com/amerine' class='float-right'>RSS Feed</a></div>
- </div>
- <div class="clear"></div>
-
</section>
<section class="footertop">
- <div class="one_third black">
- <div class="title"><h2 class="boxed">About this site</h2></div>
- <div class="elements">
- <img src="/images/mark-eris.png" />
- <p>This is my space. A spot on the internet to express my thoughts and share what I know with the world. My goal for this site is simple: Teach the world what I know.</p>
- </div>
- <div class="bottom"><a href="about.html">See more about Mark</a></div>
- </div>
- <div class="one_third black">
- <div class="title"><h2>From the blog</h2></div>
- <div class="elements">
- {% for post in site.posts %}
- {% if forloop.index <= page.from_the_blog %}
- <div class='post'>
- <h3><a href="{{post.url}}">{{post.title}}</a></h3><time datetime="{{post.date}}">{{post.date | date_to_string}}</time>
- <p>{{post.content | strip_html | truncate: 100}}</p>
- <a href='{{post.url}}#disqus_thread'>View Comments</a>
- </div>
- {% endif %}
- {% endfor %}
- </div>
- <div class="bottom"><a href="blog.html">See all posts</a></div>
- </div>
- <div class="one_third black">
- <div class="title"><h2 class="red">Get in touch</h2></div>
- <div class="elements">
- <div class="citem">
- <h3>Phone</h3>
- <p>+1 (541) 306-3355</p>
- </div>
- <div class="citem">
- <h3>Email</h3>
- <p><a href="mailto:mark@amerine.net">mark@amerine.net</a></p>
- </div>
- <div class="citem last">
- <h3>Gtalk</h3>
- <p><a href="mailto:mark@amerine.net">mark@amerine.net</a></p>
- </div>
- <br/>
- </div>
- </div>
- <div class="clear"></div>
-</section>
+<div class="one_third black">
+ <div class="title"><h2 class="boxed">About this site</h2></div>
+ <div class="elements">
+ <img src="/images/mark-eris.png" />
+ <p>This is my space. A spot on the internet to express my thoughts and share what I know with the world. My goal for this site is simple: Teach the world what I know.</p>
+ </div>
+ <div class="bottom"><a href="about.html">See more about Mark</a></div>
+</div>
+<div class="one_third black">
+ <div class="title"><h2>From the blog</h2></div>
+ <div class="elements">
+ {% for post in site.posts %}
+ {% if forloop.index <= page.from_the_blog %}
+ <div class='post'>
+ <h3><a href="{{post.url}}">{{post.title}}</a></h3><time datetime="{{post.date}}">{{post.date | date_to_string}}</time>
+ <p>{{post.content | strip_html | truncate: 100}}</p>
+ <a href='{{post.url}}#disqus_thread'>View Comments</a>
+ </div>
+ {% endif %}
+ {% endfor %}
+ </div>
+ <div class="bottom"><a href="blog.html">See all posts</a></div>
+</div>
+<div class="one_third black">
+ <div class="title"><h2 class="red">Get in touch</h2></div>
+ <div class="elements">
+ <div class="citem">
+ <h3>Phone</h3>
+ <p>+1 (541) 306-3355</p>
+ </div>
+ <div class="citem">
+ <h3>Email</h3>
+ <p><a href="mailto:mark@amerine.net">mark@amerine.net</a></p>
+ </div>
+ <div class="citem last">
+ <h3>Gtalk</h3>
+ <p><a href="mailto:mark@amerine.net">mark@amerine.net</a></p>
+ </div>
+ <br/>
+ </div>
+</div>
+<div class="clear"></div>
+</section>
View
132 open-source.html
@@ -3,75 +3,75 @@
title: Open-Source Projects
---
<section class="pageamerine white">
- <div class="elements">
- <h1>Open Source</h1>
- <p class="big">I have a number of open-source projects or forks hosted on <a href='http://github.com/amerine' rel='me' target='_blank'>GitHub</a>. The list below is dynamically populated from all of my repositories with the most popular ones appearing first.</p>
- </div>
- <br/>
-
- <div id="github-projects">
- <div class="box white one_quarter">
- <div class="contents">
- <div class="title"><h2>btexty</h2></div>
- <p>API wrapper for the BTexty API</p>
- <p><a href="http://github.com/amerine/btexty">view project</a></p>
- </div>
- </div>
-
- <div class="box white one_quarter">
- <div class="contents">
- <div class="title"><h2>amerine.github.com</h2></div>
- <p>Mark Turner Blog</p>
- <p><a href="http://github.com/amerine/amerine.github.com">view project</a></p>
- </div>
- </div>
-
- <div class="box white one_quarter">
- <div class="contents">
- <div class="title"><h2>rack_clicky</h2></div>
- <p>Rack Middleware to embed the Clicky (www.getclicky.com) tracking code.</p>
- <p><a href="http://github.com/amerine/rack_clicky">view project</a></p>
- </div>
- </div>
-
- <div class="box white one_quarter">
- <div class="contents">
- <div class="title"><h2>niftr</h2></div>
- <p>Ruby NITF parser</p>
- <p><a href="http://github.com/amerine/niftr">view project</a></p>
- </div>
- </div>
-
- <div class="clear"></div>
- </div>
- <div class="clear"></div>
+<div class="elements">
+ <h1>Open Source</h1>
+ <p class="big">I have a number of open-source projects or forks hosted on <a href='http://github.com/amerine' rel='me' target='_blank'>GitHub</a>. The list below is dynamically populated from all of my repositories with the most popular ones appearing first.</p>
+</div>
+<br/>
+
+<div id="github-projects">
+ <div class="box white one_quarter">
+ <div class="contents">
+ <div class="title"><h2>btexty</h2></div>
+ <p>API wrapper for the BTexty API</p>
+ <p><a href="http://github.com/amerine/btexty">view project</a></p>
+ </div>
+ </div>
+
+ <div class="box white one_quarter">
+ <div class="contents">
+ <div class="title"><h2>amerine.github.com</h2></div>
+ <p>Mark Turner Blog</p>
+ <p><a href="http://github.com/amerine/amerine.github.com">view project</a></p>
+ </div>
+ </div>
+
+ <div class="box white one_quarter">
+ <div class="contents">
+ <div class="title"><h2>rack_clicky</h2></div>
+ <p>Rack Middleware to embed the Clicky (www.getclicky.com) tracking code.</p>
+ <p><a href="http://github.com/amerine/rack_clicky">view project</a></p>
+ </div>
+ </div>
+
+ <div class="box white one_quarter">
+ <div class="contents">
+ <div class="title"><h2>niftr</h2></div>
+ <p>Ruby NITF parser</p>
+ <p><a href="http://github.com/amerine/niftr">view project</a></p>
+ </div>
+ </div>
+
+ <div class="clear"></div>
+</div>
+<div class="clear"></div>
</section>
<script type="text/javascript" charset="utf-8">
- $.githubUser('amerine', function(data) {
- $('#github-projects').html('');
-
- var repos = data.user.repositories;
- repos.sort(function(a,b) {
- return b.watchers - a.watchers;
- });
-
- var loop_count = 0;
- $(repos).each(function() {
- if (loop_count == 4){
- $('#github-projects').append('<div class="clear"></div>');
- loop_count = 0;
- }
- $('#github-projects').append("\
- <div class='box white one_quarter'>\
- <div class='contents'>\
- <div class='title'><h2>"+this.name+"</h2></div>\
- <p>"+ this.description + "</p>\
- <p><a href='"+this.url+"'>view project</a></p>\
- </div>\
- </div>");
- loop_count += 1;
+ $.githubUser('amerine', function(data) {
+ $('#github-projects').html('');
+
+ var repos = data.user.repositories;
+ repos.sort(function(a,b) {
+ return b.watchers - a.watchers;
+ });
+
+ var loop_count = 0;
+ $(repos).each(function() {
+ if (loop_count == 4){
+ $('#github-projects').append('<div class="clear"></div>');
+ loop_count = 0;
+ }
+ $('#github-projects').append("\
+ <div class='box white one_quarter'>\
+ <div class='contents'>\
+ <div class='title'><h2>"+this.name+"</h2></div>\
+ <p>"+ this.description + "</p>\
+ <p><a href='"+this.url+"'>view project</a></p>\
+ </div>\
+ </div>");
+ loop_count += 1;
+ });
});
- });
</script>
View
257 stylesheets/master.css
@@ -1,257 +0,0 @@
-body {
- font-family: Arial, sans-serif;
- letter-spacing: -0.05em;
- background: #595d5c;
- color: #353B40;
-}
-
-a {
- color: #4a3865;
- font-weight: bold;
-}
-
-a:visited {
- color: #353b40;
- font-weight: normal;
-}
-
-#wrapper {
- width: 960px;
- margin: 2em auto 0;
- padding: 0;
- background: #fff;
- -moz-border-radius: 1.5em;
- -webkit-border-radius: 1.5em;
- border-radius: 1.5em;
-}
-
-#header {
- text-transform: lowercase;
- text-align: left;
- background: #303445;
- -moz-border-radius-topleft: 1em;
- -webkit-border-top-left-radius: 1em;
- -moz-border-radius-topright: 1em;
- -webkit-border-top-right-radius: 1em;
- border-top-left-radius: 1em;
- border-top-right-radius: 1em;
- padding: 1.5em;
- text-align: center;
-}
-
-#header h1 {
- font-size: 4em;
- display: inline;
- letter-spacing: -0.08em;
- color: #fff;
- font-weight: normal;
-}
-
-#header h2 {
- display: inline;
- margin-left: 0.5em;
- font-size: 2em;
- font-weight: normal;
- color: #fed;
-}
-
-#menu {
- background: #4e608f;
-}
-
-#menu ul {
- list-style: none;
- margin: 0;
- text-align: center;
-}
-
-#menu ul li {
- display: inline;
-}
-
-#menu ul li a {
- color: white;
- font-size: 1.3em;
- padding: 0 0.5em;
- line-height: 2.5em;
- font-weight: normal;
-}
-
-#content {
- padding: 2em;
-}
-
-#content h2 {
- margin: 0 0 0.5em 0;
- color: black;
- font-size: 1.5em;
-}
-
-#content p {
- line-height: 140%;
- letter-spacing: -0.03em;
-}
-
-span.date {
- background: #5c8e82;
- display: block;
- padding: 0.4em 0.6em 0.3em;
- font-weight: bold;
- color: white;
- border-bottom: 3px solid #344;
- float: left;
-}
-
-div.post {
- margin-bottom: 2em;
-}
-
-.post h1 {
- margin-top: 0.2em;
-}
-
-.post h1 a {
- text-decoration: none;
- clear: left;
- display: block;
- color: black;
- padding: 0.3em 0;
- margin: 0 0 0.2em 0;
- border-bottom: 1px dashed #dba;
- font-weight: bold;
-}
-
-pre {
- background: #f8f8f8;
- border: 1px solid #E7E5DC;
- border-width: 4px 2px 4px 2px;
- padding: 7px;
- overflow: auto;
- color: black;
- line-height: 120%;
- font-family: "Consolas","Courier New",Courier,monospace;
- font-size: 12px;
- letter-spacing: 0;
-}
-
-table.post-list {
- width: 100%;
- border-collapse: collapse;
-}
-
-table.post-list a {
- color: #262;
- font-weight: bold;
-}
-
-table.post-list th {
- text-align: left;
-}
-
-table.post-list td, table.post-list th {
- padding: 0.5em 0.3em;
- border-bottom: 1px solid #dba;
-}
-
-table.post-list tr:last-child td, table.post-list tr:last-child th {
- border-bottom: 0;
-}
-
-div.related {
- margin-bottom: 2em;
-}
-
-#footer {
- margin-bottom: 2em;
- color: #dedddb;
- font-size: 0.9em;
- padding: 0.5em;
- text-align: center;
-}
-
-.home_box {
- float: left;
-}
-
-#content .home_box h2 {
- background: #5c8e82;
- padding: 0.3em 0.5em;
- border-bottom: 3px solid #344;
- margin-bottom: 0em;
- color: white;
-}
-
-.home_box h2 a {
- color: white;
- margin: 0 0.2em;
-}
-
-#home_left {
- width: 640px;
-}
-
-#home_right {
- width: 240px;
- margin-left: 1em;
-}
-
-.clearfix { clear: both;}
-
-#footer a {
- color: #a5b1ef;
- font-weight: normal;
-}
-
-code {
- background: #fff5dd;
- font-size: 14px;
- font-family: "Consolas","Courier New",Courier,monospace;
-}
-
-.highlight code {
- background: #f8f8f8;
-}
-
-.home_box .post h1 a {
- font-size: 0.7em;
-}
-
-.repo {
- background: #fff5cc;
- border: 2px solid #dba;
- padding: 0.7em 1em;
- font-size: 0.8em;
- letter-spacing: -0.03em;
- margin: 1em 1em 0 0;
- -moz-border-radius: 0.5em;
- -webkit-border-radius: 0.5em;
- border-radius: 0.5em;
-}
-.repo h3 {
- margin: 0 0 0.3em 0;
-}
-.repo h3 a {
- font-weight: bold;
- color: black;
- letter-spacing: 0;
- font-size: 1.1em;
-}
-
-#github-projects.big .repo {
- float: left;
- width: 25.2em;
- margin: 1.2em 1em 0 0;
- display: inline-block;
- float: none;
- vertical-align: top;
-}
-
-.float-left { float: left; }
-.float-right { float: right; }
-
-a img { border: 0; }
-
-#ad-block {
- float: right;
- padding: 10px;
-}
View
6 stylesheets/style.css
@@ -35,7 +35,7 @@ hr { border: 0 solid #e1e1e1; border-top-width: 1px; clear: both; height: 0; mar
ol { list-style: decimal; }
ul { list-style: none; }
li {}
-p{font: normal 15px/20px Palatino, "Palatino Linotype", serif; text-rendering: optimizeLegibility;}
+p{}
pre {}
code {}
blockquote {}
@@ -142,7 +142,7 @@ blockquote {}
#content section#intro a{display: block; width: 100%; text-align: right; font-family: Georgia, 'Times New Roman', Times, serif; font-weight: bold;}
#content section.main{background: #ffffff; padding: 10px 0px 10px 10px; }
- #content section.main .white{text-rendering: optimizeLegibility; color: black; }
+ #content section.main .white{text-rendering: optimizeLegibility;}
#content section.main .white img{display: block;margin-bottom: 5px;}
#content section.main .white h2{ height: 36px; color: #ffffff; background: #0065A7; padding: 5px 10px 7px 15px; display: inline;}
#content section.main .white .elements{background-color: #f6f6f6 ;padding: 15px;}
@@ -220,7 +220,7 @@ blockquote {}
#content section.blog #posts{float: left; width: 710px; margin-right: 10px;}
#content section.blog article{width: 710px; margin-bottom: 10px; padding-top: 25px;}
- #content section.blog article .elements{padding: 20px;}
+ #content section.blog article .elements{text-rendering: optimizeLegibility; padding: 20px;}
#content section.blog article .title{ border-bottom: 1px solid #e1e1e1; padding: 0px 0px 0px 0px; }
#content section.blog article h1, #content section.blog article h2, #content section.blog article h3{color: #323232;}
#content section.blog article .title h1 {margin: 0px; padding: 0px; float: left; width: 670px;}
View
10 talks.html
@@ -9,10 +9,10 @@
<section class="pageamerine white">
- <div class="elements">
- <h2>Coming Soon</h2>
- </div>
+<div class="elements">
+ <h2>Coming Soon</h2>
+</div>
- <div class="clear"></div>
+<div class="clear"></div>
-</section>
+</section>

0 comments on commit 1a9d0f2

Please sign in to comment.
Something went wrong with that request. Please try again.