new compass, updated specs

This commit is contained in:
tdreyno 2010-08-03 20:56:50 -07:00
parent fd83e83782
commit 2647c1da80
11 changed files with 41 additions and 42 deletions

View file

@ -16,15 +16,15 @@ begin
gem.add_dependency("rack")
gem.add_dependency("thin")
gem.add_dependency("shotgun")
gem.add_dependency("shotgun", ">=0.8")
gem.add_dependency("templater")
gem.add_dependency("sprockets")
gem.add_dependency("sinatra", ">=1.0")
gem.add_dependency("sinatra-content-for")
gem.add_dependency("rack-test")
gem.add_dependency("yui-compressor")
gem.add_dependency("haml", ">=3.0.0.rc.1")
gem.add_dependency("compass", ">=0.10.0.rc3")
gem.add_dependency("haml", ">=3.0")
gem.add_dependency("compass", ">=0.10")
gem.add_dependency("fancy-buttons")
gem.add_dependency("json_pure")
gem.add_dependency("smusher")

View file

@ -1 +1 @@
0.14.0.pre2
0.14.0

View file

@ -50,7 +50,7 @@ end
require 'shotgun'
config = File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'config.ru')
app = Shotgun.new(config, lambda { |inner_app| Middleman::Base })
app = Shotgun.new(config, &lambda { |inner_app| Middleman::Base })
require 'rubygems'
require 'thin'

View file

@ -19,4 +19,4 @@ Feature: Minify CSS
Scenario: Rendering external css with the feature disabled
Given "minify_css" feature is "disabled"
When I go to "/stylesheets/site.css"
Then I should see "56" lines
Then I should see "51" lines

View file

@ -23,5 +23,6 @@ Then /^I should not see "([^\"]*)"$/ do |expected|
end
Then /^I should see "([^\"]*)" lines$/ do |lines|
puts @browser.last_response.body
@browser.last_response.body.chomp.split($/).length.should == lines.to_i
end

View file

@ -1,6 +1,5 @@
require "sass"
require "compass"
require "compass-colors"
require "fancy-buttons"
begin

View file

@ -1,25 +1,25 @@
@import compass.sass
@import blueprint.sass
@import "compass"
@import "blueprint"
!font_color = #2a2a2a
!link_color = #0388a6
!link_hover_color = #009ce0
!link_focus_color = !link_color
!link_active_color = !link_color
!link_visited_color = !link_color
$font-color: #2a2a2a
$link-color: #0388a6
$link-hover-color: #009ce0
$link-focus-color: $link-color
$link-active-color: $link-color
$link-visited-color: $link-color
!blueprint_font_family = "'Century Gothic', 'Apple Gothic', 'Helvetica Neue', arial, sans-serif"
!blueprint_font_size = 13px
!blueprint_grid_columns = 12
!blueprint_grid_width = 60px
!blueprint_grid_margin = 20px
$blueprint-font-family: 'Century Gothic', 'Apple Gothic', 'Helvetica Neue', arial, sans-serif
$blueprint-font-size: 13px
$blueprint-grid-columns: 12
$blueprint-grid-width: 60px
$blueprint-grid-margin: 20px
+global-reset
+blueprint-typography
a
+link-colors(!link_color, !link_hover_color, !link_focus_color, !link_active_color, !link_visited_color)
+link-colors($link-color, $link-hover-color, $link-focus-color, $link-active-color, $link-visited-color)
#frame
padding: 50px

View file

@ -1,15 +1,15 @@
# Generated by jeweler
# DO NOT EDIT THIS FILE DIRECTLY
# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
# DO NOT EDIT THIS FILE
# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
# -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
s.name = %q{middleman}
s.version = "0.14.0.pre2"
s.version = "0.14.0"
s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Thomas Reynolds"]
s.date = %q{2010-04-28}
s.date = %q{2010-06-09}
s.email = %q{tdreyno@gmail.com}
s.executables = ["mm-init", "mm-build", "mm-server"]
s.extra_rdoc_files = [
@ -99,7 +99,7 @@ Gem::Specification.new do |s|
s.rdoc_options = ["--charset=UTF-8"]
s.require_paths = ["lib"]
s.rubyforge_project = %q{middleman}
s.rubygems_version = %q{1.3.6}
s.rubygems_version = %q{1.3.7}
s.summary = %q{A static site generator utilizing Haml, Sass and providing YUI compression and cache busting}
s.test_files = [
"spec/builder_spec.rb",
@ -112,7 +112,7 @@ Gem::Specification.new do |s|
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
s.specification_version = 3
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<rack>, [">= 0"])
s.add_runtime_dependency(%q<thin>, [">= 0"])
s.add_runtime_dependency(%q<shotgun>, [">= 0"])
@ -122,8 +122,8 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<sinatra-content-for>, [">= 0"])
s.add_runtime_dependency(%q<rack-test>, [">= 0"])
s.add_runtime_dependency(%q<yui-compressor>, [">= 0"])
s.add_runtime_dependency(%q<haml>, [">= 3.0.0.rc.1"])
s.add_runtime_dependency(%q<compass>, [">= 0.10.0.rc3"])
s.add_runtime_dependency(%q<haml>, [">= 3.0"])
s.add_runtime_dependency(%q<compass>, [">= 0.10"])
s.add_runtime_dependency(%q<fancy-buttons>, [">= 0"])
s.add_runtime_dependency(%q<json_pure>, [">= 0"])
s.add_runtime_dependency(%q<smusher>, [">= 0"])
@ -141,8 +141,8 @@ Gem::Specification.new do |s|
s.add_dependency(%q<sinatra-content-for>, [">= 0"])
s.add_dependency(%q<rack-test>, [">= 0"])
s.add_dependency(%q<yui-compressor>, [">= 0"])
s.add_dependency(%q<haml>, [">= 3.0.0.rc.1"])
s.add_dependency(%q<compass>, [">= 0.10.0.rc3"])
s.add_dependency(%q<haml>, [">= 3.0"])
s.add_dependency(%q<compass>, [">= 0.10"])
s.add_dependency(%q<fancy-buttons>, [">= 0"])
s.add_dependency(%q<json_pure>, [">= 0"])
s.add_dependency(%q<smusher>, [">= 0"])
@ -161,8 +161,8 @@ Gem::Specification.new do |s|
s.add_dependency(%q<sinatra-content-for>, [">= 0"])
s.add_dependency(%q<rack-test>, [">= 0"])
s.add_dependency(%q<yui-compressor>, [">= 0"])
s.add_dependency(%q<haml>, [">= 3.0.0.rc.1"])
s.add_dependency(%q<compass>, [">= 0.10.0.rc3"])
s.add_dependency(%q<haml>, [">= 3.0"])
s.add_dependency(%q<compass>, [">= 0.10"])
s.add_dependency(%q<fancy-buttons>, [">= 0"])
s.add_dependency(%q<json_pure>, [">= 0"])
s.add_dependency(%q<smusher>, [">= 0"])
@ -172,4 +172,3 @@ Gem::Specification.new do |s|
s.add_dependency(%q<jeweler>, [">= 0"])
end
end

View file

@ -1,3 +1,3 @@
@import compass.sass
@import "compass"
h1
background= image_url("blank.gif")
background: image-url("blank.gif")

View file

@ -1,3 +1,3 @@
@import compass.sass
@import "compass"
h1
background= image_url("blank.gif")
background: image-url("blank.gif")

View file

@ -1 +1 @@
@import compass/reset.sass
@import "compass/reset"