From 6c9f1567ce4a4ac29d33f20533618b462285a4f2 Mon Sep 17 00:00:00 2001 From: B Mathis Date: Thu, 5 Nov 2009 21:58:04 -0600 Subject: [PATCH] updated rakefile, added some basic twitter files --- Rakefile | 18 ++++++++---------- stylesheets/library/_typography.sass | 2 +- stylesheets/partials/_twitter.sass | 8 +++++++- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/Rakefile b/Rakefile index cc4aa74..236a5c0 100644 --- a/Rakefile +++ b/Rakefile @@ -20,35 +20,35 @@ end desc "generate website in output directory" task :default => [:generate_site, :generate_style] do - puts "--Site Generating Complete!--" + puts ">>> Site Generating Complete! <<<" end desc "list tasks" task :list do - puts "Tasks: #{(Rake::Task.tasks - [Rake::Task[:default]]).to_sentence}" + puts "Tasks: #{(Rake::Task.tasks - [Rake::Task[:list]]).to_sentence}" puts "(type rake -T for more detail)\n\n" end desc "remove files in output directory" task :clean do - puts "Removing output..." + puts ">>> Removing output <<<" Dir["#{site}/*"].each { |f| rm_rf(f) } end task :clean_debug do - puts "Removing debug pages..." + puts ">>> Removing debug pages <<<" Dir["#{site}/debug"].each { |f| rm_rf(f) } end desc "Generate styles only" task :generate_style do - puts "Generating website..." + puts ">>> Generating styles <<<" system "compass" end desc "Generate site files only" task :generate_site => :clean do - puts "Generating website..." + puts ">>> Generating site files <<<" system "jekyll" system "mv #{site}/atom.html #{site}/atom.xml" end @@ -75,20 +75,18 @@ task :watch do delete {|base, relative| rebuild_site(relative)} create {|base, relative| rebuild_site(relative)} end - path "#{File.dirname(__FILE__)}/#{source}/stylesheets" do + path "#{File.dirname(__FILE__)}/stylesheets" do glob '**/*.sass' update {|base, relative| rebuild_style(relative)} delete {|base, relative| rebuild_style(relative)} create {|base, relative| rebuild_style(relative)} end end - FSSM.monitor("#{File.dirname(__FILE__)}/#{source}/stylesheets", '**/*') do - end desc "generate and deploy website" multitask :deploy => [:default, :clean_debug] do - print "Deploying website..." + print ">>> Deploying website <<<" ok_failed system("rsync -avz --delete #{site}/ #{ssh_user}:#{document_root}") end diff --git a/stylesheets/library/_typography.sass b/stylesheets/library/_typography.sass index a1b5c63..f5026cf 100644 --- a/stylesheets/library/_typography.sass +++ b/stylesheets/library/_typography.sass @@ -58,7 +58,7 @@ =typography-defaults(!font_size = !base_font_size) body - line-height= ceil(!font_size * 1.625) + line-height: 1.625em color= !base_font_color p +p-style(!font_size) diff --git a/stylesheets/partials/_twitter.sass b/stylesheets/partials/_twitter.sass index baeef5b..7cac8b3 100644 --- a/stylesheets/partials/_twitter.sass +++ b/stylesheets/partials/_twitter.sass @@ -1,2 +1,8 @@ #twitter - font-size: 85% \ No newline at end of file + font-size: 85% + p + +border-radius + padding: 10px 15px + margin-bottom: 15px + background: #eee + line-height: 1.625em \ No newline at end of file