Merge branch 'stable'
* stable: Prepare for release. [Blueprint] Fixed an incorrect include. Verify all sass files generate the correct css in the test fixtures. Fixed a regression in the rails installer. Remove a redundant, broken test [Compass Core] Only unquote strings when a number might be passed instead. [Docs] Fix some obsolete syntax that was used in the examples. [Docs] Update the gem bundle Fix some tests around listing projects. [Command Line] Allow another configuration file to be used when creating a new project [Blueprint] The basic template was missing the scaffolding. [Blueprint] Better descriptions of the various blueprint project templates. [Command Line] The compass frameworks command has nicer output now -- similar to compass help. The -q option can be used to get a simple list of frameworks. [Rails] Provide a wrapper method for Rails.root/RAILS_ROOT that avoids deprecation warnings and handles the case where rails is not loaded at all. [Docs] Fix a bug in the docs for link_icons. Closes GH-146. [Blueprint] Clean up some comments in the blueprint templates. [Command Line] Fix a bug in `compass stats` when using scss files. [Command Line] Respect the --dry-run option during compilation. Fix a bug in the command and added a test case for that feature. Fix some broken documentation. Conflicts: VERSION.yml doc-src/content/CHANGELOG.markdown
This commit is contained in:
Chris Eppstein
commit
39e01c57ce
@ -7,10 +7,10 @@ gem 'thor'
|
||||
gem 'rack'
|
||||
gem 'mime-types'
|
||||
gem 'fssm'
|
||||
gem 'serve'
|
||||
gem 'serve', "0.10.2"
|
||||
gem 'nokogiri'
|
||||
gem 'coderay'
|
||||
gem 'haml', ">=3.0.0.beta.3", :require => 'sass'
|
||||
gem 'haml', ">=3.0.6", :require => 'sass'
|
||||
gem 'rake'
|
||||
gem 'compass', :path => ".."
|
||||
gem 'compass-susy-plugin', ">=0.7.0.pre8"
|
||||
|
||||
@ -15,7 +15,7 @@ dependencies:
|
||||
haml:
|
||||
group:
|
||||
- :default
|
||||
version: ">= 3.0.0.beta.3"
|
||||
version: ">= 3.0.6"
|
||||
require:
|
||||
- sass
|
||||
thor:
|
||||
@ -25,7 +25,7 @@ dependencies:
|
||||
serve:
|
||||
group:
|
||||
- :default
|
||||
version: ">= 0"
|
||||
version: = 0.10.2
|
||||
mime-types:
|
||||
group:
|
||||
- :default
|
||||
@ -68,16 +68,16 @@ specs:
|
||||
- rake:
|
||||
version: 0.8.7
|
||||
- activesupport:
|
||||
version: 2.3.5
|
||||
version: 2.3.8
|
||||
- coderay:
|
||||
version: 0.9.3
|
||||
- haml:
|
||||
version: 3.0.0.rc.5
|
||||
version: 3.0.6
|
||||
- compass:
|
||||
version: 0.10.0.rc5.dev.b5439e0
|
||||
version: 0.10.2
|
||||
source: 0
|
||||
- compass-susy-plugin:
|
||||
version: 0.7.0.pre8
|
||||
version: 0.7.0.rc2
|
||||
- cri:
|
||||
version: 1.0.1
|
||||
- css-slideshow:
|
||||
@ -92,16 +92,16 @@ specs:
|
||||
version: 3.1.2
|
||||
source: 1
|
||||
- nokogiri:
|
||||
version: 1.4.1.1
|
||||
version: 1.4.2
|
||||
- rack:
|
||||
version: 1.1.0
|
||||
- rdiscount:
|
||||
version: 1.6.3.1
|
||||
version: 1.6.3.2
|
||||
- serve:
|
||||
version: 0.10.0
|
||||
version: 0.10.2
|
||||
- thor:
|
||||
version: 0.13.6
|
||||
hash: d1c753a27ce588ccd240fdbae76f3c4f928ff53f
|
||||
hash: 178d5e4f426c2d1a39af604e5edcd8bae16a395e
|
||||
sources:
|
||||
- Path:
|
||||
path: !ruby/object:Pathname
|
||||
|
||||
@ -12,6 +12,11 @@ COMPASS CHANGELOG
|
||||
|
||||
* Deprecated imports and APIs from v0.10 have been removed.
|
||||
|
||||
0.10.2 (May 31, 2010)
|
||||
---------------------
|
||||
|
||||
This is a bug fix release. [Details on Github.](http://github.com/chriseppstein/compass/compare/v0.10.1...v0.10.2)
|
||||
|
||||
0.10.1 (May 15, 2010)
|
||||
|
||||
* Fixed a regression in the Blueprint module, the blueprint reset
|
||||
|
||||
@ -13,10 +13,10 @@
|
||||
+scale(2)
|
||||
|
||||
#rotate
|
||||
+rotate(0)
|
||||
+rotate(0deg)
|
||||
|
||||
#rotate:hover
|
||||
+rotate(45)
|
||||
+rotate(45deg)
|
||||
|
||||
#translate
|
||||
+translate(0, 0)
|
||||
@ -25,13 +25,13 @@
|
||||
+translate(20px, 20px)
|
||||
|
||||
#skew
|
||||
+skew(0, 0)
|
||||
+skew(0deg, 0deg)
|
||||
|
||||
#skew:hover
|
||||
+skew(20, 20)
|
||||
+skew(20deg, 20deg)
|
||||
|
||||
#combo
|
||||
+transform(1, 0, 0, 0, 0, 0)
|
||||
+transform(1, 0deg, 0, 0, 0deg, 0deg)
|
||||
|
||||
#combo:hover
|
||||
+transform(1, 45, 20px, 20px, 20, 20)
|
||||
+transform(1, 45deg, 20px, 20px, 20deg, 20deg)
|
||||
@ -52,7 +52,8 @@ body_id: home
|
||||
|
||||
When installing into an existing project:
|
||||
|
||||
compass install myproject --using blueprint/semantic
|
||||
cd myproject
|
||||
compass install blueprint/semantic
|
||||
|
||||
With Rails:
|
||||
|
||||
|
||||
@ -12,5 +12,5 @@ classnames:
|
||||
:markdown
|
||||
Install this plugin to get the assets and an example stylesheet:
|
||||
|
||||
compass install blueprint/buttons
|
||||
compass install blueprint/link_icons
|
||||
|
||||
|
||||
@ -91,7 +91,7 @@ Feature: Command Line
|
||||
And a sass file sass/layout.sass is reported compiled
|
||||
And a sass file sass/print.sass is reported compiled
|
||||
And a sass file sass/reset.sass is reported compiled
|
||||
And a sass file sass/utilities.sass is reported compiled
|
||||
And a sass file sass/utilities.scss is reported compiled
|
||||
And a css file tmp/layout.css is created
|
||||
And a css file tmp/print.css is created
|
||||
And a css file tmp/reset.css is created
|
||||
@ -105,12 +105,29 @@ Feature: Command Line
|
||||
And a sass file tmp_compass/sass/layout.sass is reported compiled
|
||||
And a sass file tmp_compass/sass/print.sass is reported compiled
|
||||
And a sass file tmp_compass/sass/reset.sass is reported compiled
|
||||
And a sass file tmp_compass/sass/utilities.sass is reported compiled
|
||||
And a sass file tmp_compass/sass/utilities.scss is reported compiled
|
||||
And a css file tmp_compass/tmp/layout.css is created
|
||||
And a css file tmp_compass/tmp/print.css is created
|
||||
And a css file tmp_compass/tmp/reset.css is created
|
||||
And a css file tmp_compass/tmp/utilities.css is created
|
||||
|
||||
Scenario: Dry Run of Compiling an existing project.
|
||||
Given I am using the existing project in test/fixtures/stylesheets/compass
|
||||
When I run: compass compile --dry-run
|
||||
Then a directory tmp/ is not created
|
||||
And a sass file sass/layout.sass is reported compiled
|
||||
And a sass file sass/print.sass is reported compiled
|
||||
And a sass file sass/reset.sass is reported compiled
|
||||
And a sass file sass/utilities.scss is reported compiled
|
||||
And a css file tmp/layout.css is not created
|
||||
And a css file tmp/print.css is not created
|
||||
And a css file tmp/reset.css is not created
|
||||
And a css file tmp/utilities.css is not created
|
||||
And a css file tmp/layout.css is reported created
|
||||
And a css file tmp/print.css is reported created
|
||||
And a css file tmp/reset.css is reported created
|
||||
And a css file tmp/utilities.css is reported created
|
||||
|
||||
Scenario: Recompiling a project with no changes
|
||||
Given I am using the existing project in test/fixtures/stylesheets/compass
|
||||
When I run: compass compile
|
||||
@ -118,26 +135,26 @@ Feature: Command Line
|
||||
Then a sass file sass/layout.sass is reported unchanged
|
||||
And a sass file sass/print.sass is reported unchanged
|
||||
And a sass file sass/reset.sass is reported unchanged
|
||||
And a sass file sass/utilities.sass is reported unchanged
|
||||
And a sass file sass/utilities.scss is reported unchanged
|
||||
|
||||
Scenario: compiling a specific file in a project
|
||||
Given I am using the existing project in test/fixtures/stylesheets/compass
|
||||
And I run: compass compile sass/utilities.sass
|
||||
And I run: compass compile sass/utilities.scss
|
||||
Then a sass file sass/layout.sass is not mentioned
|
||||
And a sass file sass/print.sass is not mentioned
|
||||
And a sass file sass/reset.sass is not mentioned
|
||||
And a sass file sass/utilities.sass is reported compiled
|
||||
And a sass file sass/utilities.scss is reported compiled
|
||||
And a css file tmp/utilities.css is reported created
|
||||
And a css file tmp/utilities.css is created
|
||||
|
||||
Scenario: Re-compiling a specific file in a project with no changes
|
||||
Given I am using the existing project in test/fixtures/stylesheets/compass
|
||||
When I run: compass compile
|
||||
And I run: compass compile sass/utilities.sass
|
||||
And I run: compass compile sass/utilities.scss
|
||||
Then a sass file sass/layout.sass is not mentioned
|
||||
And a sass file sass/print.sass is not mentioned
|
||||
And a sass file sass/reset.sass is not mentioned
|
||||
And a sass file sass/utilities.sass is reported compiled
|
||||
And a sass file sass/utilities.scss is reported compiled
|
||||
And a css file tmp/utilities.css is reported identical
|
||||
|
||||
Scenario: Installing a pattern into a project
|
||||
@ -178,7 +195,7 @@ Feature: Command Line
|
||||
Then a css file tmp/layout.css is reported identical
|
||||
And a sass file sass/print.sass is reported unchanged
|
||||
And a sass file sass/reset.sass is reported unchanged
|
||||
And a sass file sass/utilities.sass is reported unchanged
|
||||
And a sass file sass/utilities.scss is reported unchanged
|
||||
|
||||
Scenario: Recompiling a project with changes
|
||||
Given I am using the existing project in test/fixtures/stylesheets/compass
|
||||
@ -190,7 +207,7 @@ Feature: Command Line
|
||||
And a css file tmp/layout.css is reported overwritten
|
||||
And a sass file sass/print.sass is reported unchanged
|
||||
And a sass file sass/reset.sass is reported unchanged
|
||||
And a sass file sass/utilities.sass is reported unchanged
|
||||
And a sass file sass/utilities.scss is reported unchanged
|
||||
|
||||
Scenario: Watching a project for changes
|
||||
Given I am using the existing project in test/fixtures/stylesheets/compass
|
||||
@ -236,7 +253,7 @@ Feature: Command Line
|
||||
Then my css is validated
|
||||
And I am informed that my css is valid.
|
||||
|
||||
@broken
|
||||
@stats
|
||||
Scenario: Get stats for my project
|
||||
Given I am using the existing project in test/fixtures/stylesheets/compass
|
||||
When I run: compass stats
|
||||
@ -248,6 +265,13 @@ Feature: Command Line
|
||||
| sass/layout.sass | 0 | 0 | 0 | 1 | 5 | 10 |
|
||||
| sass/print.sass | 0 | 0 | 0 | 2 | 61 | 61 |
|
||||
| sass/reset.sass | 4 | 1 | 0 | 2 | 190 | 664 |
|
||||
| sass/utilities.sass | 2 | 0 | 0 | 2 | 5 | 11 |
|
||||
| sass/utilities.scss | 2 | 0 | 0 | 2 | 5 | 11 |
|
||||
| Total.* | 44 | 9 | 0 | 45 | 299 | 832 |
|
||||
|
||||
@listframeworks
|
||||
Scenario: List frameworks registered with compass
|
||||
When I run: compass frameworks
|
||||
Then I should see the following lines of output:
|
||||
| blueprint |
|
||||
| compass |
|
||||
|
||||
|
||||
@ -4,17 +4,19 @@ Feature: Extensions
|
||||
I can install extensions that others have created
|
||||
And I can create and publish my own extensions
|
||||
|
||||
@listframeworks
|
||||
Scenario: Extensions directory for stand_alone projects
|
||||
Given I am using the existing project in test/fixtures/stylesheets/compass
|
||||
And the "extensions" directory exists
|
||||
And and I have a fake extension at extensions/testing
|
||||
When I run: compass --list-frameworks
|
||||
When I run: compass frameworks
|
||||
Then the list of frameworks includes "testing"
|
||||
|
||||
@listframeworks
|
||||
Scenario: Extensions directory for rails projects
|
||||
Given I'm in a newly created rails project: my_rails_project
|
||||
And the "my_rails_project/vendor/plugins/compass/extensions" directory exists
|
||||
And and I have a fake extension at my_rails_project/vendor/plugins/compass/extensions/testing
|
||||
When I run: compass --list-frameworks
|
||||
When I run: compass frameworks
|
||||
Then the list of frameworks includes "testing"
|
||||
|
||||
|
||||
@ -232,3 +232,6 @@ Then /^the image ([^ ]+) has a size of (\d+)x(\d+)$/ do |file, width, height|
|
||||
IO.read(file)[0x10..0x18].unpack('NN').should == [width.to_i, height.to_i]
|
||||
end
|
||||
|
||||
Then /^I should see the following lines of output:$/ do |table|
|
||||
table.diff!([['blueprint'],['compass']])
|
||||
end
|
||||
|
||||
@ -5,9 +5,18 @@ end
|
||||
Given /^and I have a fake extension at (.*)$/ do |directory|
|
||||
FileUtils.mkdir_p File.join(directory, 'stylesheets')
|
||||
FileUtils.mkdir_p File.join(directory, 'templates/project')
|
||||
open(File.join(directory, 'templates/project/manifest.rb'),"w") do |f|
|
||||
f.puts %Q{
|
||||
description "This is a fake extension"
|
||||
|
||||
help "this is the fake help"
|
||||
|
||||
welcome_message "this is a fake welcome"
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
Then /^the list of frameworks includes "([^\"]*)"$/ do |framework|
|
||||
@last_result.split("\n").map{|f| f.strip}.should include(framework)
|
||||
@last_result.split("\n").map{|f| f.gsub(/(^\s+[*-]\s+)|(\s+$)/,'')}.should include(framework)
|
||||
end
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
@import "compass/utilities/text/nowrap";
|
||||
@import "compass/utilities/general/float";
|
||||
@import "compass/utilities/general/clearfix";
|
||||
|
||||
// Most of these utility classes are not "semantic". If you use them,
|
||||
// you are mixing your content and presentation. For shame!
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
description "The blueprint framework."
|
||||
description "A basic blueprint install that mimics the actual blueprint css."
|
||||
|
||||
stylesheet 'screen.sass', :media => 'screen, projection'
|
||||
stylesheet 'partials/_base.sass'
|
||||
|
||||
@ -9,3 +9,4 @@
|
||||
|
||||
// Generate the blueprint framework according to your configuration:
|
||||
+blueprint
|
||||
+blueprint-scaffolding
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@import blueprint
|
||||
|
||||
// To generate css equivalent to the blueprint css but with your configuration applied, uncomment:
|
||||
// +blueprint-ie
|
||||
// @include blueprint-ie
|
||||
|
||||
//Recommended Blueprint configuration with scoping and semantic layout:
|
||||
body.bp
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@import blueprint
|
||||
|
||||
// To generate css equivalent to the blueprint css but with your configuration applied, uncomment:
|
||||
// +blueprint-print
|
||||
// @include blueprint-print
|
||||
|
||||
//Recommended Blueprint configuration with scoping and semantic layout:
|
||||
body.bp
|
||||
|
||||
@ -7,10 +7,13 @@
|
||||
// Import the non-default scaffolding module.
|
||||
@import blueprint/scaffolding
|
||||
|
||||
// To generate css equivalent to the blueprint css but with your configuration applied, uncomment:
|
||||
// +blueprint
|
||||
// To generate css equivalent to the blueprint css but with your
|
||||
// configuration applied, uncomment:
|
||||
// @include blueprint
|
||||
|
||||
//Recommended Blueprint configuration with scoping and semantic layout:
|
||||
// But Compass recommends that you scope your blueprint styles
|
||||
// So that you can better control what pages use blueprint
|
||||
// when stylesheets are concatenated together.
|
||||
+blueprint-scaffolding("body.bp")
|
||||
body.bp
|
||||
+blueprint-typography(true)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
description "The blueprint framework."
|
||||
description "The blueprint framework for use with semantic markup."
|
||||
|
||||
stylesheet 'screen.sass', :media => 'screen, projection'
|
||||
stylesheet 'partials/_base.sass'
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
@import blueprint
|
||||
|
||||
// To generate css equivalent to the blueprint css but with your configuration applied, uncomment:
|
||||
// +blueprint-print
|
||||
|
||||
//Recommended Blueprint configuration with scoping and semantic layout:
|
||||
body.bp
|
||||
+blueprint-print(true)
|
||||
@ -40,7 +40,8 @@ $default-transition-delay: false !default;
|
||||
// * these durations will affect the properties in the same list position
|
||||
|
||||
@mixin transition-duration($duration: $default-transition-duration) {
|
||||
@include experimental(transition-duration, unquote($duration),
|
||||
@if type-of($duration) == string { $duration: unquote($duration); }
|
||||
@include experimental(transition-duration, $duration,
|
||||
-moz, -webkit, -o, not -ms, not -khtml, official
|
||||
);
|
||||
}
|
||||
@ -63,7 +64,8 @@ $default-transition-delay: false !default;
|
||||
// * these delays will effect the properties in the same list position
|
||||
|
||||
@mixin transition-delay($delay: $default-transition-delay) {
|
||||
@include experimental(transition-delay, unquote($delay),
|
||||
@if type-of($delay) == string { $delay: unquote($delay); }
|
||||
@include experimental(transition-delay, $delay,
|
||||
-moz, -webkit, -o, not -ms, not -khtml, official
|
||||
);
|
||||
}
|
||||
|
||||
@ -26,6 +26,14 @@ module Compass
|
||||
end
|
||||
end
|
||||
|
||||
def root
|
||||
if defined?(::Rails)
|
||||
::Rails.root
|
||||
elsif defined?(RAILS_ROOT)
|
||||
RAILS_ROOT
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -94,7 +94,7 @@ NEXTSTEPS
|
||||
"# This configuration file works with both the Compass command line tool and within Rails.\n" +
|
||||
Compass.configuration.serialize do |prop, value|
|
||||
if prop == :project_path
|
||||
"project_path = RAILS_ROOT if defined?(RAILS_ROOT)\n"
|
||||
"project_path = Compass::AppIntegration::Rails.root\n"
|
||||
elsif prop == :environment
|
||||
"environment = Compass::AppIntegration::Rails.env\n"
|
||||
elsif prop == :output_style
|
||||
|
||||
@ -23,17 +23,7 @@ To get help on a particular command please specify the command.
|
||||
banner << command_list("Other Commands:", other_commands)
|
||||
|
||||
banner << "\nAvailable Frameworks & Patterns:\n\n"
|
||||
Compass::Frameworks::ALL.each do |framework|
|
||||
next if framework.name =~ /^_/
|
||||
banner << " * #{framework.name}\n"
|
||||
framework.template_directories.each do |pattern|
|
||||
banner << " - #{framework.name}/#{pattern}"
|
||||
if description = framework.manifest(pattern).description
|
||||
banner << "\t- #{description}"
|
||||
end
|
||||
banner << "\n"
|
||||
end
|
||||
end
|
||||
banner << Compass::Frameworks.pretty_print
|
||||
banner << "\nGlobal Options:\n"
|
||||
opts.banner = banner
|
||||
|
||||
|
||||
@ -6,11 +6,7 @@ module Compass
|
||||
include Compass::Installers
|
||||
|
||||
def configure!
|
||||
if respond_to?(:is_project_creation?) && is_project_creation?
|
||||
Compass.add_configuration(options.delete(:project_type) || :stand_alone)
|
||||
else
|
||||
Compass.add_project_configuration(:project_type => options.delete(:project_type))
|
||||
end
|
||||
add_project_configuration
|
||||
Compass.add_configuration(options, 'command_line')
|
||||
Compass.discover_extensions!
|
||||
Compass.add_configuration(installer.completed_configuration, 'installer')
|
||||
|
||||
@ -8,14 +8,31 @@ module Compass
|
||||
end
|
||||
|
||||
def execute
|
||||
Compass::Frameworks::ALL.each do |framework|
|
||||
puts framework.name unless framework.name =~ /^_/
|
||||
if options[:quiet]
|
||||
Compass::Frameworks::ALL.each do |framework|
|
||||
puts framework.name unless framework.name =~ /^_/
|
||||
end
|
||||
else
|
||||
puts "Available Frameworks & Patterns:\n\n"
|
||||
puts Compass::Frameworks.pretty_print
|
||||
end
|
||||
end
|
||||
class << self
|
||||
def option_parser(arguments)
|
||||
parser = Compass::Exec::CommandOptionParser.new(arguments)
|
||||
parser.extend(Compass::Exec::GlobalOptionsParser)
|
||||
end
|
||||
def usage
|
||||
option_parser([]).to_s
|
||||
end
|
||||
def description(command)
|
||||
"List the available frameworks"
|
||||
end
|
||||
def parse!(arguments)
|
||||
parser = option_parser(arguments)
|
||||
parser.parse!
|
||||
parser.options
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -23,12 +23,14 @@ module Compass
|
||||
|
||||
def configure!
|
||||
add_project_configuration
|
||||
Compass.add_configuration(options, "cli")
|
||||
Compass.add_configuration(options, "command_line")
|
||||
Compass.discover_extensions!
|
||||
end
|
||||
|
||||
def add_project_configuration
|
||||
Compass.add_project_configuration(options[:configuration_file])
|
||||
Compass.add_project_configuration(options[:configuration_file]) do
|
||||
options[:project_type]
|
||||
end
|
||||
end
|
||||
|
||||
def projectize(path)
|
||||
|
||||
@ -46,12 +46,16 @@ module Compass
|
||||
end
|
||||
|
||||
def new_compiler_instance(additional_options = {})
|
||||
compiler_opts = Compass.sass_engine_options
|
||||
compiler_opts.merge!(:quiet => options[:quiet],
|
||||
:force => options[:force],
|
||||
:sass_files => explicit_sass_files,
|
||||
:dry_run => options[:dry_run])
|
||||
compiler_opts.merge!(additional_options)
|
||||
Compass::Compiler.new(working_path,
|
||||
projectize(Compass.configuration.sass_dir),
|
||||
projectize(Compass.configuration.css_dir),
|
||||
Compass.sass_engine_options.merge(:quiet => options[:quiet],
|
||||
:force => options[:force],
|
||||
:sass_files => explicit_sass_files).merge(additional_options))
|
||||
compiler_opts)
|
||||
end
|
||||
|
||||
def explicit_sass_files
|
||||
|
||||
@ -78,7 +78,7 @@ module Compass
|
||||
options = args.last.is_a?(Hash) ? args.pop : {}
|
||||
configuration_file_path = args.shift || detect_configuration_file
|
||||
raise ArgumentError, "Too many arguments" if args.any?
|
||||
if configuration_file_path
|
||||
if configuration_file_path && File.exists?(configuration_file_path)
|
||||
|
||||
data = configuration_for(configuration_file_path)
|
||||
|
||||
@ -92,7 +92,7 @@ module Compass
|
||||
|
||||
add_configuration(data)
|
||||
else
|
||||
add_configuration(options[:project_type] || configuration.project_type || :stand_alone)
|
||||
add_configuration(options[:project_type] || configuration.project_type_without_default || (yield if block_given?) || :stand_alone)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -97,6 +97,27 @@ module Compass
|
||||
end
|
||||
end
|
||||
|
||||
def pretty_print
|
||||
result = ""
|
||||
max = Compass::Frameworks::ALL.inject(0) do |gm, framework|
|
||||
fm = framework.template_directories.inject(0) do |lm,pattern|
|
||||
[lm, 7 + framework.name.size + pattern.size].max
|
||||
end
|
||||
[gm, fm].max
|
||||
end
|
||||
Compass::Frameworks::ALL.each do |framework|
|
||||
next if framework.name =~ /^_/
|
||||
result << " * #{framework.name}\n"
|
||||
framework.template_directories.each do |pattern|
|
||||
result << " - #{framework.name}/#{pattern}".ljust(max)
|
||||
if description = framework.manifest(pattern).description
|
||||
result << " - #{description}"
|
||||
end
|
||||
result << "\n"
|
||||
end
|
||||
end
|
||||
result
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -62,7 +62,9 @@ module Compass
|
||||
@contents ||= File.read(path)
|
||||
end
|
||||
def tree
|
||||
@tree = Sass::Engine.new(contents, Compass.configuration.to_sass_engine_options).to_tree
|
||||
opts = Compass.configuration.to_sass_engine_options
|
||||
opts[:syntax] = path[-4..-1].to_sym
|
||||
@tree = Sass::Engine.new(contents, opts).to_tree
|
||||
end
|
||||
def visit_tree!
|
||||
@visitor = StatsVisitor.new
|
||||
|
||||
@ -18,11 +18,6 @@ class CommandLineTest < Test::Unit::TestCase
|
||||
assert_match /\d+\.\d+\.\d+( [0-9a-f]+)?/, @last_result
|
||||
end
|
||||
|
||||
def test_list_frameworks
|
||||
compass "--list-frameworks"
|
||||
assert_equal(%w(blueprint compass), @last_result.split.sort)
|
||||
end
|
||||
|
||||
def test_basic_install
|
||||
within_tmp_directory do
|
||||
compass "--boring", "basic"
|
||||
|
||||
@ -33,7 +33,9 @@ class CompassTest < Test::Unit::TestCase
|
||||
each_css_file(proj.css_path) do |css_file|
|
||||
assert_no_errors css_file, :blueprint
|
||||
end
|
||||
assert_renders_correctly :typography
|
||||
each_sass_file do |sass_file|
|
||||
assert_renders_correctly sass_file
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -42,7 +44,9 @@ class CompassTest < Test::Unit::TestCase
|
||||
each_css_file(proj.css_path) do |css_file|
|
||||
assert_no_errors css_file, 'compass'
|
||||
end
|
||||
assert_renders_correctly :reset, :layout, :utilities, :gradients, :image_size, :box
|
||||
each_sass_file do |sass_file|
|
||||
assert_renders_correctly sass_file
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -51,16 +55,20 @@ class CompassTest < Test::Unit::TestCase
|
||||
each_css_file(proj.css_path) do |css_file|
|
||||
assert_no_errors css_file, 'image_urls'
|
||||
end
|
||||
assert_renders_correctly :screen
|
||||
each_sass_file do |sass_file|
|
||||
assert_renders_correctly sass_file
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def test_image_urls
|
||||
def test_relative
|
||||
within_project('relative') do |proj|
|
||||
each_css_file(proj.css_path) do |css_file|
|
||||
assert_no_errors css_file, 'relative'
|
||||
end
|
||||
assert_renders_correctly :screen
|
||||
each_sass_file do |sass_file|
|
||||
assert_renders_correctly sass_file
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -104,9 +112,14 @@ private
|
||||
raise
|
||||
end
|
||||
|
||||
def each_css_file(dir)
|
||||
Dir.glob("#{dir}/**/*.css").each do |css_file|
|
||||
yield css_file
|
||||
def each_css_file(dir, &block)
|
||||
Dir.glob("#{dir}/**/*.css").each(&block)
|
||||
end
|
||||
|
||||
def each_sass_file(sass_dir = nil)
|
||||
sass_dir ||= template_path(@current_project)
|
||||
Dir.glob("#{sass_dir}/**/*.s[ac]ss").each do |sass_file|
|
||||
yield sass_file[(sass_dir.length+1)..-6]
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
60
test/fixtures/stylesheets/blueprint/css/ie.css
vendored
Normal file
60
test/fixtures/stylesheets/blueprint/css/ie.css
vendored
Normal file
@ -0,0 +1,60 @@
|
||||
body {
|
||||
text-align: center; }
|
||||
* html body legend {
|
||||
margin: 0px -8px 16px 0;
|
||||
padding: 0; }
|
||||
html > body p code {
|
||||
*white-space: normal; }
|
||||
|
||||
.container {
|
||||
text-align: left; }
|
||||
|
||||
sup {
|
||||
vertical-align: text-top; }
|
||||
|
||||
sub {
|
||||
vertical-align: text-bottom; }
|
||||
|
||||
hr {
|
||||
margin: -8px auto 11px; }
|
||||
|
||||
img {
|
||||
-ms-interpolation-mode: bicubic; }
|
||||
|
||||
fieldset {
|
||||
padding-top: 0; }
|
||||
|
||||
textarea {
|
||||
overflow: auto; }
|
||||
|
||||
input.text {
|
||||
margin: 0.5em 0;
|
||||
background-color: white;
|
||||
border: 1px solid #bbbbbb; }
|
||||
input.text:focus {
|
||||
border: 1px solid #666666; }
|
||||
input.title {
|
||||
margin: 0.5em 0;
|
||||
background-color: white;
|
||||
border: 1px solid #bbbbbb; }
|
||||
input.title:focus {
|
||||
border: 1px solid #666666; }
|
||||
input.checkbox {
|
||||
position: relative;
|
||||
top: 0.25em; }
|
||||
input.radio {
|
||||
position: relative;
|
||||
top: 0.25em; }
|
||||
input.button {
|
||||
position: relative;
|
||||
top: 0.25em; }
|
||||
|
||||
textarea {
|
||||
margin: 0.5em 0; }
|
||||
|
||||
select {
|
||||
margin: 0.5em 0; }
|
||||
|
||||
button {
|
||||
position: relative;
|
||||
top: 0.25em; }
|
||||
56
test/fixtures/stylesheets/blueprint/css/print.css
vendored
Normal file
56
test/fixtures/stylesheets/blueprint/css/print.css
vendored
Normal file
@ -0,0 +1,56 @@
|
||||
body {
|
||||
line-height: 1.5;
|
||||
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
|
||||
color: black;
|
||||
background: none;
|
||||
font-size: 10pt; }
|
||||
|
||||
.container {
|
||||
background: none; }
|
||||
|
||||
hr {
|
||||
background: #cccccc;
|
||||
color: #cccccc;
|
||||
width: 100%;
|
||||
height: 2px;
|
||||
margin: 2em 0;
|
||||
padding: 0;
|
||||
border: none; }
|
||||
hr.space {
|
||||
background: white;
|
||||
color: white; }
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; }
|
||||
|
||||
code {
|
||||
font-size: 0.9em;
|
||||
font-family: "andale mono", "lucida console", monospace; }
|
||||
|
||||
a img {
|
||||
border: none; }
|
||||
a:link, a:visited {
|
||||
background: transparent;
|
||||
font-weight: 700;
|
||||
text-decoration: underline; }
|
||||
|
||||
p img.top {
|
||||
margin-top: 0; }
|
||||
|
||||
blockquote {
|
||||
margin: 1.5em;
|
||||
padding: 1em;
|
||||
font-style: italic;
|
||||
font-size: 0.9em; }
|
||||
|
||||
.small {
|
||||
font-size: 0.9em; }
|
||||
|
||||
.large {
|
||||
font-size: 1.1em; }
|
||||
|
||||
.quiet {
|
||||
color: #999999; }
|
||||
|
||||
.hide {
|
||||
display: none; }
|
||||
804
test/fixtures/stylesheets/blueprint/css/screen.css
vendored
Normal file
804
test/fixtures/stylesheets/blueprint/css/screen.css
vendored
Normal file
@ -0,0 +1,804 @@
|
||||
html, body, div, span, applet, object, iframe,
|
||||
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
|
||||
a, abbr, acronym, address, big, cite, code,
|
||||
del, dfn, em, font, img, ins, kbd, q, s, samp,
|
||||
small, strike, strong, sub, sup, tt, var,
|
||||
dl, dt, dd, ol, ul, li,
|
||||
fieldset, form, label, legend,
|
||||
table, caption, tbody, tfoot, thead, tr, th, td {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
outline: 0;
|
||||
font-weight: inherit;
|
||||
font-style: inherit;
|
||||
font-size: 100%;
|
||||
font-family: inherit;
|
||||
vertical-align: baseline; }
|
||||
|
||||
body {
|
||||
line-height: 1;
|
||||
color: black;
|
||||
background: white; }
|
||||
|
||||
ol, ul {
|
||||
list-style: none; }
|
||||
|
||||
table {
|
||||
border-collapse: separate;
|
||||
border-spacing: 0;
|
||||
vertical-align: middle; }
|
||||
|
||||
caption, th, td {
|
||||
text-align: left;
|
||||
font-weight: normal;
|
||||
vertical-align: middle; }
|
||||
|
||||
q, blockquote {
|
||||
quotes: "" ""; }
|
||||
q:before, q:after, blockquote:before, blockquote:after {
|
||||
content: ""; }
|
||||
|
||||
a img {
|
||||
border: none; }
|
||||
|
||||
body {
|
||||
line-height: 1.5;
|
||||
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
|
||||
color: #333333;
|
||||
font-size: 75%; }
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
font-weight: normal;
|
||||
color: #222222; }
|
||||
h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {
|
||||
margin: 0; }
|
||||
|
||||
h1 {
|
||||
font-size: 3em;
|
||||
line-height: 1;
|
||||
margin-bottom: 0.50em; }
|
||||
|
||||
h2 {
|
||||
font-size: 2em;
|
||||
margin-bottom: 0.75em; }
|
||||
|
||||
h3 {
|
||||
font-size: 1.5em;
|
||||
line-height: 1;
|
||||
margin-bottom: 1.00em; }
|
||||
|
||||
h4 {
|
||||
font-size: 1.2em;
|
||||
line-height: 1.25;
|
||||
margin-bottom: 1.25em; }
|
||||
|
||||
h5 {
|
||||
font-size: 1em;
|
||||
font-weight: bold;
|
||||
margin-bottom: 1.50em; }
|
||||
|
||||
h6 {
|
||||
font-size: 1em;
|
||||
font-weight: bold; }
|
||||
|
||||
p {
|
||||
margin: 0 0 1.5em; }
|
||||
p img.left {
|
||||
display: inline;
|
||||
float: left;
|
||||
margin: 1.5em 1.5em 1.5em 0;
|
||||
padding: 0; }
|
||||
p img.right {
|
||||
display: inline;
|
||||
float: right;
|
||||
margin: 1.5em 0 1.5em 1.5em;
|
||||
padding: 0; }
|
||||
|
||||
a {
|
||||
text-decoration: underline;
|
||||
color: #000099; }
|
||||
a:visited {
|
||||
color: #000066; }
|
||||
a:focus {
|
||||
color: black; }
|
||||
a:hover {
|
||||
color: black; }
|
||||
a:active {
|
||||
color: #cc0099; }
|
||||
|
||||
blockquote {
|
||||
margin: 1.5em;
|
||||
color: #666666;
|
||||
font-style: italic; }
|
||||
|
||||
strong {
|
||||
font-weight: bold; }
|
||||
|
||||
em {
|
||||
font-style: italic; }
|
||||
|
||||
dfn {
|
||||
font-style: italic;
|
||||
font-weight: bold; }
|
||||
|
||||
sup, sub {
|
||||
line-height: 0; }
|
||||
|
||||
abbr, acronym {
|
||||
border-bottom: 1px dotted #666666; }
|
||||
|
||||
address {
|
||||
margin: 0 0 1.5em;
|
||||
font-style: italic; }
|
||||
|
||||
del {
|
||||
color: #666666; }
|
||||
|
||||
pre {
|
||||
margin: 1.5em 0;
|
||||
white-space: pre; }
|
||||
|
||||
pre, code, tt {
|
||||
font: 1em "andale mono", "lucida console", monospace;
|
||||
line-height: 1.5; }
|
||||
|
||||
li ul, li ol {
|
||||
margin: 0; }
|
||||
|
||||
ul, ol {
|
||||
margin: 0 1.5em 1.5em 0;
|
||||
padding-left: 3.333em; }
|
||||
|
||||
ul {
|
||||
list-style-type: disc; }
|
||||
|
||||
ol {
|
||||
list-style-type: decimal; }
|
||||
|
||||
dl {
|
||||
margin: 0 0 1.5em 0; }
|
||||
dl dt {
|
||||
font-weight: bold; }
|
||||
|
||||
dd {
|
||||
margin-left: 1.5em; }
|
||||
|
||||
table {
|
||||
margin-bottom: 1.4em;
|
||||
width: 100%; }
|
||||
|
||||
th {
|
||||
font-weight: bold; }
|
||||
|
||||
thead th {
|
||||
background: #c3d9ff; }
|
||||
|
||||
th, td, caption {
|
||||
padding: 4px 10px 4px 5px; }
|
||||
|
||||
tr.even td {
|
||||
background: #e5ecf9; }
|
||||
|
||||
tfoot {
|
||||
font-style: italic; }
|
||||
|
||||
caption {
|
||||
background: #eeeeee; }
|
||||
|
||||
.quiet {
|
||||
color: #666666; }
|
||||
|
||||
.loud {
|
||||
color: #111111; }
|
||||
|
||||
.clear {
|
||||
clear: both; }
|
||||
|
||||
.nowrap {
|
||||
white-space: nowrap; }
|
||||
|
||||
.clearfix {
|
||||
overflow: hidden;
|
||||
display: inline-block; }
|
||||
.clearfix {
|
||||
display: block; }
|
||||
|
||||
.small {
|
||||
font-size: 0.8em;
|
||||
margin-bottom: 1.875em;
|
||||
line-height: 1.875em; }
|
||||
|
||||
.large {
|
||||
font-size: 1.2em;
|
||||
line-height: 2.5em;
|
||||
margin-bottom: 1.25em; }
|
||||
|
||||
.first {
|
||||
margin-left: 0;
|
||||
padding-left: 0; }
|
||||
|
||||
.last {
|
||||
margin-right: 0;
|
||||
padding-right: 0; }
|
||||
|
||||
.top {
|
||||
margin-top: 0;
|
||||
padding-top: 0; }
|
||||
|
||||
.bottom {
|
||||
margin-bottom: 0;
|
||||
padding-bottom: 0; }
|
||||
|
||||
.container {
|
||||
width: 950px;
|
||||
margin: 0 auto;
|
||||
overflow: hidden;
|
||||
display: inline-block; }
|
||||
.container {
|
||||
display: block; }
|
||||
|
||||
.column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 {
|
||||
display: inline;
|
||||
float: left;
|
||||
margin-right: 10px; }
|
||||
* html .column, * html div.span-1, * html div.span-2, * html div.span-3, * html div.span-4, * html div.span-5, * html div.span-6, * html div.span-7, * html div.span-8, * html div.span-9, * html div.span-10, * html div.span-11, * html div.span-12, * html div.span-13, * html div.span-14, * html div.span-15, * html div.span-16, * html div.span-17, * html div.span-18, * html div.span-19, * html div.span-20, * html div.span-21, * html div.span-22, * html div.span-23, * html div.span-24 {
|
||||
overflow-x: hidden; }
|
||||
|
||||
.last, div.last {
|
||||
margin-right: 0; }
|
||||
|
||||
.span-1 {
|
||||
width: 30px; }
|
||||
|
||||
.span-2 {
|
||||
width: 70px; }
|
||||
|
||||
.span-3 {
|
||||
width: 110px; }
|
||||
|
||||
.span-4 {
|
||||
width: 150px; }
|
||||
|
||||
.span-5 {
|
||||
width: 190px; }
|
||||
|
||||
.span-6 {
|
||||
width: 230px; }
|
||||
|
||||
.span-7 {
|
||||
width: 270px; }
|
||||
|
||||
.span-8 {
|
||||
width: 310px; }
|
||||
|
||||
.span-9 {
|
||||
width: 350px; }
|
||||
|
||||
.span-10 {
|
||||
width: 390px; }
|
||||
|
||||
.span-11 {
|
||||
width: 430px; }
|
||||
|
||||
.span-12 {
|
||||
width: 470px; }
|
||||
|
||||
.span-13 {
|
||||
width: 510px; }
|
||||
|
||||
.span-14 {
|
||||
width: 550px; }
|
||||
|
||||
.span-15 {
|
||||
width: 590px; }
|
||||
|
||||
.span-16 {
|
||||
width: 630px; }
|
||||
|
||||
.span-17 {
|
||||
width: 670px; }
|
||||
|
||||
.span-18 {
|
||||
width: 710px; }
|
||||
|
||||
.span-19 {
|
||||
width: 750px; }
|
||||
|
||||
.span-20 {
|
||||
width: 790px; }
|
||||
|
||||
.span-21 {
|
||||
width: 830px; }
|
||||
|
||||
.span-22 {
|
||||
width: 870px; }
|
||||
|
||||
.span-23 {
|
||||
width: 910px; }
|
||||
|
||||
.span-24, div.span-24 {
|
||||
width: 950px;
|
||||
margin: 0; }
|
||||
|
||||
input.span-1, textarea.span-1, select.span-1 {
|
||||
width: 30px !important; }
|
||||
input.span-2, textarea.span-2, select.span-2 {
|
||||
width: 70px !important; }
|
||||
input.span-3, textarea.span-3, select.span-3 {
|
||||
width: 110px !important; }
|
||||
input.span-4, textarea.span-4, select.span-4 {
|
||||
width: 150px !important; }
|
||||
input.span-5, textarea.span-5, select.span-5 {
|
||||
width: 190px !important; }
|
||||
input.span-6, textarea.span-6, select.span-6 {
|
||||
width: 230px !important; }
|
||||
input.span-7, textarea.span-7, select.span-7 {
|
||||
width: 270px !important; }
|
||||
input.span-8, textarea.span-8, select.span-8 {
|
||||
width: 310px !important; }
|
||||
input.span-9, textarea.span-9, select.span-9 {
|
||||
width: 350px !important; }
|
||||
input.span-10, textarea.span-10, select.span-10 {
|
||||
width: 390px !important; }
|
||||
input.span-11, textarea.span-11, select.span-11 {
|
||||
width: 430px !important; }
|
||||
input.span-12, textarea.span-12, select.span-12 {
|
||||
width: 470px !important; }
|
||||
input.span-13, textarea.span-13, select.span-13 {
|
||||
width: 510px !important; }
|
||||
input.span-14, textarea.span-14, select.span-14 {
|
||||
width: 550px !important; }
|
||||
input.span-15, textarea.span-15, select.span-15 {
|
||||
width: 590px !important; }
|
||||
input.span-16, textarea.span-16, select.span-16 {
|
||||
width: 630px !important; }
|
||||
input.span-17, textarea.span-17, select.span-17 {
|
||||
width: 670px !important; }
|
||||
input.span-18, textarea.span-18, select.span-18 {
|
||||
width: 710px !important; }
|
||||
input.span-19, textarea.span-19, select.span-19 {
|
||||
width: 750px !important; }
|
||||
input.span-20, textarea.span-20, select.span-20 {
|
||||
width: 790px !important; }
|
||||
input.span-21, textarea.span-21, select.span-21 {
|
||||
width: 830px !important; }
|
||||
input.span-22, textarea.span-22, select.span-22 {
|
||||
width: 870px !important; }
|
||||
input.span-23, textarea.span-23, select.span-23 {
|
||||
width: 910px !important; }
|
||||
input.span-24, textarea.span-24, select.span-24 {
|
||||
width: 950px !important; }
|
||||
|
||||
.append-1 {
|
||||
padding-right: 40px; }
|
||||
|
||||
.append-2 {
|
||||
padding-right: 80px; }
|
||||
|
||||
.append-3 {
|
||||
padding-right: 120px; }
|
||||
|
||||
.append-4 {
|
||||
padding-right: 160px; }
|
||||
|
||||
.append-5 {
|
||||
padding-right: 200px; }
|
||||
|
||||
.append-6 {
|
||||
padding-right: 240px; }
|
||||
|
||||
.append-7 {
|
||||
padding-right: 280px; }
|
||||
|
||||
.append-8 {
|
||||
padding-right: 320px; }
|
||||
|
||||
.append-9 {
|
||||
padding-right: 360px; }
|
||||
|
||||
.append-10 {
|
||||
padding-right: 400px; }
|
||||
|
||||
.append-11 {
|
||||
padding-right: 440px; }
|
||||
|
||||
.append-12 {
|
||||
padding-right: 480px; }
|
||||
|
||||
.append-13 {
|
||||
padding-right: 520px; }
|
||||
|
||||
.append-14 {
|
||||
padding-right: 560px; }
|
||||
|
||||
.append-15 {
|
||||
padding-right: 600px; }
|
||||
|
||||
.append-16 {
|
||||
padding-right: 640px; }
|
||||
|
||||
.append-17 {
|
||||
padding-right: 680px; }
|
||||
|
||||
.append-18 {
|
||||
padding-right: 720px; }
|
||||
|
||||
.append-19 {
|
||||
padding-right: 760px; }
|
||||
|
||||
.append-20 {
|
||||
padding-right: 800px; }
|
||||
|
||||
.append-21 {
|
||||
padding-right: 840px; }
|
||||
|
||||
.append-22 {
|
||||
padding-right: 880px; }
|
||||
|
||||
.append-23 {
|
||||
padding-right: 920px; }
|
||||
|
||||
.prepend-1 {
|
||||
padding-left: 40px; }
|
||||
|
||||
.prepend-2 {
|
||||
padding-left: 80px; }
|
||||
|
||||
.prepend-3 {
|
||||
padding-left: 120px; }
|
||||
|
||||
.prepend-4 {
|
||||
padding-left: 160px; }
|
||||
|
||||
.prepend-5 {
|
||||
padding-left: 200px; }
|
||||
|
||||
.prepend-6 {
|
||||
padding-left: 240px; }
|
||||
|
||||
.prepend-7 {
|
||||
padding-left: 280px; }
|
||||
|
||||
.prepend-8 {
|
||||
padding-left: 320px; }
|
||||
|
||||
.prepend-9 {
|
||||
padding-left: 360px; }
|
||||
|
||||
.prepend-10 {
|
||||
padding-left: 400px; }
|
||||
|
||||
.prepend-11 {
|
||||
padding-left: 440px; }
|
||||
|
||||
.prepend-12 {
|
||||
padding-left: 480px; }
|
||||
|
||||
.prepend-13 {
|
||||
padding-left: 520px; }
|
||||
|
||||
.prepend-14 {
|
||||
padding-left: 560px; }
|
||||
|
||||
.prepend-15 {
|
||||
padding-left: 600px; }
|
||||
|
||||
.prepend-16 {
|
||||
padding-left: 640px; }
|
||||
|
||||
.prepend-17 {
|
||||
padding-left: 680px; }
|
||||
|
||||
.prepend-18 {
|
||||
padding-left: 720px; }
|
||||
|
||||
.prepend-19 {
|
||||
padding-left: 760px; }
|
||||
|
||||
.prepend-20 {
|
||||
padding-left: 800px; }
|
||||
|
||||
.prepend-21 {
|
||||
padding-left: 840px; }
|
||||
|
||||
.prepend-22 {
|
||||
padding-left: 880px; }
|
||||
|
||||
.prepend-23 {
|
||||
padding-left: 920px; }
|
||||
|
||||
.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {
|
||||
display: inline;
|
||||
float: left;
|
||||
position: relative; }
|
||||
|
||||
.pull-1 {
|
||||
margin-left: -40px; }
|
||||
|
||||
.pull-2 {
|
||||
margin-left: -80px; }
|
||||
|
||||
.pull-3 {
|
||||
margin-left: -120px; }
|
||||
|
||||
.pull-4 {
|
||||
margin-left: -160px; }
|
||||
|
||||
.pull-5 {
|
||||
margin-left: -200px; }
|
||||
|
||||
.pull-6 {
|
||||
margin-left: -240px; }
|
||||
|
||||
.pull-7 {
|
||||
margin-left: -280px; }
|
||||
|
||||
.pull-8 {
|
||||
margin-left: -320px; }
|
||||
|
||||
.pull-9 {
|
||||
margin-left: -360px; }
|
||||
|
||||
.pull-10 {
|
||||
margin-left: -400px; }
|
||||
|
||||
.pull-11 {
|
||||
margin-left: -440px; }
|
||||
|
||||
.pull-12 {
|
||||
margin-left: -480px; }
|
||||
|
||||
.pull-13 {
|
||||
margin-left: -520px; }
|
||||
|
||||
.pull-14 {
|
||||
margin-left: -560px; }
|
||||
|
||||
.pull-15 {
|
||||
margin-left: -600px; }
|
||||
|
||||
.pull-16 {
|
||||
margin-left: -640px; }
|
||||
|
||||
.pull-17 {
|
||||
margin-left: -680px; }
|
||||
|
||||
.pull-18 {
|
||||
margin-left: -720px; }
|
||||
|
||||
.pull-19 {
|
||||
margin-left: -760px; }
|
||||
|
||||
.pull-20 {
|
||||
margin-left: -800px; }
|
||||
|
||||
.pull-21 {
|
||||
margin-left: -840px; }
|
||||
|
||||
.pull-22 {
|
||||
margin-left: -880px; }
|
||||
|
||||
.pull-23 {
|
||||
margin-left: -920px; }
|
||||
|
||||
.pull-24 {
|
||||
margin-left: -960px; }
|
||||
|
||||
.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {
|
||||
display: inline;
|
||||
float: right;
|
||||
position: relative; }
|
||||
|
||||
.push-1 {
|
||||
margin: 0 -40px 1.5em 40px; }
|
||||
|
||||
.push-2 {
|
||||
margin: 0 -80px 1.5em 80px; }
|
||||
|
||||
.push-3 {
|
||||
margin: 0 -120px 1.5em 120px; }
|
||||
|
||||
.push-4 {
|
||||
margin: 0 -160px 1.5em 160px; }
|
||||
|
||||
.push-5 {
|
||||
margin: 0 -200px 1.5em 200px; }
|
||||
|
||||
.push-6 {
|
||||
margin: 0 -240px 1.5em 240px; }
|
||||
|
||||
.push-7 {
|
||||
margin: 0 -280px 1.5em 280px; }
|
||||
|
||||
.push-8 {
|
||||
margin: 0 -320px 1.5em 320px; }
|
||||
|
||||
.push-9 {
|
||||
margin: 0 -360px 1.5em 360px; }
|
||||
|
||||
.push-10 {
|
||||
margin: 0 -400px 1.5em 400px; }
|
||||
|
||||
.push-11 {
|
||||
margin: 0 -440px 1.5em 440px; }
|
||||
|
||||
.push-12 {
|
||||
margin: 0 -480px 1.5em 480px; }
|
||||
|
||||
.push-13 {
|
||||
margin: 0 -520px 1.5em 520px; }
|
||||
|
||||
.push-14 {
|
||||
margin: 0 -560px 1.5em 560px; }
|
||||
|
||||
.push-15 {
|
||||
margin: 0 -600px 1.5em 600px; }
|
||||
|
||||
.push-16 {
|
||||
margin: 0 -640px 1.5em 640px; }
|
||||
|
||||
.push-17 {
|
||||
margin: 0 -680px 1.5em 680px; }
|
||||
|
||||
.push-18 {
|
||||
margin: 0 -720px 1.5em 720px; }
|
||||
|
||||
.push-19 {
|
||||
margin: 0 -760px 1.5em 760px; }
|
||||
|
||||
.push-20 {
|
||||
margin: 0 -800px 1.5em 800px; }
|
||||
|
||||
.push-21 {
|
||||
margin: 0 -840px 1.5em 840px; }
|
||||
|
||||
.push-22 {
|
||||
margin: 0 -880px 1.5em 880px; }
|
||||
|
||||
.push-23 {
|
||||
margin: 0 -920px 1.5em 920px; }
|
||||
|
||||
.push-24 {
|
||||
margin: 0 -960px 1.5em 960px; }
|
||||
|
||||
.prepend-top {
|
||||
margin-top: 1.5em; }
|
||||
|
||||
.append-bottom {
|
||||
margin-bottom: 1.5em; }
|
||||
|
||||
.showgrid {
|
||||
background: url('/images/grid.png?1275242906'); }
|
||||
|
||||
.error {
|
||||
padding: 0.8em;
|
||||
margin-bottom: 1em;
|
||||
border: 2px solid #dddddd;
|
||||
background: #fbe3e4;
|
||||
color: #8a1f11;
|
||||
border-color: #fbc2c4; }
|
||||
.error a {
|
||||
color: #8a1f11; }
|
||||
|
||||
.notice {
|
||||
padding: 0.8em;
|
||||
margin-bottom: 1em;
|
||||
border: 2px solid #dddddd;
|
||||
background: #fff6bf;
|
||||
color: #514721;
|
||||
border-color: #ffd324; }
|
||||
.notice a {
|
||||
color: #514721; }
|
||||
|
||||
.success {
|
||||
padding: 0.8em;
|
||||
margin-bottom: 1em;
|
||||
border: 2px solid #dddddd;
|
||||
background: #e6efc2;
|
||||
color: #264409;
|
||||
border-color: #c6d880; }
|
||||
.success a {
|
||||
color: #264409; }
|
||||
|
||||
.hide {
|
||||
display: none; }
|
||||
|
||||
.highlight {
|
||||
background: yellow; }
|
||||
|
||||
.added {
|
||||
background: #006600;
|
||||
color: white; }
|
||||
|
||||
.removed {
|
||||
background: #990000;
|
||||
color: white; }
|
||||
|
||||
label {
|
||||
font-weight: bold; }
|
||||
|
||||
fieldset {
|
||||
padding: 1.4em;
|
||||
margin: 0 0 1.5em 0; }
|
||||
|
||||
legend {
|
||||
font-weight: bold;
|
||||
font-size: 1.2em; }
|
||||
|
||||
input.text, input.title, input[type=text], input[type=password] {
|
||||
margin: 0.5em 0;
|
||||
background-color: white;
|
||||
padding: 5px; }
|
||||
input.title {
|
||||
font-size: 1.5em; }
|
||||
input[type=checkbox], input.checkbox, input[type=radio], input.radio {
|
||||
position: relative;
|
||||
top: 0.25em; }
|
||||
|
||||
textarea {
|
||||
margin: 0.5em 0;
|
||||
padding: 5px; }
|
||||
|
||||
select {
|
||||
margin: 0.5em 0; }
|
||||
|
||||
fieldset {
|
||||
border: 1px solid #cccccc; }
|
||||
|
||||
input.text, input.title, input[type=text], input[type=password],
|
||||
textarea, select {
|
||||
border: 1px solid #bbbbbb; }
|
||||
input.text:focus, input.title:focus, input[type=text]:focus, input[type=password]:focus,
|
||||
textarea:focus, select:focus {
|
||||
border: 1px solid #666666; }
|
||||
|
||||
input.text, input.title, input[type=text], input[type=password] {
|
||||
width: 300px; }
|
||||
|
||||
textarea {
|
||||
width: 390px;
|
||||
height: 250px; }
|
||||
|
||||
#main.container #top {
|
||||
display: inline;
|
||||
float: left;
|
||||
margin-right: 0;
|
||||
width: 950px; }
|
||||
* html #main.container #top {
|
||||
overflow-x: hidden; }
|
||||
#main.container #middle {
|
||||
display: inline;
|
||||
float: left;
|
||||
margin-right: 0;
|
||||
width: 950px; }
|
||||
* html #main.container #middle {
|
||||
overflow-x: hidden; }
|
||||
#main.container #middle #left {
|
||||
display: inline;
|
||||
float: left;
|
||||
margin-right: 10px;
|
||||
width: 230px; }
|
||||
* html #main.container #middle #left {
|
||||
overflow-x: hidden; }
|
||||
#main.container #middle #content {
|
||||
display: inline;
|
||||
float: left;
|
||||
margin-right: 10px;
|
||||
width: 470px; }
|
||||
* html #main.container #middle #content {
|
||||
overflow-x: hidden; }
|
||||
#main.container #middle #right {
|
||||
display: inline;
|
||||
float: left;
|
||||
margin-right: 0;
|
||||
width: 230px; }
|
||||
* html #main.container #middle #right {
|
||||
overflow-x: hidden; }
|
||||
#main.container #bottom {
|
||||
display: inline;
|
||||
float: left;
|
||||
margin-right: 0;
|
||||
width: 950px; }
|
||||
* html #main.container #bottom {
|
||||
overflow-x: hidden; }
|
||||
37
test/fixtures/stylesheets/blueprint/css/single-imports/utilities.css
vendored
Normal file
37
test/fixtures/stylesheets/blueprint/css/single-imports/utilities.css
vendored
Normal file
@ -0,0 +1,37 @@
|
||||
.clear {
|
||||
clear: both; }
|
||||
|
||||
.nowrap {
|
||||
white-space: nowrap; }
|
||||
|
||||
.clearfix {
|
||||
overflow: hidden;
|
||||
display: inline-block; }
|
||||
.clearfix {
|
||||
display: block; }
|
||||
|
||||
.small {
|
||||
font-size: 0.8em;
|
||||
margin-bottom: 1.875em;
|
||||
line-height: 1.875em; }
|
||||
|
||||
.large {
|
||||
font-size: 1.2em;
|
||||
line-height: 2.5em;
|
||||
margin-bottom: 1.25em; }
|
||||
|
||||
.first {
|
||||
margin-left: 0;
|
||||
padding-left: 0; }
|
||||
|
||||
.last {
|
||||
margin-right: 0;
|
||||
padding-right: 0; }
|
||||
|
||||
.top {
|
||||
margin-top: 0;
|
||||
padding-top: 0; }
|
||||
|
||||
.bottom {
|
||||
margin-bottom: 0;
|
||||
padding-bottom: 0; }
|
||||
3
test/fixtures/stylesheets/blueprint/sass/single-imports/utilities.sass
vendored
Normal file
3
test/fixtures/stylesheets/blueprint/sass/single-imports/utilities.sass
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
@import "blueprint/utilities"
|
||||
|
||||
+blueprint-utilities
|
||||
@ -1,5 +1,4 @@
|
||||
.noprint,
|
||||
.no-print {
|
||||
.noprint, .no-print {
|
||||
display: none; }
|
||||
|
||||
address.print-only, blockquote.print-only, center.print-only, dir.print-only, div.print-only, dd.print-only, dl.print-only, dt.print-only, fieldset.print-only, form.print-only, frameset.print-only, h1.print-only, h2.print-only, h3.print-only, h4.print-only, h5.print-only, h6.print-only, hr.print-only, isindex.print-only, menu.print-only, noframes.print-only, noscript.print-only, ol.print-only, p.print-only, pre.print-only, ul.print-only {
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
@import compass/utilities
|
||||
|
||||
.clearfix
|
||||
+clearfix
|
||||
|
||||
.pie-clearfix
|
||||
+pie-clearfix
|
||||
9
test/fixtures/stylesheets/compass/sass/utilities.scss
vendored
Normal file
9
test/fixtures/stylesheets/compass/sass/utilities.scss
vendored
Normal file
@ -0,0 +1,9 @@
|
||||
@import "compass/utilities";
|
||||
|
||||
.clearfix {
|
||||
@include clearfix;
|
||||
}
|
||||
|
||||
.pie-clearfix {
|
||||
@include pie-clearfix;
|
||||
}
|
||||
@ -1,5 +1,3 @@
|
||||
/* line 1, ../sass/screen.sass */
|
||||
.showgrid { background-image: url('http://assets2.example.com/images/grid.png?busted=true'); }
|
||||
|
||||
/* line 4, ../sass/screen.sass */
|
||||
.inlinegrid { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAUEAYAAACv1qP4AAAABmJLR0T///////8JWPfcAAAACXBIWXMAAABIAAAASABGyWs+AAAAZ0lEQVRYw+3QwQ2AIBAFUTEUwI3+uzN7gDscsIgxEuO8An52J11X73OudfxMraXkzHfO3Y98nQEhA0IGhAwIGRAyIGRAyICQASEDQgaEDAgZEDIgZEDIgJABoZzSGK3tPuN9ERFP7Nw4fg+c5g8V1wAAAABJRU5ErkJggg=='); }
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
.showgrid
|
||||
background-image: image_url(unquote("grid.png"))
|
||||
background-image: image-url(unquote("grid.png"))
|
||||
|
||||
.inlinegrid
|
||||
background-image: inline_image(unquote("grid.png"))
|
||||
background-image: inline-image(unquote("grid.png"))
|
||||
|
||||
@ -1 +1 @@
|
||||
/* Welcome to Compass. Use this file to write IE specific override styles. Import this file using the following HTML or equivalent: <!--[if IE]> <link href="/stylesheets/ie.css" media="screen, projection" rel="stylesheet" type="text/css" /> <![endif]--> */
|
||||
/* Welcome to Compass. Use this file to write IE specific override styles. Import this file using the following HTML or equivalent: <!--[if IE]> <link href="/stylesheets/ie.css" media="screen, projection" rel="stylesheet" type="text/css" /> <![endif]--> */
|
||||
|
||||
@ -15,7 +15,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
|
||||
end
|
||||
|
||||
def test_rails_install
|
||||
# within_tmp_directory do
|
||||
within_tmp_directory do
|
||||
begin
|
||||
generate_rails_app_directories("compass_rails")
|
||||
Dir.chdir "compass_rails" do
|
||||
@ -30,7 +30,7 @@ class RailsIntegrationTest < Test::Unit::TestCase
|
||||
ensure
|
||||
FileUtils.rm_rf "compass_rails"
|
||||
end
|
||||
#end
|
||||
end
|
||||
rescue LoadError
|
||||
puts "Skipping rails test. Couldn't Load rails"
|
||||
end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user