diff --git a/.gitignore b/.gitignore index 5289e9a..bf425bd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ .sass-cache _gist_cache _code_cache -_assets _deploy public source/_stash diff --git a/Gemfile b/Gemfile index 15c570b..8b7de0f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,7 @@ source "http://rubygems.org" gem 'rake' +gem 'rack' gem 'jekyll' gem 'rdiscount' gem 'RedCloth' diff --git a/Gemfile.lock b/Gemfile.lock index 04fb1b5..b103020 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,6 +21,7 @@ GEM liquid (2.2.2) maruku (0.6.0) syntax (>= 1.0.0) + rack (1.3.0) rake (0.9.0) rb-fsevent (0.4.0) rdiscount (1.6.8) @@ -36,6 +37,7 @@ DEPENDENCIES compass (>= 0.11) haml (>= 3.1) jekyll + rack rake rb-fsevent rdiscount diff --git a/README.markdown b/README.markdown index c355653..e40edf9 100644 --- a/README.markdown +++ b/README.markdown @@ -2,7 +2,7 @@ 2. **Code blogging is easy and beautiful.** Embed code (with [Solarized](http://ethanschoonover.com/solarized) styling) in your posts from gists or from your filesystem. 3. **Third party integration is simple** with built-in support for Twitter, Pinboard, Delicious, Disqus Comments, and Google Analytics. 4. **It's easy to use.** A collection of rake tasks simplifies development and makes deploying a cinch. -5. **Get curated plugins.** Plugins are hand selected from the Jekyll community then tested and improved. +5. **Ships with great plugins** some original and others from the Jekyll community — tested and improved. ## Getting Started @@ -10,8 +10,6 @@ open up a terminal and follow along. If you plan to host your site on [Github Pages](http://pages.github.com) for a user or organization, make sure the repository is named `your_username.github.com` or `your_organization.github.com`. -### Setting up Git - mkdir my_octopress_site cd my_octopress_site git init @@ -26,8 +24,7 @@ repository is named `your_username.github.com` or `your_organization.github.com` git push origin source -### Setting up Octopress -Next, setup an [RVM](http://beginrescueend.com/) and install dependencies. +Next, setup an [RVM](http://beginrescueend.com/) and install dependencies. rvm rvmrc trust bundle install diff --git a/_config.yml b/_config.yml index 7a877eb..05a66f6 100644 --- a/_config.yml +++ b/_config.yml @@ -4,8 +4,9 @@ destination: public code_dir: downloads/code port: 4000 -url: http://dev.octopress.org -title: Octopress +url: http://yoursite.com +title: My Octopress Blog +permalink: /blog/:year/:month/:day/:title subtitle: A blogging framework for hackers. author: Your Name subscribe_rss: /atom.xml @@ -13,7 +14,8 @@ subscribe_email: markdown: rdiscount pygments: true -posts_per_page: 10 +#posts_per_page: 10 +paginate: 5 recent_posts: 5 simple_search: http://google.com/search @@ -23,7 +25,7 @@ simple_search: http://google.com/search email: # Twitter -twitter_user: imathis +twitter_user: twitter_tweet_count: 4 twitter_show_replies: false twitter_follow_button: true @@ -31,7 +33,7 @@ twitter_show_follower_count: false twitter_tweet_button: true # Pinboard -#pinboard_user: imathis +pinboard_user: pinboard_count: 3 # Delicious diff --git a/config.ru b/config.ru new file mode 100644 index 0000000..060867f --- /dev/null +++ b/config.ru @@ -0,0 +1,35 @@ +require 'rubygems' +require 'bundler/setup' +require 'rack' + +# The project root directory +$root = ::File.dirname(__FILE__) + +# Common Rack Middleware +use Rack::ShowStatus # Nice looking 404s and other messages +use Rack::ShowExceptions # Nice looking errors + +# +# From Rack::DirectoryIndex: +# https://github.com/craigmarksmith/rack-directory-index/ +# +module Rack + class DirectoryIndex + def initialize(app) + @app = app + end + def call(env) + index_path = ::File.join($root, 'public', Rack::Request.new(env).path.split('/'), 'index.html') + if ::File.exists?(index_path) + return [200, {"Content-Type" => "text/html"}, [::File.read(index_path)]] + else + @app.call(env) + end + end + end +end + +use Rack::DirectoryIndex + +run Rack::Directory.new($root + '/public') + diff --git a/themes/classic/_plugins/custom_filters.rb b/themes/classic/_plugins/custom_filters.rb index 0d24d72..d1fce0d 100644 --- a/themes/classic/_plugins/custom_filters.rb +++ b/themes/classic/_plugins/custom_filters.rb @@ -48,7 +48,7 @@ module OctopressFilters else case number.to_i % 10 when 1; "#{number}st" - when 2; "#{number}nd" + when 2; "#{number}nd" when 3; "#{number}rd" else "#{number}th" end diff --git a/themes/classic/sass/core/_layout.scss b/themes/classic/sass/core/_layout.scss index 8ad14a9..b24e1b2 100644 --- a/themes/classic/sass/core/_layout.scss +++ b/themes/classic/sass/core/_layout.scss @@ -1,8 +1,12 @@ $max-width: 1200px !default; + +// Padding used for layout margins $pad-min: 18px !default; $pad-narrow: 25px !default; $pad-medium: 35px !default; $pad-wide: 55px !default; + +// Sidebar widths used in media queries $sidebar-width-medium: 240px !default; $sidebar-pad-medium: 15px !default; $sidebar-pad-wide: 20px !default; @@ -15,7 +19,7 @@ body { max-width: $max-width; position: relative; margin: 0 auto; - > header, > nav, > footer, #articles > article { + > header, > nav, > footer, #articles > article, #articles > nav { @extend .group; padding-left: $pad-min; padding-right: $pad-min; diff --git a/themes/classic/sass/core/_typography.scss b/themes/classic/sass/core/_typography.scss index 3e07c93..8ab0e65 100644 --- a/themes/classic/sass/core/_typography.scss +++ b/themes/classic/sass/core/_typography.scss @@ -53,7 +53,7 @@ h6, section h5, section section h4, section section section h3 { } p, blockquote, ul, ol { margin-bottom: 1.5em; } -ul{ list-style-type: disc; } +ul{ list-style-type: circle; } ol{ list-style-type: decimal; ol { list-style-type: lower-alpha; } } ul ul, ol ol { margin-left: 1.75em; } diff --git a/themes/classic/sass/partials/_blog.scss b/themes/classic/sass/partials/_blog.scss index 485f5e8..12f596a 100644 --- a/themes/classic/sass/partials/_blog.scss +++ b/themes/classic/sass/partials/_blog.scss @@ -46,7 +46,6 @@ $border: inline-image('dotted-border.png'); background: $border bottom left repeat-x; p.meta { position: static; } } - } h1.feature { padding-top: .5em; @@ -58,12 +57,15 @@ $border: inline-image('dotted-border.png'); } .entry-content { img, video { max-width: 100%; height: auto; } - video { display: block; margin-bottom: 1.5em; + video { + width: 100%; display: block; margin-bottom: 1.5em; padding: .8em; background: #fff; border: 1px solid #eee; @include box-sizing(border-box); } .flash-video { max-width: 100%; + margin-bottom: 1.5em; + @include box-sizing(border-box); padding: .8em; background: #fff; border: 1px solid #eee; > div { position: relative; @@ -82,12 +84,7 @@ $border: inline-image('dotted-border.png'); } } } - #disqus_thread { } - iframe.twitter-share-button { - //display: block; - //margin-top: .5em; - //padding: .2em 0; position: relative; top: .3em; padding-left: .5em; diff --git a/themes/classic/sass/partials/_page.scss b/themes/classic/sass/partials/_page.scss index 8bda58e..99a07eb 100644 --- a/themes/classic/sass/partials/_page.scss +++ b/themes/classic/sass/partials/_page.scss @@ -2,7 +2,6 @@ html { background: $page-bg inline-image('line-tile.png') top left; } body { - border: 0 0 1px 0 solid darken($page-bg, 5); > div { background-color: $sidebar-bg; border-bottom: 1px solid $page-border-bottom; @@ -12,7 +11,3 @@ body { } } } - -@media only screen and (min-width: 1400px) { - body { border: 0 1px 0 solid darken($page-bg, 5); } -} diff --git a/themes/classic/sass/partials/_syntax.scss b/themes/classic/sass/partials/_syntax.scss index 7ee650c..dc6472f 100644 --- a/themes/classic/sass/partials/_syntax.scss +++ b/themes/classic/sass/partials/_syntax.scss @@ -51,17 +51,20 @@ html .gist .gist-file { } } pre { - background: #fff; - border: 1px solid #ddd; + background: #333; @include border-radius(.4em); @extend .mono; line-height: 1.45em; font-size: .8em; margin-bottom: 1.5em; padding: .8em 1em; - color: #555; + color: #ccc; overflow: auto; } +h3.filename { + @extend .code-title; + + pre { @include border-top-radius(0px); } +} p code { @extend .mono; @@ -172,16 +175,14 @@ figure { } .highlight { margin-bottom: 0; border-bottom: 1px solid darken($base03, 2) !important; } } -h3.filename { @extend .code-title; } .code-title { text-align: center; font-size: 13px; line-height: 2em; text-shadow: #cbcccc 0 1px 0; color: #474747; - font-style: normal; + font-weight: normal; margin-bottom: 0; - @include border-top-radius(5px); font-family: "Helvetica Neue", Arial, "Lucida Grande", "Lucida Sans Unicode", Lucida, sans-serif; background: #aaaaaa image-url("code_bg.png") top repeat-x; diff --git a/themes/classic/source/_includes/disqus_thread.html b/themes/classic/source/_includes/disqus_thread.html index 2b13779..f966f03 100644 --- a/themes/classic/source/_includes/disqus_thread.html +++ b/themes/classic/source/_includes/disqus_thread.html @@ -3,7 +3,7 @@ var disqus_shortname = '{{ site.disqus_short_name }}'; var disqus_identifier = '{{ site.url }}{{ page.url }}'; var disqus_url = '{{ site.url }}{{ page.url }}'; - var disqus_developer = 1; + //var disqus_developer = 1; (function() { var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; diff --git a/themes/classic/source/_includes/head.html b/themes/classic/source/_includes/head.html index d97a6a0..a4eec3d 100644 --- a/themes/classic/source/_includes/head.html +++ b/themes/classic/source/_includes/head.html @@ -26,7 +26,7 @@ - + diff --git a/themes/classic/source/_includes/post_author.html b/themes/classic/source/_includes/post_author.html new file mode 100644 index 0000000..a62a68a --- /dev/null +++ b/themes/classic/source/_includes/post_author.html @@ -0,0 +1,6 @@ +{% if page.author %} + {% assign author = page.author %} +{% else %} + {% assign author = site.author %} +{% endif %} +{% if author %}Posted by {{ author }}{% endif %} diff --git a/themes/classic/source/_includes/post_date.html b/themes/classic/source/_includes/post_date.html new file mode 100644 index 0000000..e8455a6 --- /dev/null +++ b/themes/classic/source/_includes/post_date.html @@ -0,0 +1,6 @@ +{% if page.date %} + +{% endif %} +{% if page.updated %} + +{% endif %} diff --git a/themes/classic/source/_includes/sharing.html b/themes/classic/source/_includes/sharing.html new file mode 100644 index 0000000..ad3112e --- /dev/null +++ b/themes/classic/source/_includes/sharing.html @@ -0,0 +1 @@ + diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/background.png b/themes/classic/source/assets/jwplayer/glow/controlbar/background.png new file mode 100644 index 0000000..c2824cc Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/background.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png b/themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png new file mode 100644 index 0000000..010159f Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/blankButton.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/divider.png b/themes/classic/source/assets/jwplayer/glow/controlbar/divider.png new file mode 100644 index 0000000..77cd829 Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/divider.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png b/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png new file mode 100644 index 0000000..e06aa50 Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButton.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png b/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png new file mode 100644 index 0000000..d2bc4fc Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png b/themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png new file mode 100644 index 0000000..40c40ab Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/muteButton.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png b/themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png new file mode 100644 index 0000000..96fe7bb Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/muteButtonOver.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png b/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png new file mode 100644 index 0000000..2229507 Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButton.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png b/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png new file mode 100644 index 0000000..15db44d Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png b/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png new file mode 100644 index 0000000..e399bf3 Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButton.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png b/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png new file mode 100644 index 0000000..409d89d Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/pauseButtonOver.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png b/themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png new file mode 100644 index 0000000..f8d9a00 Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/playButton.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png b/themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png new file mode 100644 index 0000000..3fe2848 Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/playButtonOver.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png new file mode 100644 index 0000000..73b371a Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png new file mode 100644 index 0000000..7232217 Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png new file mode 100644 index 0000000..626444a Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png new file mode 100644 index 0000000..132a8e7 Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderProgress.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png new file mode 100644 index 0000000..27851df Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/timeSliderRail.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png b/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png new file mode 100644 index 0000000..3658453 Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButton.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png b/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png new file mode 100644 index 0000000..138ebb3 Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/display/background.png b/themes/classic/source/assets/jwplayer/glow/display/background.png new file mode 100644 index 0000000..391152f Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/display/background.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png b/themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png new file mode 100644 index 0000000..a3819c1 Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/display/bufferIcon.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/display/muteIcon.png b/themes/classic/source/assets/jwplayer/glow/display/muteIcon.png new file mode 100644 index 0000000..e0408bb Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/display/muteIcon.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/display/playIcon.png b/themes/classic/source/assets/jwplayer/glow/display/playIcon.png new file mode 100644 index 0000000..cb38427 Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/display/playIcon.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/dock/button.png b/themes/classic/source/assets/jwplayer/glow/dock/button.png new file mode 100644 index 0000000..391152f Binary files /dev/null and b/themes/classic/source/assets/jwplayer/glow/dock/button.png differ diff --git a/themes/classic/source/assets/jwplayer/glow/glow.xml b/themes/classic/source/assets/jwplayer/glow/glow.xml new file mode 100644 index 0000000..7d5ba03 --- /dev/null +++ b/themes/classic/source/assets/jwplayer/glow/glow.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + +