Permalink
Browse files

minor fixes

  • Loading branch information...
1 parent 5963e9f commit ea4266a8387906d0d973b91c8a1ac0969a25afeb William Smith committed Feb 22, 2008
Showing with 13 additions and 11 deletions.
  1. +11 −11 Rakefile
  2. +2 −0 public/stylesheets/master.css
View
22 Rakefile
@@ -8,27 +8,27 @@ require 'rake/testtask'
require 'spec/rake/spectask'
require 'fileutils'
require 'merb-core'
+require 'rubigen'
$RAKE_ENV = true
-init_file = File.join(File.dirname(__FILE__) / "config" / "init")
-
-Merb.load_dependencies(init_file)
-
+Merb.start :environment => (ENV['MERB_ENV'] || 'development'),
+ :adapter => 'runner',
+ :merb_root => File.dirname(__FILE__)
+
include FileUtils
-Merb::Plugins.rakefiles.each {|r| require r }
+# # # Get Merb plugins and dependencies
+Merb::Plugins.rakefiles.each {|r| require r }
+#
#desc "Packages up Merb."
#task :default => [:package]
-# Make the default task run specs for now
-task :default => [:specs]
-
desc "load merb_init.rb"
task :merb_init do
- # deprecated - here for BC
- # Rake::Task['merb_env'].invoke
-end
+ require 'merb-core'
+ require File.dirname(__FILE__)+'/config/init.rb'
+end
task :uninstall => [:clean] do
sh %{sudo gem uninstall #{NAME}}
View
2 public/stylesheets/master.css
@@ -10,6 +10,8 @@ a:visited {
color: #333;
}
+fieldset p+p{text-indent:0;}
+
#header {
background: #333;
padding: 0 2em;

0 comments on commit ea4266a

Please sign in to comment.