Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: fxjz/fxjz.org
base: 53faf7a27b
...
head fork: fxjz/fxjz.org
compare: c9dd008c99
  • 2 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
5 CssMinify.yml
View
@@ -0,0 +1,5 @@
+files: [
+ 'assets/css/bootstrap.min.css',
+ 'assets/css/bootstrap-responsive.min.css',
+ 'assets/css/master.css'
+]
4 _config.yml
View
@@ -1,5 +1,5 @@
-auto: true
-server: true
+auto: false
+server: false
exclude: drafts
12 _includes/bio.html
View
@@ -8,14 +8,14 @@
<div class="social_networks row">
<div class="social_network span2">
- <a href="http://twitter.com/fxjz">@fxjz<br>
+ <a href="http://twitter.com/fxjz/">@fxjz<br>
<span>on Twitter</span>
</a>
</div><!-- /twitter -->
<div class="social_network span2">
- <a href="http://github.com/fxjz">fxjz<br>
- <span>on Github</span>
+ <a href="http://github.com/fxjz/">fxjz<br>
+ <span>on GitHub</span>
</a>
</div><!-- /github -->
@@ -28,7 +28,7 @@
</div><!-- /rdio -->
<div class="social_network span2">
- <a href="http://last.fm/user/fxjz">fxjz<br>
+ <a href="http://last.fm/user/fxjz/">fxjz<br>
<span>on Last.fm</span>
</a>
</div><!-- /last.fm -->
@@ -36,13 +36,13 @@
<div class="social_network span2">
- <a href="http://pinboard.in/u:fxjz">fxjz<br>
+ <a href="http://pinboard.in/u:fxjz/">fxjz<br>
<span>on Pinboard</span>
</a>
</div><!-- /pinboard -->
<div class="social_network span2">
- <a href="http://readability.com/fxjz/latest">fxjz<br>
+ <a href="http://readability.com/fxjz/latest/">fxjz<br>
<span>on Readability</span>
</a>
</div><!-- /readability -->
6 _layouts/default.html
View
@@ -4,7 +4,7 @@
<title>{% if page.title %}{{ page.title }} &bull;{% endif %} Felix Jimenez</title>
<meta name="author" content="Felix Jimenez">
- <meta name="description" content="The journal of Felix Jimenez">
+ <meta name="description" content="The blog of Felix Jimenez">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="utf-8">
@@ -15,7 +15,7 @@
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
- <link rel="stylesheet" href="/assets/css/master.css">
+ <link rel="stylesheet" href="{% minified_css_file %}">
<link rel="shortcut icon" href="/assets/img/favicon.png">
</head>
@@ -28,7 +28,7 @@
<ol>
<li><a href="/" class="home">Felix Jimenez</a></li>
<!-- <li><a href="/projects/">Projects</a></li> -->
- <!-- <li><a href="/about/">About</a></li> -->
+ <li><a href="/about/">About</a></li>
<!-- <li><a href="/contact/">Contact</a></li> -->
</ol>
</nav>
85 _plugins/CssMinify.rb
View
@@ -0,0 +1,85 @@
+module Jekyll
+ $minified_filename = ''
+
+ # use this as a workaround for getting cleaned up
+ # reference: https://gist.github.com/920651
+ class CssMinifyFile < StaticFile
+ def write(dest)
+ # do nothing
+ end
+ end
+
+ # minify css files
+ class CssMinifyGenerator < Generator
+ safe true
+
+ def generate(site)
+ config = Jekyll::CssMinifyGenerator.get_config
+
+ files_to_minify = config['files'] || get_css_files(site, config['css_source'])
+
+ last_modified = files_to_minify.reduce( Time.at(0) ) do |latest,filepath|
+ modified = File.mtime(filepath)
+ modified > latest ? modified : latest
+ end
+ # reset the minified filename
+ $minified_filename = last_modified.strftime("%Y%m%d%H%M") + '.min.css'
+
+ output_dir = File.join(site.config['destination'], config['css_destination'])
+ output_file = File.join(output_dir, $minified_filename)
+
+ # need to create destination dir if it doesn't exist
+ FileUtils.mkdir_p(output_dir)
+ minify_css(files_to_minify, output_file)
+ site.static_files << CssMinifyFile.new(site, site.source, config['css_destination'], $minified_filename)
+ end
+
+ # read the css dir for the css files to compile
+ def get_css_files(site, relative_dir)
+ # not sure if we need to do this, but keep track of the current dir
+ pwd = Dir.pwd
+ Dir.chdir(File.join(site.config['source'], relative_dir))
+ # read css files
+ css_files = Dir.glob('*.css').map{ |f| File.join(relative_dir, f) }
+ Dir.chdir(pwd)
+
+ return css_files
+ end
+
+ def minify_css(css_files, output_file)
+ css_files = css_files.join(' ')
+ juice_cmd = "juicer merge -f #{css_files} -o #{output_file}"
+ puts juice_cmd
+ system(juice_cmd)
+ end
+
+ # Load configuration from CssMinify.yml
+ def self.get_config
+ if @config == nil
+ @config = {
+ 'css_source' => 'css', # relative to the route
+ 'css_destination' => '/css' # relative to site.config['destination']
+ }
+ config = YAML.load_file('CssMinify.yml') rescue nil
+ if config.is_a?(Hash)
+ @config = @config.merge(config)
+ end
+ end
+
+ return @config
+ end
+ end
+
+ class CssMinifyLinkTag < Liquid::Tag
+ def initialize(tag_name, text, tokens)
+ super
+ end
+
+ def render(context)
+ config = Jekyll::CssMinifyGenerator.get_config
+ File.join(config['css_destination'], $minified_filename)
+ end
+ end
+end
+
+Liquid::Template.register_tag('minified_css_file', Jekyll::CssMinifyLinkTag)
91 about.html
View
@@ -0,0 +1,91 @@
+---
+layout: default
+title: About
+---
+
+<section id="about-fxjz" class="span6">
+ <h2>About Felix Jimenez</h2>
+
+ <h3>tl;dr</h3>
+ <p>
+ I'm a two cat and one dog owning, Northern Virginia living, road trip
+ loving, car enthusiastic, web specializing geek who provides web design
+ and hosting services through my company,
+ <a href="http://kindaodd.com" class="kindaodd">kinda+odd</a>.
+ </p>
+
+ <h3>Semi-coherent bio</h3>
+ <p>
+ I currently live in
+ <a href="http://en.wikipedia.org/wiki/Northern_Virginia">Northern
+ Virginia</a> where I have two cats and a dog. I run a small web studio
+ called <a href="http://kindaodd.com" class="kindaodd">kinda+odd</a>
+ which provides small businesses with web design and hosting services.
+ </p>
+
+ <p>
+ When I'm not on a computer I'm often looking into automotive matters or
+ taking one of my spontaneous road trips where I place a bias towards the
+ <a href="http://en.wikipedia.org/wiki/United_States_Numbered_Highways">US
+ Highway System</a> in an attempt to avoid the
+ <a href="http://en.wikipedia.org/wiki/Interstate_Highway">Interstate
+ System</a> so I can see more interesting places.
+ </p>
+
+ <p>
+ I can be found in many online communities, but mainly I like to tweet
+ like no one is watching on <a href="http://twitter.com/fxjz/">Twitter</a>,
+ store my web projects on <a href="http://github.com/fxjz/">GitHub</a>,
+ listen to my music on <a href="http://rdio.com/people/fxjz/">Rdio</a>,
+ chart my music history on <a href="http://last.fm/user/fxjz/">Last.fm</a>,
+ bookmark cool stuff on <a href="http://pinboard.in/u:fxjz/">Pinboard</a>,
+ and maintain an interesting (to me) reading list on
+ <a href="http://readability.com/fxjz/latest/">Readability</a>.
+ </p>
+
+ <h3>Trivia</h3>
+ <ul class="trivia">
+ <li>
+ Because of Hulu and Netflix, I haven't watched cable television in
+ years.
+ </li>
+
+ <li>
+ I still have all but my very first cell phone.
+ </li>
+
+ <li>
+ I sometimes read random Wikipedia pages for kicks.
+ </li>
+
+ <li>
+ I've lived in PR, MD, VA, NJ, NC, and OR, in no particular order.
+ </li>
+ </ul>
+</section>
+
+<section id="about-site" class="span6">
+ <h2>About this site</h2>
+
+ <p>
+ This is a personal space. It's a place for me to collect my thoughts and
+ interests and a place for me to test new ideas I may have. Most of what
+ you'll find here are blog posts which are either long-form articles or
+ links to other stuff with commentary. Occasionally you may stumble
+ across some other tidbits, but who knows.
+ </p>
+
+ <p>
+ The site is powered by <a href="http://jekyllrb.com/">Jekyll</a> so it's
+ all static files and that makes it very fast and very flexible for me.
+ It also means that the <a href="http://github.com/fxjz/fxjz.org">entire
+ source code</a> is available and easy to understand. The typeface used
+ is <a href="http://www.google.com/webfonts/specimen/Lato">Lato</a>.
+ </p>
+
+ <p>
+ Fast <span class="amp">&amp;</span> secure web hosting is provided by
+ <a href="http://kindaodd.com" class="kindaodd">kinda+odd</a>, the small
+ web studio I run.
+ </p>
+</section>
47 assets/css/master.css
View
@@ -1,7 +1,33 @@
-/* import bootstrap */
-@import url(http://fonts.googleapis.com/css?family=Lato:300,400,300italic,700|Lobster+Two);
-@import url("bootstrap.min.css");
-@import url("bootstrap-responsive.min.css");
+/* START: Google web fonts
+==============================================================================*/
+@font-face {
+ font-family: 'Lobster Two';
+ font-style: italic;
+ font-weight: 400;
+ src: local('Lobster Two Italic'), local('LobsterTwo-Italic'), url('http://themes.googleusercontent.com/static/fonts/lobstertwo/v4/Ul_16MSbfayQv1I4QhLEoIo3ZslTYfJv0R05CazkwN8.woff') format('woff');
+}
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 300;
+ src: local('Lato Light'), local('Lato-Light'), url('http://themes.googleusercontent.com/static/fonts/lato/v6/kcf5uOXucLcbFOydGU24WALUuEpTyoUstqEm5AMlJo4.woff') format('woff');
+}
+@font-face {
+ font-family: 'Lato';
+ font-style: italic;
+ font-weight: 300;
+ src: local('Lato Light Italic'), local('Lato-LightItalic'), url('http://themes.googleusercontent.com/static/fonts/lato/v6/2HG_tEPiQ4Z6795cGfdivLO3LdcAZYWl9Si6vvxL-qU.woff') format('woff');
+}
+@font-face {
+ font-family: 'Lato';
+ font-style: normal;
+ font-weight: 400;
+ src: local('Lato Regular'), local('Lato-Regular'), url('http://themes.googleusercontent.com/static/fonts/lato/v6/qIIYRU-oROkIk8vfvxw6QvesZW2xOQ-xsNqO47m55DA.woff') format('woff');
+}
+
+/* END: Google web fonts
+------------------------------------------------------------------------------*/
+
/* START: Basic styling
@@ -52,15 +78,20 @@ blockquote {
ul, ol {margin-left: 0;}
-article ul li, article ol li {line-height: 160%;}
+#canvas ul li, #canvas ol li {line-height: 160%;}
-a.kindaodd {color: #f78e1e;}
-a.kindaodd:hover {background: #f78e1e; color: #fff;}
+a.kindaodd {color: #f78e1e !important;}
+a.kindaodd:hover {background: #f78e1e !important; color: #fff !important;}
br {clear: both;}
+span.amp {
+ font-family: Baskerville, "Palatino Linotype", Constantia, serif;
+ font-style: italic;
+}
+
/* END: Basic styling
------------------------------------------------------------------------------*/
@@ -108,7 +139,7 @@ header nav ol li a:hover {background: rgba(255, 255, 255, 0.20);}
==============================================================================*/
article {margin-bottom: 96px;}
-article .entry, aside {text-align: justify;}
+article .entry, aside, section {text-align: justify;}
.entry img {margin: 0;}

No commit comments for this range

Something went wrong with that request. Please try again.