diff --git a/.gitignore b/.gitignore index 6a991e7e..fbe701a3 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ devbin *.rbc vendor/ruby vendor +Gemfile.lock diff --git a/Gemfile b/Gemfile index 8be637a1..242b7ea6 100644 --- a/Gemfile +++ b/Gemfile @@ -7,21 +7,17 @@ gem "rspec", "~>2.0.0" gem "rails", "~>3.0.0.rc" gem "compass-validator", "3.0.1" gem "css_parser", "~> 1.0.1" -gem "sass", "~>3.1" +gem "sass", "~> 3.1" gem "haml", "~> 3.1" gem "rcov", :platform => :mri gem "rubyzip" gem "livereload" gem "ruby-prof", :platform => :mri -gem 'autotest' -gem 'autotest-fsevent' if RUBY_PLATFORM =~ /darwin/ -gem 'fakefs', :git => 'git://github.com/johnbintz/fakefs.git' gem 'mocha' gem 'timecop' gem 'diff-lcs', '~> 1.1.2' -group :mac do - gem "rb-fsevent" -end +gem 'rake', '0.8.7' +#Warning becarful adding OS dependant gems to this file it will cause issues on the CI server \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index ab6f3cba..cac92f67 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,7 @@ -GIT - remote: git://github.com/johnbintz/fakefs.git - revision: 7363b6f13bfcd9f583bbf7cd1e0d65c2dc656db7 - specs: - fakefs (0.3.1) - PATH remote: . specs: - compass (0.11.3.rails.0.dfb7c70) + compass (0.12.0.alpha.0.33263ca) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) @@ -15,7 +9,6 @@ PATH GEM remote: http://rubygems.org/ specs: - ZenTest (4.5.0) abstract (1.0.0) actionmailer (3.0.9) actionpack (= 3.0.9) @@ -45,10 +38,6 @@ GEM activesupport (3.0.9) addressable (2.2.6) arel (2.0.10) - autotest (4.4.6) - ZenTest (>= 4.4.1) - autotest-fsevent (0.2.5) - sys-uname builder (2.1.2) chunky_png (1.2.0) compass-validator (3.0.1) @@ -105,10 +94,9 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.4) - rake (0.9.2) - rb-fsevent (0.4.0) + rake (0.8.7) rcov (0.9.9) - rdoc (3.6.1) + rdoc (3.8) rspec (2.0.1) rspec-core (~> 2.0.1) rspec-expectations (~> 2.0.1) @@ -120,34 +108,30 @@ GEM rspec-core (~> 2.0.1) rspec-expectations (~> 2.0.1) ruby-json (1.1.2) - ruby-prof (0.10.7) + ruby-prof (0.10.8) rubyzip (0.9.4) - sass (3.1.3) - sys-uname (0.8.5) - term-ansicolor (1.0.5) + sass (3.1.5) + term-ansicolor (1.0.6) thor (0.14.6) timecop (0.3.5) treetop (1.4.9) polyglot (>= 0.3.1) - tzinfo (0.3.28) + tzinfo (0.3.29) PLATFORMS ruby DEPENDENCIES - autotest - autotest-fsevent compass! compass-validator (= 3.0.1) css_parser (~> 1.0.1) cucumber (~> 0.9.2) diff-lcs (~> 1.1.2) - fakefs! haml (~> 3.1) livereload mocha rails (~> 3.0.0.rc) - rb-fsevent + rake (= 0.8.7) rcov rspec (~> 2.0.0) ruby-prof diff --git a/VERSION.yml b/VERSION.yml index 8f30c9a2..f8ec44cf 100644 --- a/VERSION.yml +++ b/VERSION.yml @@ -1,7 +1,7 @@ --- :major: 0 -:minor: 11 -:patch: 3 -:state: rails +:minor: 12 +:patch: 0 +:state: alpha :build: 0 -:name: Antares +:name: Alnilam \ No newline at end of file diff --git a/doc-src/assets/images/compass.app.png b/doc-src/assets/images/compass.app.png new file mode 100644 index 00000000..1c761f02 Binary files /dev/null and b/doc-src/assets/images/compass.app.png differ diff --git a/doc-src/content/CHANGELOG.markdown b/doc-src/content/CHANGELOG.markdown index 588b699b..c6573794 100644 --- a/doc-src/content/CHANGELOG.markdown +++ b/doc-src/content/CHANGELOG.markdown @@ -14,6 +14,30 @@ The Documentation for the [latest stable release](http://compass-style.org/docs/ The Documentation for the [latest preview release](http://beta.compass-style.org/) +0.11.5 (07/10/2011) +------------------- + +* Updated the list of elements returned by the `elements-of-type()` helper. + It now understands `html5-block` and `html5-inline` and other types now + return html5 elements in them by default. +* Fix warning logic in vertical-rhythms module. +* Fix typo in the css3/transition module. + +0.11.4 (07/03/2011) +------------------- + +* Vertical rhythm now supports absolute units like pixels. + Set `$relative-font-sizing` to `false` to enable. +* Vertical rhythm now has a minimum padding that defaults to 2px. + This makes some edge cases look better. +* New mixin `force-wrap` prevents URLs and long lines of text from breaking layouts. +* Fix absolute path detection on windows. +* Fix the mime type returned for inline svg images. +* Allow multiple transitions in the CSS3 `transition` mixin. +* The Blueprint `:focus` styles no longer clobbers cascade-based overrides unnecessarily. +* The Blueprint grid-background vertical rhythm is now based off of $blueprint-font-size, + rather than a static value of 20px + 0.11.3 (06/11/2011) ------------------- diff --git a/doc-src/content/help/tutorials/spriting.markdown b/doc-src/content/help/tutorials/spriting.markdown index 82874aef..6a5b9ad7 100644 --- a/doc-src/content/help/tutorials/spriting.markdown +++ b/doc-src/content/help/tutorials/spriting.markdown @@ -52,6 +52,14 @@ simple naming convention for your sprites so that you they are easy to remember should never have to care what the is name of the generated sprite map, nor where a sprite is located within it. + +## Layout Control + +If you prefer horizontal sprites to the `vertical` default just set the magic variable `$-layout` variable. + + $icon-layout:horizontal; + @import "icon/*.png"; + ## Selector Control diff --git a/doc-src/content/help/tutorials/upgrading/im-scared.markdown b/doc-src/content/help/tutorials/upgrading/im-scared.markdown index 090c7489..2ce8fc5c 100644 --- a/doc-src/content/help/tutorials/upgrading/im-scared.markdown +++ b/doc-src/content/help/tutorials/upgrading/im-scared.markdown @@ -22,7 +22,7 @@ what changed to your stylesheets: 1. $ cd my_compass_project 2. $ compass compile --force 3. $ cp -r stylesheets stylesheets.backup -4. $ gem install compass --pre # you might need to type sudo first if you're on mac or linux. +4. $ gem install compass # you might need to type sudo first if you're on mac or linux. 5. $ compass compile --force 6. Take note of any deprecation warnings printed in red during the compile. 7. If you have textmate and installed the `mate` command line tool:
diff --git a/doc-src/content/index.haml b/doc-src/content/index.haml index 365aa750..7d7d88d0 100644 --- a/doc-src/content/index.haml +++ b/doc-src/content/index.haml @@ -69,3 +69,27 @@ layout: homepage %img(src="/images/sites/busyconf.jpg") %span.title BusyConf %span.url http://busyconf.com + +%section.book + %h3 Save 37% on the Book: (Currently In Beta) + + %p + %a(href="http://www.manning.com/netherland/") + %img(src="http://www.manning.com/netherland/netherland_cover150.jpg" alt="Sass & Compass in Action") + Compliments of Manning.com is a standing 37% discount on + Sass and Compass in Action. + Use promo code sasscomp37 at manning.com on the MEAP, eBook and pBook of Sass and + Compass in Action. All pBook purchases include free eFormats (PDF, ePub, and Kindle) + as soon as available. + +%section.gui + %h3 Hate the Command Line? + + %a(href="http://compass.handlino.com/") + %img(src="/images/compass.app.png") + %p + Buy Compass.app + for Windows and Mac for just $7. + %p.note + Note: Compass.app is a product of Handlino, Inc but + 30% of all proceeds go to Compass's charity of choice: UMDF.org. diff --git a/doc-src/content/reference/compass/helpers.haml b/doc-src/content/reference/compass/helpers.haml index 3a8846ff..f2b75453 100644 --- a/doc-src/content/reference/compass/helpers.haml +++ b/doc-src/content/reference/compass/helpers.haml @@ -15,7 +15,7 @@ layout: core :markdown The compass helpers are functions that augment the [functions provided - by Sass](http://sass-lang.com/yardoc/Sass/Script/Functions.html). + by Sass](http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html). All Helpers: diff --git a/doc-src/content/reference/compass/helpers/display.haml b/doc-src/content/reference/compass/helpers/display.haml index c0c3924e..2d5ea3f1 100644 --- a/doc-src/content/reference/compass/helpers/display.haml +++ b/doc-src/content/reference/compass/helpers/display.haml @@ -21,7 +21,7 @@ documented_functions: .details %p The following display values exist and will return - the elements listed to the right. + the elements listed below the display value. %dl %dg.head %dt Display Value diff --git a/doc-src/content/reference/compass/typography/text/force-wrap.haml b/doc-src/content/reference/compass/typography/text/force-wrap.haml new file mode 100644 index 00000000..01c747d2 --- /dev/null +++ b/doc-src/content/reference/compass/typography/text/force-wrap.haml @@ -0,0 +1,15 @@ +--- +title: Wrapping Long Text and URLs +crumb: Force Wrap +framework: compass +stylesheet: compass/typography/text/_force-wrap.scss +layout: core +meta_description: Wrap URLs and long lines of text. +classnames: + - reference + - core + - typography +--- +- render 'reference' do + %p + This mixin will wrap URLs and long lines of text to prevent text from breaking layouts. diff --git a/doc-src/content/stylesheets/partials/_home.scss b/doc-src/content/stylesheets/partials/_home.scss index 62f2dbc4..e322c02e 100644 --- a/doc-src/content/stylesheets/partials/_home.scss +++ b/doc-src/content/stylesheets/partials/_home.scss @@ -79,4 +79,21 @@ ul#featured_sites { .title { bottom: 1.7em; left: 0; z-index: 103; text-decoration: none; padding: 0 11px; color: #fff; } } } +section.book, section.gui { + width: 48%; + float: left; + @extend .group; + h3 { margin-bottom: 1em; height: 2em; text-align: left; } +} +section.book { + margin-right: 2%; + img { float: left; margin-right: 1em; margin-bottom: 1em; } +} +section.gui { + text-align: center; + .note { + font-size: smaller; + } +} + html.light body#home { h1#logo { background-position: bottom;} } \ No newline at end of file diff --git a/doc-src/lib/default.rb b/doc-src/lib/default.rb index 9067c5c6..3320748c 100644 --- a/doc-src/lib/default.rb +++ b/doc-src/lib/default.rb @@ -130,7 +130,7 @@ end def compass_version v = Compass.version - "#{v[:major]}.#{v[:minor]}#{"."+v[:state] if v[:state]}.#{v[:build]}" + "#{v[:major]}.#{v[:minor]}#{"."+v[:state] if v[:state]}.#{v[:build] || v[:patch]}" end def long_compass_version diff --git a/features/command_line.feature b/features/command_line.feature index 06e0060c..fd2b374c 100644 --- a/features/command_line.feature +++ b/features/command_line.feature @@ -63,6 +63,15 @@ Feature: Command Line And I am told that I can place stylesheets in the sass subdirectory And I am told how to compile my sass stylesheets + Scenario: Compiling a project with errors + Given I am using the existing project in test/fixtures/stylesheets/compass + And the project has a file named "sass/error.scss" containing: + """ + .broken { + """ + When I run: compass compile + Then the command exits with a non-zero error code + Scenario: Creating a bare project with a framework When I create a project using: compass create bare_project --using blueprint --bare Then an error message is printed out: A bare project cannot be created when a framework is specified. @@ -191,7 +200,7 @@ Feature: Command Line | tmp/box_shadow.css | | tmp/columns.css | | tmp/fonts.css | - | images/flag-s03c3b29b35.png | + | images/flag-s8c3c755a68.png | And the following files are removed: | .sass-cache/ | | tmp/border_radius.css | @@ -199,14 +208,14 @@ Feature: Command Line | tmp/box_shadow.css | | tmp/columns.css | | tmp/fonts.css | - | images/flag-s03c3b29b35.png | + | images/flag-s8c3c755a68.png | Scenario: Watching a project for changes Given ruby supports fork Given I am using the existing project in test/fixtures/stylesheets/compass When I run: compass compile And I run in a separate process: compass watch - And I wait 1 second + And I wait 3 seconds And I touch sass/layout.sass And I wait 2 seconds And I shutdown the other process diff --git a/features/step_definitions/command_line_steps.rb b/features/step_definitions/command_line_steps.rb index 5bddd7a7..412cabfb 100644 --- a/features/step_definitions/command_line_steps.rb +++ b/features/step_definitions/command_line_steps.rb @@ -53,6 +53,13 @@ Given /^I should clean up the directory: (\w+)$/ do |directory| @cleanup_directories << directory end +Given %r{^the project has a file named "([^"]*)" containing:$} do |arg1, string| + File.open(arg1, "w") do |f| + f << string + end +end + + # When Actions are performed When /^I create a project using: compass create ([^\s]+) ?(.+)?$/ do |dir, args| @cleanup_directories << dir @@ -126,6 +133,7 @@ end Then "the following files are reported removed:" do |table| table.rows.each do |css_file| + #need to find a better way but this works for now Then %Q{a css file #{css_file.first} is reported removed} end end diff --git a/frameworks/blueprint/stylesheets/blueprint/_debug.scss b/frameworks/blueprint/stylesheets/blueprint/_debug.scss index 414fa1a5..01b7d7c5 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_debug.scss +++ b/frameworks/blueprint/stylesheets/blueprint/_debug.scss @@ -1,5 +1,5 @@ @import "compass/layout/grid-background"; -@import "blueprint/grid"; +@import "grid", "typography"; // Shows a background that can be used to check grid alignment. // By default this is a pure css version that only works in browsers @@ -14,7 +14,7 @@ $total : $blueprint-grid-columns, $column : $blueprint-grid-width, $gutter : $blueprint-grid-margin, - $baseline : 20px + $baseline : $blueprint-font-size * 1.5 ); } } diff --git a/frameworks/blueprint/stylesheets/blueprint/_form.scss b/frameworks/blueprint/stylesheets/blueprint/_form.scss index 39a3398a..25ce4560 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_form.scss +++ b/frameworks/blueprint/stylesheets/blueprint/_form.scss @@ -59,7 +59,7 @@ background-color:#fff; border: 1px solid $unfocused-border-color; &:focus { - border: 1px solid $focus-border-color; + border-color: $focus-border-color; } } select { background-color:#fff; border-width:1px; border-style:solid; } diff --git a/frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss b/frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss index f904153e..2754b476 100644 --- a/frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss +++ b/frameworks/blueprint/stylesheets/blueprint/reset/_utilities.scss @@ -17,7 +17,7 @@ form, label, legend, caption, tbody, tfoot, thead, tr { @include blueprint-basic-reset; } #{headers(all)} { @include blueprint-basic-reset(bp-reset-element); } - #{elements-of-type(html5)} { @include blueprint-reset-html5-element(bp-reset-element); } + #{elements-of-type(html5-block)} { @include blueprint-reset-html5-element(bp-reset-element); } blockquote, q { @include blueprint-reset-quotation(bp-reset-element); } th, td, caption { @include blueprint-reset-table-cell(bp-reset-element); } table { @include blueprint-reset-table(bp-reset-element); } diff --git a/frameworks/compass/stylesheets/compass/css3/_box-shadow.scss b/frameworks/compass/stylesheets/compass/css3/_box-shadow.scss index f0eeee61..fca9b2f6 100644 --- a/frameworks/compass/stylesheets/compass/css3/_box-shadow.scss +++ b/frameworks/compass/stylesheets/compass/css3/_box-shadow.scss @@ -24,7 +24,10 @@ $default-box-shadow-spread : false !default; // The default shadow inset: inset or false (for standard shadow). $default-box-shadow-inset : false !default; -// Provides cross-browser for Webkit, Gecko, and CSS3 box shadows when one or more box shadows are needed. +// Provides cross-browser for Webkit, Gecko, and CSS3 box shadows when one or more box +// shadows are needed. +// Each shadow argument should adhere to the standard css3 syntax for the +// box-shadow property. @mixin box-shadow( $shadow-1 : default, $shadow-2 : false, diff --git a/frameworks/compass/stylesheets/compass/css3/_font-face.scss b/frameworks/compass/stylesheets/compass/css3/_font-face.scss index 6c7d511c..abb0bc53 100644 --- a/frameworks/compass/stylesheets/compass/css3/_font-face.scss +++ b/frameworks/compass/stylesheets/compass/css3/_font-face.scss @@ -6,6 +6,8 @@ // * $font-files is required using font-files('relative/location', 'format'). // for best results use this order: woff, opentype/truetype, svg // * $eot is required by IE, and is a relative location of the eot file. +// * $weight shows if the font is bold, defaults to normal +// * $style defaults to normal, might be also italic // * For android 2.2 Compatiblity, please ensure that your web page has // a meta viewport tag. // * To support iOS < 4.2, an SVG file must be provided @@ -13,13 +15,20 @@ // If you need to generate other formats check out the Font Squirrel // [font generator](http://www.fontsquirrel.com/fontface/generator) // -// Example: -// -// +font-face("this name", font-files("this.woff", "woff", "this.otf", "opentype"), "this.eot") + +// In order to refer to a specific style of the font in your stylesheets as +// e.g. "font-style: italic;", you may add a couple of @font-face includes +// containing the respective font files for each style and specying +// respective the $style parameter. + +// Order of the includes matters, and it is: normal, bold, italic, bold+italic. + @mixin font-face( $name, $font-files, - $eot: false + $eot: false, + $weight: false, + $style: false ) { $iefont: unquote("#{$eot}?iefix"); @font-face { @@ -28,6 +37,27 @@ src: font-url($eot); $font-files: font-url($iefont) unquote("format('eot')"), $font-files; } - src: $font-files; + src: $font-files; + @if $weight { + font-weight: $weight; + } + @if $style { + font-style: $style; + } } } + +// EXAMPLE +// +font-face("this name", font-files("this.woff", "woff", "this.otf", "opentype"), "this.eot", bold, italic) +// +// will generate: +// +// @font-face { +// font-family: 'this name'; +// src: url('fonts/this.eot'); +// src: local("☺"), +// url('fonts/this.otf') format('woff'), +// url('fonts/this.woff') format('opentype'); +// font-weight: bold; +// font-style: italic; +// } diff --git a/frameworks/compass/stylesheets/compass/css3/_images.scss b/frameworks/compass/stylesheets/compass/css3/_images.scss index c71e4346..b92ec6bd 100644 --- a/frameworks/compass/stylesheets/compass/css3/_images.scss +++ b/frameworks/compass/stylesheets/compass/css3/_images.scss @@ -83,10 +83,7 @@ @mixin filter-gradient($start-color, $end-color, $orientation: vertical) { @include has-layout; $gradient-type: if($orientation == vertical, 0, 1); - @if $legacy-support-for-ie8 { - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(gradientType=#{$gradient-type}, startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}')"; - } - @if $legacy-support-for-ie6 or $legacy-support-for-ie7 { + @if $legacy-support-for-ie6 or $legacy-support-for-ie7 or $legacy-support-for-ie8 { filter: progid:DXImageTransform.Microsoft.gradient(gradientType=#{$gradient-type}, startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}'); } } diff --git a/frameworks/compass/stylesheets/compass/css3/_opacity.scss b/frameworks/compass/stylesheets/compass/css3/_opacity.scss index 1cf0a538..fc497ffe 100644 --- a/frameworks/compass/stylesheets/compass/css3/_opacity.scss +++ b/frameworks/compass/stylesheets/compass/css3/_opacity.scss @@ -6,10 +6,7 @@ // A number between 0 and 1, where 0 is transparent and 1 is opaque. @mixin opacity($opacity) { - @if $legacy-support-for-ie8 { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=#{round($opacity * 100)})"; - } - @if $legacy-support-for-ie6 or $legacy-support-for-ie7 { + @if $legacy-support-for-ie6 or $legacy-support-for-ie7 or $legacy-support-for-ie8 { filter: unquote("progid:DXImageTransform.Microsoft.Alpha(Opacity=#{round($opacity * 100)})"); } opacity: $opacity; diff --git a/frameworks/compass/stylesheets/compass/css3/_text-shadow.scss b/frameworks/compass/stylesheets/compass/css3/_text-shadow.scss index ab3cb0bc..97ee2c4c 100644 --- a/frameworks/compass/stylesheets/compass/css3/_text-shadow.scss +++ b/frameworks/compass/stylesheets/compass/css3/_text-shadow.scss @@ -9,6 +9,8 @@ $default-text-shadow-v-offset: 0px !default; $default-text-shadow-blur: 1px !default; // Provides cross-browser text shadows when one or more shadows are needed. +// Each shadow argument should adhere to the standard css3 syntax for the +// text-shadow property. @mixin text-shadow( $shadow-1 : default, $shadow-2 : false, diff --git a/frameworks/compass/stylesheets/compass/css3/_transition.scss b/frameworks/compass/stylesheets/compass/css3/_transition.scss index 60487bcc..2cab9fd5 100644 --- a/frameworks/compass/stylesheets/compass/css3/_transition.scss +++ b/frameworks/compass/stylesheets/compass/css3/_transition.scss @@ -72,7 +72,7 @@ $default-transition-delay: false !default; // Transition all-in-one shorthand -@mixin transition( +@mixin single-transition( $properties: $default-transition-property, $duration: $default-transition-duration, $function: $default-transition-function, @@ -83,3 +83,37 @@ $default-transition-delay: false !default; @if $function { @include transition-timing-function($function); } @if $delay { @include transition-delay($delay); } } + +@mixin transition( + $transition-1 : default, + $transition-2 : false, + $transition-3 : false, + $transition-4 : false, + $transition-5 : false, + $transition-6 : false, + $transition-7 : false, + $transition-8 : false, + $transition-9 : false, + $transition-10: false +) { + $legacy: (type-of($transition-1) == string and type-of(if($transition-2, $transition-2, 0)) == number and type-of(if($transition-3, $transition-3, '')) == string and type-of(if($transition-4, $transition-4, 0)) == number and ($transition-2 or $transition-3 or $transition-4)); + @if $legacy { + @warn "Passing separate arguments for a single transition to transition is deprecated. " + + "Pass the values as a single space-separated list, or use the single-transition mixin."; + @include single-transition( + if($transition-1, $transition-1, $default-transition-property), + if($transition-2, $transition-2, $default-transition-duration), + if($transition-3, $transition-3, $default-transition-function), + if($transition-4, $transition-4, $default-transition-delay) + ); + } + @else { + @if $transition-1 == default { + $transition-1 : -compass-space-list(compact($default-transition-property, $default-transition-duration, $default-transition-function, $default-transition-delay)); + } + $transition : compact($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10); + @include experimental(transition, $transition, + -moz, -webkit, -o, not -ms, not -khtml, official + ); + } +} diff --git a/frameworks/compass/stylesheets/compass/reset/_utilities-legacy.scss b/frameworks/compass/stylesheets/compass/reset/_utilities-legacy.scss index 268e0f9f..8273ca33 100644 --- a/frameworks/compass/stylesheets/compass/reset/_utilities-legacy.scss +++ b/frameworks/compass/stylesheets/compass/reset/_utilities-legacy.scss @@ -105,7 +105,7 @@ // so they are rendered correctly in browsers that don't recognize them // and reset in browsers that have default styles for them. @mixin reset-html5 { - article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { + #{elements-of-type(html5-block)} { @include reset-box-model; display: block; } } diff --git a/frameworks/compass/stylesheets/compass/reset/_utilities.scss b/frameworks/compass/stylesheets/compass/reset/_utilities.scss index cd593cfa..41d5add8 100644 --- a/frameworks/compass/stylesheets/compass/reset/_utilities.scss +++ b/frameworks/compass/stylesheets/compass/reset/_utilities.scss @@ -107,12 +107,11 @@ border: none; } // Unrecognized elements are displayed inline. -// This reset provides a basic reset for html5 elements +// This reset provides a basic reset for block html5 elements // so they are rendered correctly in browsers that don't recognize them // and reset in browsers that have default styles for them. @mixin reset-html5 { - article, aside, details, figcaption, figure, - footer, header, hgroup, menu, nav, section { + #{elements-of-type(html5-block)} { display: block; } } // Resets the display of inline and block elements to their default display diff --git a/frameworks/compass/stylesheets/compass/typography/_text.scss b/frameworks/compass/stylesheets/compass/typography/_text.scss index 9cd3f0a1..885f729d 100644 --- a/frameworks/compass/stylesheets/compass/typography/_text.scss +++ b/frameworks/compass/stylesheets/compass/typography/_text.scss @@ -1,3 +1,4 @@ @import "text/ellipsis"; @import "text/nowrap"; @import "text/replacement"; +@import "text/force-wrap"; diff --git a/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss b/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss index 636ae77e..ba733b26 100644 --- a/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss +++ b/frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss @@ -10,22 +10,47 @@ $default-rhythm-border-style: solid !default; // The IE font ratio is a fact of life. Deal with it. $ie-font-ratio: 16px / 100%; +// Set to false if you want to use absolute pixes in sizing your typography. +$relative-font-sizing: true !default; + +// Ensure there is at least this many pixels +// of vertical padding above and below the text. +$min-line-padding: 2px; + +// $base-font-size but in your output unit of choice. +// Defaults to 1em when `$relative-font-sizing` +$font-unit: if($relative-font-sizing, 1em, $base-font-size) !default; + // The basic unit of font rhythm -$base-rhythm-unit: $base-line-height / $base-font-size * 1em; +$base-rhythm-unit: $base-line-height / $base-font-size * $font-unit; // The leader is the amount of whitespace in a line. // It might be useful in your calculations -$base-leader: ($base-line-height - $base-font-size) * 1em / $base-font-size; +$base-leader: ($base-line-height - $base-font-size) * $font-unit / $base-font-size; // The half-leader is the amount of whitespace above and below a line. // It might be useful in your calculations $base-half-leader: $base-leader / 2; +// True if a number has a relative unit +@function relative-unit($number) { + @return unit($number) == "%" or unit($number) == "em" or unit($number) == "rem" +} + +// True if a number has an absolute unit +@function absolute-unit($number) { + @return not (relative-unit($number) or unitless($number)); +} + +@if $relative-font-sizing and not relative-unit($font-unit) { + @warn "$relative-font-sizing is true but $font-unit is set to #{$font-unit} which is not a relative unit."; +} + // Establishes a font baseline for the given font-size in pixels @mixin establish-baseline($font-size: $base-font-size) { body { font-size: $font-size / $ie-font-ratio; - @include adjust-leading-to(1, $font-size); + @include adjust-leading-to(1, if($relative-font-sizing, $font-size, $base-font-size)); } html>body { font-size: $font-size; @@ -42,13 +67,19 @@ $base-half-leader: $base-leader / 2; // font size should use up. Does not have to be an integer, but it defaults // to the smallest integer that is large enough to fit the font. // Use $from_size to adjust from a non-base font-size. -@mixin adjust-font-size-to($to-size, $lines: ceil($to-size / $base-line-height), $from-size: $base-font-size) { - font-size: 1em * $to-size / $from-size; - @include adjust-leading-to($lines, $to-size); +@mixin adjust-font-size-to($to-size, $lines: lines-for-font-size($to-size), $from-size: $base-font-size) { + @if not $relative-font-sizing and $from-size != $base-font-size { + @warn "$relative-font-sizing is false but a relative font size was passed to adjust-font-size-to"; + } + font-size: $font-unit * $to-size / $from-size; + @include adjust-leading-to($lines, if($relative-font-sizing, $to-size, $base-font-size)); } @mixin adjust-leading-to($lines, $font-size: $base-font-size) { - line-height: 1em * $lines * $base-line-height / $font-size; + @if not $relative-font-sizing and $font-size != $base-font-size { + @warn "$relative-font-sizing is false but a relative font size was passed to adjust-leading-to"; + } + line-height: $font-unit * $lines * $base-line-height / $font-size; } // Calculate rhythm units @@ -56,32 +87,55 @@ $base-half-leader: $base-leader / 2; $lines: 1, $font-size: $base-font-size ) { - $rhythm: 1em * $lines * $base-line-height / $font-size; + @if not $relative-font-sizing and $font-size != $base-font-size { + @warn "$relative-font-sizing is false but a relative font size was passed to the rhythm function"; + } + $rhythm: $font-unit * $lines * $base-line-height / $font-size; @return $rhythm; } +@function lines-for-font-size($font-size) { + $lines: ceil($font-size / $base-line-height); + @if $lines * $base-line-height - $font-size < $min-line-padding * 2 { + $lines: $lines + 1; + } + @return $lines; +} + // Apply leading whitespace @mixin leader($lines: 1, $font-size: $base-font-size, $property: margin) { - #{$property}-top: rhythm($lines, $font-size); + $leader: rhythm($lines, $font-size); + @if unit($leader) == px { + $leader: floor($leader) + } + #{$property}-top: $leader; } +// Apply leading whitespace as padding @mixin padding-leader($lines: 1, $font-size: $base-font-size) { @include leader($lines, $font-size, padding); } +// Apply leading whitespace as margin @mixin margin-leader($lines: 1, $font-size: $base-font-size) { @include leader($lines, $font-size, margin); } // Apply trailing whitespace @mixin trailer($lines: 1, $font-size: $base-font-size, $property: margin) { - #{$property}-bottom: rhythm($lines, $font-size); + $leader: rhythm($lines, $font-size); + @if unit($leader) == px { + $leader: ceil($leader) + } + #{$property}-bottom: $leader; } +// Apply trailing whitespace as padding @mixin padding-trailer($lines: 1, $font-size: $base-font-size) { @include trailer($lines, $font-size, padding); } +// Apply trailing whitespace as margin @mixin margin-trailer($lines: 1, $font-size: $base-font-size) { @include trailer($lines, $font-size, margin); } @@ -97,19 +151,25 @@ $base-half-leader: $base-leader / 2; // Apply a border width to any side without destroying the vertical rhythm @mixin apply-side-rhythm-border($side, $width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) { + @if not $relative-font-sizing and $font-size != $base-font-size { + @warn "$relative-font-sizing is false but a relative font size was passed to apply-side-rhythm-border"; + } border-#{$side}: { style: $border-style; - width: 1em * $width / $font-size; + width: $font-unit * $width / $font-size; }; - padding-#{$side}: 1em / $font-size * ($lines * $base-line-height - $width); + padding-#{$side}: $font-unit / $font-size * ($lines * $base-line-height - $width); } // Aplly rhythm borders equally to all sides @mixin rhythm-borders($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) { + @if not $relative-font-sizing and $font-size != $base-font-size { + @warn "$relative-font-sizing is false but a relative font size was passed to rhythm-borders"; + } border: { style: $border-style; - width: 1em * $width / $font-size; }; - padding: 1em / $font-size * ($lines * $base-line-height - $width); + width: $font-unit * $width / $font-size; }; + padding: $font-unit / $font-size * ($lines * $base-line-height - $width); } // Apply a leading rhythm border diff --git a/frameworks/compass/stylesheets/compass/typography/text/_force-wrap.scss b/frameworks/compass/stylesheets/compass/typography/text/_force-wrap.scss new file mode 100644 index 00000000..8a14e8f4 --- /dev/null +++ b/frameworks/compass/stylesheets/compass/typography/text/_force-wrap.scss @@ -0,0 +1,12 @@ +// Prevent long urls and text from breaking layouts +// [originally from perishablepress.com](http://perishablepress.com/press/2010/06/01/wrapping-content/) +@mixin force-wrap { + white-space: pre; // CSS 2.0 + white-space: pre-wrap; // CSS 2.1 + white-space: pre-line; // CSS 3.0 + white-space: -pre-wrap; // Opera 4-6 + white-space: -o-pre-wrap; // Opera 7 + white-space: -moz-pre-wrap; // Mozilla + white-space: -hp-pre-wrap; // HP Printers + word-wrap: break-word; // IE 5+ +} diff --git a/frameworks/compass/stylesheets/compass/utilities/sprites/_base.scss b/frameworks/compass/stylesheets/compass/utilities/sprites/_base.scss index c346e181..1b268a84 100644 --- a/frameworks/compass/stylesheets/compass/utilities/sprites/_base.scss +++ b/frameworks/compass/stylesheets/compass/utilities/sprites/_base.scss @@ -30,18 +30,18 @@ $disable-magic-sprite-selectors:false !default; @include sprite-dimensions($map, $sprite); } @if not $disable-magic-sprite-selectors { - @include sprite-selectors($map, $sprite, $sprite); + @include sprite-selectors($map, $sprite, $sprite, $offset-x, $offset-y); } } // Include the selectors for the `$sprite` given the `$map` and the // `$full-sprite-name` // @private -@mixin sprite-selectors($map, $sprite-name, $full-sprite-name) { +@mixin sprite-selectors($map, $sprite-name, $full-sprite-name, $offset-x: 0, $offset-y: 0) { @each $selector in $sprite-selectors { @if sprite_has_selector($map, $sprite-name, $selector) { &:#{$selector}, &.#{$full-sprite-name}_#{$selector}, &.#{$full-sprite-name}-#{$selector} { - @include sprite-background-position($map, "#{$sprite-name}_#{$selector}"); + @include sprite-background-position($map, "#{$sprite-name}_#{$selector}", $offset-x, $offset-y); } } } @@ -53,13 +53,13 @@ $disable-magic-sprite-selectors:false !default; // If a base class is provided, then each class will extend it. // // If `$dimensions` is `true`, the sprite dimensions will specified. -@mixin sprites($map, $sprite-names, $base-class: false, $dimensions: false, $prefix: sprite-map-name($map)) { +@mixin sprites($map, $sprite-names, $base-class: false, $dimensions: false, $prefix: sprite-map-name($map), $offset-x: 0, $offset-y: 0) { @each $sprite-name in $sprite-names { @if sprite_does_not_have_parent($map, $sprite-name) { $full-sprite-name: "#{$prefix}-#{$sprite-name}"; .#{$full-sprite-name} { @if $base-class { @extend #{$base-class}; } - @include sprite($map, $sprite-name, $dimensions); + @include sprite($map, $sprite-name, $dimensions, $offset-x, $offset-y); } } } diff --git a/lib/compass.rb b/lib/compass.rb index 8990bdfa..2d097fcb 100644 --- a/lib/compass.rb +++ b/lib/compass.rb @@ -1,7 +1,7 @@ module Compass end -%w(dependencies util browser_support sass_extensions version errors quick_cache).each do |lib| +%w(dependencies util browser_support sass_extensions version errors quick_cache logger).each do |lib| require "compass/#{lib}" end diff --git a/lib/compass/commands/base.rb b/lib/compass/commands/base.rb index 91a0850f..d0149752 100644 --- a/lib/compass/commands/base.rb +++ b/lib/compass/commands/base.rb @@ -10,7 +10,7 @@ module Compass attr_accessor :working_path, :options def initialize(working_path, options) - self.working_path = working_path + self.working_path = working_path.to_s self.options = options end @@ -22,6 +22,14 @@ module Compass raise StandardError.new("Not Implemented") end + def successful? + !@failed + end + + def failed! + @failed = true + end + protected def framework diff --git a/lib/compass/commands/project_base.rb b/lib/compass/commands/project_base.rb index df1259d1..c4615518 100644 --- a/lib/compass/commands/project_base.rb +++ b/lib/compass/commands/project_base.rb @@ -84,8 +84,8 @@ module Compass end def absolute_path?(path) - # This is only going to work on unix, gonna need a better implementation. - path.index(File::SEPARATOR) == 0 + # Pretty basic implementation + path.index(File::SEPARATOR) == 0 || path.index(':') == 1 end def skip_extension_discovery? diff --git a/lib/compass/commands/update_project.rb b/lib/compass/commands/update_project.rb index 30e2654f..3edd6074 100644 --- a/lib/compass/commands/update_project.rb +++ b/lib/compass/commands/update_project.rb @@ -34,7 +34,8 @@ module Compass compiler = new_compiler_instance check_for_sass_files!(compiler) compiler.clean! if compiler.new_config? - compiler.run + error_count = compiler.run + failed! if error_count > 0 end def check_for_sass_files!(compiler) diff --git a/lib/compass/compiler.rb b/lib/compass/compiler.rb index fe00ef66..f5dcbe12 100644 --- a/lib/compass/compiler.rb +++ b/lib/compass/compiler.rb @@ -6,8 +6,8 @@ module Compass attr_accessor :working_path, :from, :to, :options, :sass_options, :staleness_checker, :importer def initialize(working_path, from, to, options) - self.working_path = working_path - self.from, self.to = from.gsub('./', ''), to + self.working_path = working_path.to_s + self.from, self.to = File.expand_path(from), to self.logger = options.delete(:logger) sass_opts = options.delete(:sass) || {} self.options = options @@ -82,9 +82,10 @@ module Compass end def run + failure_count = 0 if new_config? # Wipe out the cache and force compilation if the configuration has changed. - remove options[:cache_location] + remove options[:cache_location] if options[:cache_location] options[:force] = true end @@ -97,6 +98,7 @@ module Compass begin compile_if_required sass_filename, css_filename rescue Sass::SyntaxError => e + failure_count += 1 handle_exception(sass_filename, css_filename, e) end end @@ -104,6 +106,7 @@ module Compass if options[:time] puts "Compilation took #{(result.__duration * 1000).round / 1000.0}s" end + return failure_count end def compile_if_required(sass_filename, css_filename) diff --git a/lib/compass/configuration.rb b/lib/compass/configuration.rb index d8efb812..58ad570d 100644 --- a/lib/compass/configuration.rb +++ b/lib/compass/configuration.rb @@ -24,6 +24,7 @@ module Compass attributes_for_directory(:fonts), attributes_for_directory(:extensions, nil), # Compilation options + :sprite_search_path, :output_style, :environment, :relative_assets, diff --git a/lib/compass/configuration/adapters.rb b/lib/compass/configuration/adapters.rb index 352eb3c4..215982fd 100644 --- a/lib/compass/configuration/adapters.rb +++ b/lib/compass/configuration/adapters.rb @@ -38,8 +38,8 @@ module Compass end def absolute_path?(path) - # This is only going to work on unix, gonna need a better implementation. - path.index(File::SEPARATOR) == 0 + # Pretty basic implementation + path.index(File::SEPARATOR) == 0 || path.index(':') == 1 end def to_sass_engine_options diff --git a/lib/compass/configuration/defaults.rb b/lib/compass/configuration/defaults.rb index 403b185c..4b7b5d6f 100644 --- a/lib/compass/configuration/defaults.rb +++ b/lib/compass/configuration/defaults.rb @@ -88,6 +88,10 @@ module Compass def default_http_images_dir top_level.images_dir end + + def default_sprite_search_path + [top_level.images_path] + end def default_http_images_path http_root_relative top_level.http_images_dir diff --git a/lib/compass/exec/sub_command_ui.rb b/lib/compass/exec/sub_command_ui.rb index 43a5a308..f348298f 100644 --- a/lib/compass/exec/sub_command_ui.rb +++ b/lib/compass/exec/sub_command_ui.rb @@ -12,8 +12,7 @@ module Compass::Exec def run! begin - perform! - return 0 + return perform! rescue Exception => e raise e if e.is_a? SystemExit if e.is_a?(::Compass::Error) || e.is_a?(OptionParser::ParseError) @@ -40,7 +39,9 @@ module Compass::Exec else command_class.parse!(args) end - command_class.new(Dir.getwd, @options).execute + cmd = command_class.new(Dir.getwd, @options) + cmd.execute + cmd.successful? ? 0 : 1 rescue OptionParser::ParseError => e puts "Error: #{e.message}" puts command_class.usage if command_class.respond_to?(:usage) diff --git a/lib/compass/sass_extensions/functions/display.rb b/lib/compass/sass_extensions/functions/display.rb index 24363143..48f95ec9 100644 --- a/lib/compass/sass_extensions/functions/display.rb +++ b/lib/compass/sass_extensions/functions/display.rb @@ -1,12 +1,12 @@ module Compass::SassExtensions::Functions::Display DEFAULT_DISPLAY = { - :block => %w{address blockquote center dir div dd dl dt fieldset form - frameset h1 h2 h3 h4 h5 h6 hr isindex menu noframes - noscript ol p pre ul - article aside dialog figure footer header hgroup nav section}, - :inline => %w{a abbr acronym b basefont bdo big br cite code dfn em - font i img input kbd label q s samp select small span - strike strong sub sup textarea tt u var}, + :block => %w{address article aside blockquote center dir div dd details dl dt fieldset + figcaption figure form footer frameset h1 h2 h3 h4 h5 h6 hr header hgroup + isindex menu nav noframes noscript ol p pre section summary ul}, + :inline => %w{a abbr acronym audio b basefont bdo big br canvas cite code command + datalist dfn em embed font i img input keygen kbd label mark meter output + progress q rp rt ruby s samp select small span strike strong sub + sup textarea time tt u var video wbr}, :table => %w{table}, :"list-item" => %w{li}, :"table-row-group" => %w{tbody}, @@ -14,12 +14,13 @@ module Compass::SassExtensions::Functions::Display :"table-footer-group" => %w{tfoot}, :"table-row" => %w{tr}, :"table-cell" => %w{th td}, - :html5 => %w{article aside dialog figure footer header hgroup nav section} + :"html5-block" => %w{article aside details figcaption figure footer header hgroup menu nav section summary}, + :"html5-inline" => %w{audio canvas command datalist embed keygen mark meter output progress rp rt ruby time video wbr}, } - + DEFAULT_DISPLAY[:html5] = (DEFAULT_DISPLAY[:"html5-block"] + DEFAULT_DISPLAY[:"html5-inline"]).sort # returns a comma delimited string for all the # elements according to their default css3 display value. def elements_of_type(display) Sass::Script::String.new(DEFAULT_DISPLAY.fetch(display.value.to_sym).join(", ")) end -end \ No newline at end of file +end diff --git a/lib/compass/sass_extensions/functions/inline_image.rb b/lib/compass/sass_extensions/functions/inline_image.rb index 9e411751..2c59f765 100644 --- a/lib/compass/sass_extensions/functions/inline_image.rb +++ b/lib/compass/sass_extensions/functions/inline_image.rb @@ -35,6 +35,8 @@ private 'image/jpeg' when /\.gif$/i 'image/gif' + when /\.svg$/i + 'image/svg+xml' when /\.otf$/i 'font/opentype' when /\.ttf$/i diff --git a/lib/compass/sass_extensions/functions/sprites.rb b/lib/compass/sass_extensions/functions/sprites.rb index 7639f4da..d006d3ee 100644 --- a/lib/compass/sass_extensions/functions/sprites.rb +++ b/lib/compass/sass_extensions/functions/sprites.rb @@ -34,7 +34,7 @@ module Compass::SassExtensions::Functions::Sprites # # background: url('/images/icons.png?12345678') 0 -24px no-repeat; def sprite(map, sprite, offset_x = ZERO, offset_y = ZERO) - sprite = convert_sprite_name(sprite) + sprite = convert_sprite_name(sprite) verify_map(map) unless sprite.is_a?(Sass::Script::String) raise Sass::SyntaxError, %Q(The second argument to sprite() must be a sprite name. See http://beta.compass-style.org/help/tutorials/spriting/ for more information.) diff --git a/lib/compass/sass_extensions/sprites/layout_methods.rb b/lib/compass/sass_extensions/sprites/layout_methods.rb index d8787671..48235588 100644 --- a/lib/compass/sass_extensions/sprites/layout_methods.rb +++ b/lib/compass/sass_extensions/sprites/layout_methods.rb @@ -16,6 +16,7 @@ module Compass calculate_horizontal_positions calculate_width else + @images.sort! {|a,b| File.size(b.file) <=> File.size(a.file)} #put small images first calculate_width calulate_vertical_postions calculate_height diff --git a/lib/compass/sprite_importer.rb b/lib/compass/sprite_importer.rb index d46403d9..5307b2cd 100644 --- a/lib/compass/sprite_importer.rb +++ b/lib/compass/sprite_importer.rb @@ -66,7 +66,11 @@ module Compass # Returns the Glob of image files for the uri def self.files(uri) - Dir[File.join(Compass.configuration.images_path, uri)].sort + Compass.configuration.sprite_search_path.each do |folder| + files = Dir[File.join(folder, uri)].sort + next if files.empty? + return files + end end # Returns an Array of image names without the file extension @@ -80,7 +84,7 @@ module Compass end end - # Returns the sass _options for this sprite + # Returns the sass_options for this sprite def self.sass_options(name, importer, options) options.merge!(:filename => name, :syntax => :scss, :importer => importer) end @@ -132,13 +136,13 @@ $#{name}-layout:vertical !default; @include sprite($#{name}-sprites, $name, $dimensions, $offset-x, $offset-y) } -@mixin #{name}-sprites($sprite-names, $dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites)) { - @include sprites($#{name}-sprites, $sprite-names, $#{name}-sprite-base-class, $dimensions, $prefix) +@mixin #{name}-sprites($sprite-names, $dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites), $offset-x: 0, $offset-y: 0) { + @include sprites($#{name}-sprites, $sprite-names, $#{name}-sprite-base-class, $dimensions, $prefix, $offset-x, $offset-y) } // Generates a class for each sprited image. -@mixin all-#{name}-sprites($dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites)) { - @include #{name}-sprites(#{sprite_names(uri).join(" ")}, $dimensions, $prefix); +@mixin all-#{name}-sprites($dimensions: $#{name}-sprite-dimensions, $prefix: sprite-map-name($#{name}-sprites), $offset-x: 0, $offset-y: 0) { + @include #{name}-sprites(#{sprite_names(uri).join(" ")}, $dimensions, $prefix, $offset-x, $offset-y); } SCSS end diff --git a/test/fixtures/stylesheets/blueprint/css/screen.css b/test/fixtures/stylesheets/blueprint/css/screen.css index eed89ea9..abbea935 100644 --- a/test/fixtures/stylesheets/blueprint/css/screen.css +++ b/test/fixtures/stylesheets/blueprint/css/screen.css @@ -42,8 +42,7 @@ q, blockquote { a img { border: none; } -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { +article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { display: block; } body { @@ -672,10 +671,10 @@ input.span-24, textarea.span-24, select.span-24 { background-image: -o-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%), -o-linear-gradient(left, rgba(0, 0, 0, 0) 0px, rgba(100, 100, 225, 0.25) 0px, rgba(100, 100, 225, 0.25) 30px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0) 40px, rgba(100, 100, 225, 0.25) 40px, rgba(100, 100, 225, 0.25) 70px, rgba(0, 0, 0, 0) 70px, rgba(0, 0, 0, 0) 80px, rgba(100, 100, 225, 0.25) 80px, rgba(100, 100, 225, 0.25) 110px, rgba(0, 0, 0, 0) 110px, rgba(0, 0, 0, 0) 120px, rgba(100, 100, 225, 0.25) 120px, rgba(100, 100, 225, 0.25) 150px, rgba(0, 0, 0, 0) 150px, rgba(0, 0, 0, 0) 160px, rgba(100, 100, 225, 0.25) 160px, rgba(100, 100, 225, 0.25) 190px, rgba(0, 0, 0, 0) 190px, rgba(0, 0, 0, 0) 200px, rgba(100, 100, 225, 0.25) 200px, rgba(100, 100, 225, 0.25) 230px, rgba(0, 0, 0, 0) 230px, rgba(0, 0, 0, 0) 240px, rgba(100, 100, 225, 0.25) 240px, rgba(100, 100, 225, 0.25) 270px, rgba(0, 0, 0, 0) 270px, rgba(0, 0, 0, 0) 280px, rgba(100, 100, 225, 0.25) 280px, rgba(100, 100, 225, 0.25) 310px, rgba(0, 0, 0, 0) 310px, rgba(0, 0, 0, 0) 320px, rgba(100, 100, 225, 0.25) 320px, rgba(100, 100, 225, 0.25) 350px, rgba(0, 0, 0, 0) 350px, rgba(0, 0, 0, 0) 360px, rgba(100, 100, 225, 0.25) 360px, rgba(100, 100, 225, 0.25) 390px, rgba(0, 0, 0, 0) 390px, rgba(0, 0, 0, 0) 400px, rgba(100, 100, 225, 0.25) 400px, rgba(100, 100, 225, 0.25) 430px, rgba(0, 0, 0, 0) 430px, rgba(0, 0, 0, 0) 440px, rgba(100, 100, 225, 0.25) 440px, rgba(100, 100, 225, 0.25) 470px, rgba(0, 0, 0, 0) 470px, rgba(0, 0, 0, 0) 480px, rgba(100, 100, 225, 0.25) 480px, rgba(100, 100, 225, 0.25) 510px, rgba(0, 0, 0, 0) 510px, rgba(0, 0, 0, 0) 520px, rgba(100, 100, 225, 0.25) 520px, rgba(100, 100, 225, 0.25) 550px, rgba(0, 0, 0, 0) 550px, rgba(0, 0, 0, 0) 560px, rgba(100, 100, 225, 0.25) 560px, rgba(100, 100, 225, 0.25) 590px, rgba(0, 0, 0, 0) 590px, rgba(0, 0, 0, 0) 600px, rgba(100, 100, 225, 0.25) 600px, rgba(100, 100, 225, 0.25) 630px, rgba(0, 0, 0, 0) 630px, rgba(0, 0, 0, 0) 640px, rgba(100, 100, 225, 0.25) 640px, rgba(100, 100, 225, 0.25) 670px, rgba(0, 0, 0, 0) 670px, rgba(0, 0, 0, 0) 680px, rgba(100, 100, 225, 0.25) 680px, rgba(100, 100, 225, 0.25) 710px, rgba(0, 0, 0, 0) 710px, rgba(0, 0, 0, 0) 720px, rgba(100, 100, 225, 0.25) 720px, rgba(100, 100, 225, 0.25) 750px, rgba(0, 0, 0, 0) 750px, rgba(0, 0, 0, 0) 760px, rgba(100, 100, 225, 0.25) 760px, rgba(100, 100, 225, 0.25) 790px, rgba(0, 0, 0, 0) 790px, rgba(0, 0, 0, 0) 800px, rgba(100, 100, 225, 0.25) 800px, rgba(100, 100, 225, 0.25) 830px, rgba(0, 0, 0, 0) 830px, rgba(0, 0, 0, 0) 840px, rgba(100, 100, 225, 0.25) 840px, rgba(100, 100, 225, 0.25) 870px, rgba(0, 0, 0, 0) 870px, rgba(0, 0, 0, 0) 880px, rgba(100, 100, 225, 0.25) 880px, rgba(100, 100, 225, 0.25) 910px, rgba(0, 0, 0, 0) 910px, rgba(0, 0, 0, 0) 920px, rgba(100, 100, 225, 0.25) 920px, rgba(100, 100, 225, 0.25) 950px, rgba(0, 0, 0, 0) 950px, rgba(0, 0, 0, 0) 960px); background-image: -ms-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%), -ms-linear-gradient(left, rgba(0, 0, 0, 0) 0px, rgba(100, 100, 225, 0.25) 0px, rgba(100, 100, 225, 0.25) 30px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0) 40px, rgba(100, 100, 225, 0.25) 40px, rgba(100, 100, 225, 0.25) 70px, rgba(0, 0, 0, 0) 70px, rgba(0, 0, 0, 0) 80px, rgba(100, 100, 225, 0.25) 80px, rgba(100, 100, 225, 0.25) 110px, rgba(0, 0, 0, 0) 110px, rgba(0, 0, 0, 0) 120px, rgba(100, 100, 225, 0.25) 120px, rgba(100, 100, 225, 0.25) 150px, rgba(0, 0, 0, 0) 150px, rgba(0, 0, 0, 0) 160px, rgba(100, 100, 225, 0.25) 160px, rgba(100, 100, 225, 0.25) 190px, rgba(0, 0, 0, 0) 190px, rgba(0, 0, 0, 0) 200px, rgba(100, 100, 225, 0.25) 200px, rgba(100, 100, 225, 0.25) 230px, rgba(0, 0, 0, 0) 230px, rgba(0, 0, 0, 0) 240px, rgba(100, 100, 225, 0.25) 240px, rgba(100, 100, 225, 0.25) 270px, rgba(0, 0, 0, 0) 270px, rgba(0, 0, 0, 0) 280px, rgba(100, 100, 225, 0.25) 280px, rgba(100, 100, 225, 0.25) 310px, rgba(0, 0, 0, 0) 310px, rgba(0, 0, 0, 0) 320px, rgba(100, 100, 225, 0.25) 320px, rgba(100, 100, 225, 0.25) 350px, rgba(0, 0, 0, 0) 350px, rgba(0, 0, 0, 0) 360px, rgba(100, 100, 225, 0.25) 360px, rgba(100, 100, 225, 0.25) 390px, rgba(0, 0, 0, 0) 390px, rgba(0, 0, 0, 0) 400px, rgba(100, 100, 225, 0.25) 400px, rgba(100, 100, 225, 0.25) 430px, rgba(0, 0, 0, 0) 430px, rgba(0, 0, 0, 0) 440px, rgba(100, 100, 225, 0.25) 440px, rgba(100, 100, 225, 0.25) 470px, rgba(0, 0, 0, 0) 470px, rgba(0, 0, 0, 0) 480px, rgba(100, 100, 225, 0.25) 480px, rgba(100, 100, 225, 0.25) 510px, rgba(0, 0, 0, 0) 510px, rgba(0, 0, 0, 0) 520px, rgba(100, 100, 225, 0.25) 520px, rgba(100, 100, 225, 0.25) 550px, rgba(0, 0, 0, 0) 550px, rgba(0, 0, 0, 0) 560px, rgba(100, 100, 225, 0.25) 560px, rgba(100, 100, 225, 0.25) 590px, rgba(0, 0, 0, 0) 590px, rgba(0, 0, 0, 0) 600px, rgba(100, 100, 225, 0.25) 600px, rgba(100, 100, 225, 0.25) 630px, rgba(0, 0, 0, 0) 630px, rgba(0, 0, 0, 0) 640px, rgba(100, 100, 225, 0.25) 640px, rgba(100, 100, 225, 0.25) 670px, rgba(0, 0, 0, 0) 670px, rgba(0, 0, 0, 0) 680px, rgba(100, 100, 225, 0.25) 680px, rgba(100, 100, 225, 0.25) 710px, rgba(0, 0, 0, 0) 710px, rgba(0, 0, 0, 0) 720px, rgba(100, 100, 225, 0.25) 720px, rgba(100, 100, 225, 0.25) 750px, rgba(0, 0, 0, 0) 750px, rgba(0, 0, 0, 0) 760px, rgba(100, 100, 225, 0.25) 760px, rgba(100, 100, 225, 0.25) 790px, rgba(0, 0, 0, 0) 790px, rgba(0, 0, 0, 0) 800px, rgba(100, 100, 225, 0.25) 800px, rgba(100, 100, 225, 0.25) 830px, rgba(0, 0, 0, 0) 830px, rgba(0, 0, 0, 0) 840px, rgba(100, 100, 225, 0.25) 840px, rgba(100, 100, 225, 0.25) 870px, rgba(0, 0, 0, 0) 870px, rgba(0, 0, 0, 0) 880px, rgba(100, 100, 225, 0.25) 880px, rgba(100, 100, 225, 0.25) 910px, rgba(0, 0, 0, 0) 910px, rgba(0, 0, 0, 0) 920px, rgba(100, 100, 225, 0.25) 920px, rgba(100, 100, 225, 0.25) 950px, rgba(0, 0, 0, 0) 950px, rgba(0, 0, 0, 0) 960px); background-image: linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%), linear-gradient(left, rgba(0, 0, 0, 0) 0px, rgba(100, 100, 225, 0.25) 0px, rgba(100, 100, 225, 0.25) 30px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0) 40px, rgba(100, 100, 225, 0.25) 40px, rgba(100, 100, 225, 0.25) 70px, rgba(0, 0, 0, 0) 70px, rgba(0, 0, 0, 0) 80px, rgba(100, 100, 225, 0.25) 80px, rgba(100, 100, 225, 0.25) 110px, rgba(0, 0, 0, 0) 110px, rgba(0, 0, 0, 0) 120px, rgba(100, 100, 225, 0.25) 120px, rgba(100, 100, 225, 0.25) 150px, rgba(0, 0, 0, 0) 150px, rgba(0, 0, 0, 0) 160px, rgba(100, 100, 225, 0.25) 160px, rgba(100, 100, 225, 0.25) 190px, rgba(0, 0, 0, 0) 190px, rgba(0, 0, 0, 0) 200px, rgba(100, 100, 225, 0.25) 200px, rgba(100, 100, 225, 0.25) 230px, rgba(0, 0, 0, 0) 230px, rgba(0, 0, 0, 0) 240px, rgba(100, 100, 225, 0.25) 240px, rgba(100, 100, 225, 0.25) 270px, rgba(0, 0, 0, 0) 270px, rgba(0, 0, 0, 0) 280px, rgba(100, 100, 225, 0.25) 280px, rgba(100, 100, 225, 0.25) 310px, rgba(0, 0, 0, 0) 310px, rgba(0, 0, 0, 0) 320px, rgba(100, 100, 225, 0.25) 320px, rgba(100, 100, 225, 0.25) 350px, rgba(0, 0, 0, 0) 350px, rgba(0, 0, 0, 0) 360px, rgba(100, 100, 225, 0.25) 360px, rgba(100, 100, 225, 0.25) 390px, rgba(0, 0, 0, 0) 390px, rgba(0, 0, 0, 0) 400px, rgba(100, 100, 225, 0.25) 400px, rgba(100, 100, 225, 0.25) 430px, rgba(0, 0, 0, 0) 430px, rgba(0, 0, 0, 0) 440px, rgba(100, 100, 225, 0.25) 440px, rgba(100, 100, 225, 0.25) 470px, rgba(0, 0, 0, 0) 470px, rgba(0, 0, 0, 0) 480px, rgba(100, 100, 225, 0.25) 480px, rgba(100, 100, 225, 0.25) 510px, rgba(0, 0, 0, 0) 510px, rgba(0, 0, 0, 0) 520px, rgba(100, 100, 225, 0.25) 520px, rgba(100, 100, 225, 0.25) 550px, rgba(0, 0, 0, 0) 550px, rgba(0, 0, 0, 0) 560px, rgba(100, 100, 225, 0.25) 560px, rgba(100, 100, 225, 0.25) 590px, rgba(0, 0, 0, 0) 590px, rgba(0, 0, 0, 0) 600px, rgba(100, 100, 225, 0.25) 600px, rgba(100, 100, 225, 0.25) 630px, rgba(0, 0, 0, 0) 630px, rgba(0, 0, 0, 0) 640px, rgba(100, 100, 225, 0.25) 640px, rgba(100, 100, 225, 0.25) 670px, rgba(0, 0, 0, 0) 670px, rgba(0, 0, 0, 0) 680px, rgba(100, 100, 225, 0.25) 680px, rgba(100, 100, 225, 0.25) 710px, rgba(0, 0, 0, 0) 710px, rgba(0, 0, 0, 0) 720px, rgba(100, 100, 225, 0.25) 720px, rgba(100, 100, 225, 0.25) 750px, rgba(0, 0, 0, 0) 750px, rgba(0, 0, 0, 0) 760px, rgba(100, 100, 225, 0.25) 760px, rgba(100, 100, 225, 0.25) 790px, rgba(0, 0, 0, 0) 790px, rgba(0, 0, 0, 0) 800px, rgba(100, 100, 225, 0.25) 800px, rgba(100, 100, 225, 0.25) 830px, rgba(0, 0, 0, 0) 830px, rgba(0, 0, 0, 0) 840px, rgba(100, 100, 225, 0.25) 840px, rgba(100, 100, 225, 0.25) 870px, rgba(0, 0, 0, 0) 870px, rgba(0, 0, 0, 0) 880px, rgba(100, 100, 225, 0.25) 880px, rgba(100, 100, 225, 0.25) 910px, rgba(0, 0, 0, 0) 910px, rgba(0, 0, 0, 0) 920px, rgba(100, 100, 225, 0.25) 920px, rgba(100, 100, 225, 0.25) 950px, rgba(0, 0, 0, 0) 950px, rgba(0, 0, 0, 0) 960px); - -moz-background-size: 100% 20px, auto; - -webkit-background-size: 100% 20px, auto; - -o-background-size: 100% 20px, auto; - background-size: 100% 20px, auto; + -moz-background-size: 100% 18px, auto; + -webkit-background-size: 100% 18px, auto; + -o-background-size: 100% 18px, auto; + background-size: 100% 18px, auto; background-position: left top; } .feedback, .error, .alert, .notice, .success, .info { @@ -759,7 +758,7 @@ textarea { border: 1px solid #bbbbbb; } input.text:focus, input.title:focus, input[type=email]:focus, input[type=text]:focus, input[type=password]:focus, textarea:focus { - border: 1px solid #666666; } + border-color: #666666; } select { background-color: #fff; diff --git a/test/fixtures/stylesheets/blueprint/css/single-imports/debug.css b/test/fixtures/stylesheets/blueprint/css/single-imports/debug.css index 7b305c81..738b46d3 100644 --- a/test/fixtures/stylesheets/blueprint/css/single-imports/debug.css +++ b/test/fixtures/stylesheets/blueprint/css/single-imports/debug.css @@ -5,8 +5,8 @@ background-image: -o-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%), -o-linear-gradient(left, rgba(0, 0, 0, 0) 0px, rgba(100, 100, 225, 0.25) 0px, rgba(100, 100, 225, 0.25) 30px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0) 40px, rgba(100, 100, 225, 0.25) 40px, rgba(100, 100, 225, 0.25) 70px, rgba(0, 0, 0, 0) 70px, rgba(0, 0, 0, 0) 80px, rgba(100, 100, 225, 0.25) 80px, rgba(100, 100, 225, 0.25) 110px, rgba(0, 0, 0, 0) 110px, rgba(0, 0, 0, 0) 120px, rgba(100, 100, 225, 0.25) 120px, rgba(100, 100, 225, 0.25) 150px, rgba(0, 0, 0, 0) 150px, rgba(0, 0, 0, 0) 160px, rgba(100, 100, 225, 0.25) 160px, rgba(100, 100, 225, 0.25) 190px, rgba(0, 0, 0, 0) 190px, rgba(0, 0, 0, 0) 200px, rgba(100, 100, 225, 0.25) 200px, rgba(100, 100, 225, 0.25) 230px, rgba(0, 0, 0, 0) 230px, rgba(0, 0, 0, 0) 240px, rgba(100, 100, 225, 0.25) 240px, rgba(100, 100, 225, 0.25) 270px, rgba(0, 0, 0, 0) 270px, rgba(0, 0, 0, 0) 280px, rgba(100, 100, 225, 0.25) 280px, rgba(100, 100, 225, 0.25) 310px, rgba(0, 0, 0, 0) 310px, rgba(0, 0, 0, 0) 320px, rgba(100, 100, 225, 0.25) 320px, rgba(100, 100, 225, 0.25) 350px, rgba(0, 0, 0, 0) 350px, rgba(0, 0, 0, 0) 360px, rgba(100, 100, 225, 0.25) 360px, rgba(100, 100, 225, 0.25) 390px, rgba(0, 0, 0, 0) 390px, rgba(0, 0, 0, 0) 400px, rgba(100, 100, 225, 0.25) 400px, rgba(100, 100, 225, 0.25) 430px, rgba(0, 0, 0, 0) 430px, rgba(0, 0, 0, 0) 440px, rgba(100, 100, 225, 0.25) 440px, rgba(100, 100, 225, 0.25) 470px, rgba(0, 0, 0, 0) 470px, rgba(0, 0, 0, 0) 480px, rgba(100, 100, 225, 0.25) 480px, rgba(100, 100, 225, 0.25) 510px, rgba(0, 0, 0, 0) 510px, rgba(0, 0, 0, 0) 520px, rgba(100, 100, 225, 0.25) 520px, rgba(100, 100, 225, 0.25) 550px, rgba(0, 0, 0, 0) 550px, rgba(0, 0, 0, 0) 560px, rgba(100, 100, 225, 0.25) 560px, rgba(100, 100, 225, 0.25) 590px, rgba(0, 0, 0, 0) 590px, rgba(0, 0, 0, 0) 600px, rgba(100, 100, 225, 0.25) 600px, rgba(100, 100, 225, 0.25) 630px, rgba(0, 0, 0, 0) 630px, rgba(0, 0, 0, 0) 640px, rgba(100, 100, 225, 0.25) 640px, rgba(100, 100, 225, 0.25) 670px, rgba(0, 0, 0, 0) 670px, rgba(0, 0, 0, 0) 680px, rgba(100, 100, 225, 0.25) 680px, rgba(100, 100, 225, 0.25) 710px, rgba(0, 0, 0, 0) 710px, rgba(0, 0, 0, 0) 720px, rgba(100, 100, 225, 0.25) 720px, rgba(100, 100, 225, 0.25) 750px, rgba(0, 0, 0, 0) 750px, rgba(0, 0, 0, 0) 760px, rgba(100, 100, 225, 0.25) 760px, rgba(100, 100, 225, 0.25) 790px, rgba(0, 0, 0, 0) 790px, rgba(0, 0, 0, 0) 800px, rgba(100, 100, 225, 0.25) 800px, rgba(100, 100, 225, 0.25) 830px, rgba(0, 0, 0, 0) 830px, rgba(0, 0, 0, 0) 840px, rgba(100, 100, 225, 0.25) 840px, rgba(100, 100, 225, 0.25) 870px, rgba(0, 0, 0, 0) 870px, rgba(0, 0, 0, 0) 880px, rgba(100, 100, 225, 0.25) 880px, rgba(100, 100, 225, 0.25) 910px, rgba(0, 0, 0, 0) 910px, rgba(0, 0, 0, 0) 920px, rgba(100, 100, 225, 0.25) 920px, rgba(100, 100, 225, 0.25) 950px, rgba(0, 0, 0, 0) 950px, rgba(0, 0, 0, 0) 960px); background-image: -ms-linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%), -ms-linear-gradient(left, rgba(0, 0, 0, 0) 0px, rgba(100, 100, 225, 0.25) 0px, rgba(100, 100, 225, 0.25) 30px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0) 40px, rgba(100, 100, 225, 0.25) 40px, rgba(100, 100, 225, 0.25) 70px, rgba(0, 0, 0, 0) 70px, rgba(0, 0, 0, 0) 80px, rgba(100, 100, 225, 0.25) 80px, rgba(100, 100, 225, 0.25) 110px, rgba(0, 0, 0, 0) 110px, rgba(0, 0, 0, 0) 120px, rgba(100, 100, 225, 0.25) 120px, rgba(100, 100, 225, 0.25) 150px, rgba(0, 0, 0, 0) 150px, rgba(0, 0, 0, 0) 160px, rgba(100, 100, 225, 0.25) 160px, rgba(100, 100, 225, 0.25) 190px, rgba(0, 0, 0, 0) 190px, rgba(0, 0, 0, 0) 200px, rgba(100, 100, 225, 0.25) 200px, rgba(100, 100, 225, 0.25) 230px, rgba(0, 0, 0, 0) 230px, rgba(0, 0, 0, 0) 240px, rgba(100, 100, 225, 0.25) 240px, rgba(100, 100, 225, 0.25) 270px, rgba(0, 0, 0, 0) 270px, rgba(0, 0, 0, 0) 280px, rgba(100, 100, 225, 0.25) 280px, rgba(100, 100, 225, 0.25) 310px, rgba(0, 0, 0, 0) 310px, rgba(0, 0, 0, 0) 320px, rgba(100, 100, 225, 0.25) 320px, rgba(100, 100, 225, 0.25) 350px, rgba(0, 0, 0, 0) 350px, rgba(0, 0, 0, 0) 360px, rgba(100, 100, 225, 0.25) 360px, rgba(100, 100, 225, 0.25) 390px, rgba(0, 0, 0, 0) 390px, rgba(0, 0, 0, 0) 400px, rgba(100, 100, 225, 0.25) 400px, rgba(100, 100, 225, 0.25) 430px, rgba(0, 0, 0, 0) 430px, rgba(0, 0, 0, 0) 440px, rgba(100, 100, 225, 0.25) 440px, rgba(100, 100, 225, 0.25) 470px, rgba(0, 0, 0, 0) 470px, rgba(0, 0, 0, 0) 480px, rgba(100, 100, 225, 0.25) 480px, rgba(100, 100, 225, 0.25) 510px, rgba(0, 0, 0, 0) 510px, rgba(0, 0, 0, 0) 520px, rgba(100, 100, 225, 0.25) 520px, rgba(100, 100, 225, 0.25) 550px, rgba(0, 0, 0, 0) 550px, rgba(0, 0, 0, 0) 560px, rgba(100, 100, 225, 0.25) 560px, rgba(100, 100, 225, 0.25) 590px, rgba(0, 0, 0, 0) 590px, rgba(0, 0, 0, 0) 600px, rgba(100, 100, 225, 0.25) 600px, rgba(100, 100, 225, 0.25) 630px, rgba(0, 0, 0, 0) 630px, rgba(0, 0, 0, 0) 640px, rgba(100, 100, 225, 0.25) 640px, rgba(100, 100, 225, 0.25) 670px, rgba(0, 0, 0, 0) 670px, rgba(0, 0, 0, 0) 680px, rgba(100, 100, 225, 0.25) 680px, rgba(100, 100, 225, 0.25) 710px, rgba(0, 0, 0, 0) 710px, rgba(0, 0, 0, 0) 720px, rgba(100, 100, 225, 0.25) 720px, rgba(100, 100, 225, 0.25) 750px, rgba(0, 0, 0, 0) 750px, rgba(0, 0, 0, 0) 760px, rgba(100, 100, 225, 0.25) 760px, rgba(100, 100, 225, 0.25) 790px, rgba(0, 0, 0, 0) 790px, rgba(0, 0, 0, 0) 800px, rgba(100, 100, 225, 0.25) 800px, rgba(100, 100, 225, 0.25) 830px, rgba(0, 0, 0, 0) 830px, rgba(0, 0, 0, 0) 840px, rgba(100, 100, 225, 0.25) 840px, rgba(100, 100, 225, 0.25) 870px, rgba(0, 0, 0, 0) 870px, rgba(0, 0, 0, 0) 880px, rgba(100, 100, 225, 0.25) 880px, rgba(100, 100, 225, 0.25) 910px, rgba(0, 0, 0, 0) 910px, rgba(0, 0, 0, 0) 920px, rgba(100, 100, 225, 0.25) 920px, rgba(100, 100, 225, 0.25) 950px, rgba(0, 0, 0, 0) 950px, rgba(0, 0, 0, 0) 960px); background-image: linear-gradient(bottom, rgba(0, 0, 0, 0.5) 5%, rgba(0, 0, 0, 0) 5%), linear-gradient(left, rgba(0, 0, 0, 0) 0px, rgba(100, 100, 225, 0.25) 0px, rgba(100, 100, 225, 0.25) 30px, rgba(0, 0, 0, 0) 30px, rgba(0, 0, 0, 0) 40px, rgba(100, 100, 225, 0.25) 40px, rgba(100, 100, 225, 0.25) 70px, rgba(0, 0, 0, 0) 70px, rgba(0, 0, 0, 0) 80px, rgba(100, 100, 225, 0.25) 80px, rgba(100, 100, 225, 0.25) 110px, rgba(0, 0, 0, 0) 110px, rgba(0, 0, 0, 0) 120px, rgba(100, 100, 225, 0.25) 120px, rgba(100, 100, 225, 0.25) 150px, rgba(0, 0, 0, 0) 150px, rgba(0, 0, 0, 0) 160px, rgba(100, 100, 225, 0.25) 160px, rgba(100, 100, 225, 0.25) 190px, rgba(0, 0, 0, 0) 190px, rgba(0, 0, 0, 0) 200px, rgba(100, 100, 225, 0.25) 200px, rgba(100, 100, 225, 0.25) 230px, rgba(0, 0, 0, 0) 230px, rgba(0, 0, 0, 0) 240px, rgba(100, 100, 225, 0.25) 240px, rgba(100, 100, 225, 0.25) 270px, rgba(0, 0, 0, 0) 270px, rgba(0, 0, 0, 0) 280px, rgba(100, 100, 225, 0.25) 280px, rgba(100, 100, 225, 0.25) 310px, rgba(0, 0, 0, 0) 310px, rgba(0, 0, 0, 0) 320px, rgba(100, 100, 225, 0.25) 320px, rgba(100, 100, 225, 0.25) 350px, rgba(0, 0, 0, 0) 350px, rgba(0, 0, 0, 0) 360px, rgba(100, 100, 225, 0.25) 360px, rgba(100, 100, 225, 0.25) 390px, rgba(0, 0, 0, 0) 390px, rgba(0, 0, 0, 0) 400px, rgba(100, 100, 225, 0.25) 400px, rgba(100, 100, 225, 0.25) 430px, rgba(0, 0, 0, 0) 430px, rgba(0, 0, 0, 0) 440px, rgba(100, 100, 225, 0.25) 440px, rgba(100, 100, 225, 0.25) 470px, rgba(0, 0, 0, 0) 470px, rgba(0, 0, 0, 0) 480px, rgba(100, 100, 225, 0.25) 480px, rgba(100, 100, 225, 0.25) 510px, rgba(0, 0, 0, 0) 510px, rgba(0, 0, 0, 0) 520px, rgba(100, 100, 225, 0.25) 520px, rgba(100, 100, 225, 0.25) 550px, rgba(0, 0, 0, 0) 550px, rgba(0, 0, 0, 0) 560px, rgba(100, 100, 225, 0.25) 560px, rgba(100, 100, 225, 0.25) 590px, rgba(0, 0, 0, 0) 590px, rgba(0, 0, 0, 0) 600px, rgba(100, 100, 225, 0.25) 600px, rgba(100, 100, 225, 0.25) 630px, rgba(0, 0, 0, 0) 630px, rgba(0, 0, 0, 0) 640px, rgba(100, 100, 225, 0.25) 640px, rgba(100, 100, 225, 0.25) 670px, rgba(0, 0, 0, 0) 670px, rgba(0, 0, 0, 0) 680px, rgba(100, 100, 225, 0.25) 680px, rgba(100, 100, 225, 0.25) 710px, rgba(0, 0, 0, 0) 710px, rgba(0, 0, 0, 0) 720px, rgba(100, 100, 225, 0.25) 720px, rgba(100, 100, 225, 0.25) 750px, rgba(0, 0, 0, 0) 750px, rgba(0, 0, 0, 0) 760px, rgba(100, 100, 225, 0.25) 760px, rgba(100, 100, 225, 0.25) 790px, rgba(0, 0, 0, 0) 790px, rgba(0, 0, 0, 0) 800px, rgba(100, 100, 225, 0.25) 800px, rgba(100, 100, 225, 0.25) 830px, rgba(0, 0, 0, 0) 830px, rgba(0, 0, 0, 0) 840px, rgba(100, 100, 225, 0.25) 840px, rgba(100, 100, 225, 0.25) 870px, rgba(0, 0, 0, 0) 870px, rgba(0, 0, 0, 0) 880px, rgba(100, 100, 225, 0.25) 880px, rgba(100, 100, 225, 0.25) 910px, rgba(0, 0, 0, 0) 910px, rgba(0, 0, 0, 0) 920px, rgba(100, 100, 225, 0.25) 920px, rgba(100, 100, 225, 0.25) 950px, rgba(0, 0, 0, 0) 950px, rgba(0, 0, 0, 0) 960px); - -moz-background-size: 100% 20px, auto; - -webkit-background-size: 100% 20px, auto; - -o-background-size: 100% 20px, auto; - background-size: 100% 20px, auto; + -moz-background-size: 100% 18px, auto; + -webkit-background-size: 100% 18px, auto; + -o-background-size: 100% 18px, auto; + background-size: 100% 18px, auto; background-position: left top; } diff --git a/test/fixtures/stylesheets/blueprint/css/single-imports/form.css b/test/fixtures/stylesheets/blueprint/css/single-imports/form.css index 13c1bd2a..a61ac8f3 100644 --- a/test/fixtures/stylesheets/blueprint/css/single-imports/form.css +++ b/test/fixtures/stylesheets/blueprint/css/single-imports/form.css @@ -30,7 +30,7 @@ form.bp textarea { border: 1px solid #bbbbbb; } form.bp input.text:focus, form.bp input.title:focus, form.bp input[type=email]:focus, form.bp input[type=text]:focus, form.bp input[type=password]:focus, form.bp textarea:focus { - border: 1px solid #666666; } + border-color: #666666; } form.bp select { background-color: #fff; border-width: 1px; diff --git a/test/fixtures/stylesheets/blueprint/css/single-imports/reset-utilities.css b/test/fixtures/stylesheets/blueprint/css/single-imports/reset-utilities.css index a1dc9f8a..5ddd1bb2 100644 --- a/test/fixtures/stylesheets/blueprint/css/single-imports/reset-utilities.css +++ b/test/fixtures/stylesheets/blueprint/css/single-imports/reset-utilities.css @@ -3,7 +3,7 @@ html { padding: 0; border: 0; } -.bp-reset-element, body, h1, h2, h3, h4, h5, h6, article, aside, dialog, figure, footer, header, hgroup, nav, section, blockquote, q, th, td, caption, table, body.testing h1, body.testing h2, body.testing h3, body.testing h4, body.testing h5, body.testing h6, body.testing article, body.testing aside, body.testing dialog, body.testing figure, body.testing footer, body.testing header, body.testing hgroup, body.testing nav, body.testing section, body.testing blockquote, body.testing q, body.testing th, body.testing td, body.testing caption, body.testing table, div, span, object, iframe, p, pre, a, abbr, acronym, address, code, del, dfn, em, img, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr { +.bp-reset-element, body, h1, h2, h3, h4, h5, h6, article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary, blockquote, q, th, td, caption, table, body.testing h1, body.testing h2, body.testing h3, body.testing h4, body.testing h5, body.testing h6, body.testing article, body.testing aside, body.testing details, body.testing figcaption, body.testing figure, body.testing footer, body.testing header, body.testing hgroup, body.testing menu, body.testing nav, body.testing section, body.testing summary, body.testing blockquote, body.testing q, body.testing th, body.testing td, body.testing caption, body.testing table, div, span, object, iframe, p, pre, a, abbr, acronym, address, code, del, dfn, em, img, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr { margin: 0; padding: 0; border: 0; @@ -13,7 +13,7 @@ html { font-family: inherit; vertical-align: baseline; } -article, aside, dialog, figure, footer, header, hgroup, nav, section { +article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { display: block; } blockquote, q { @@ -35,7 +35,7 @@ table { a img { border: none; } -body.testing .bp-reset-element, body.testing body, body.testing h1, body.testing h2, body.testing h3, body.testing h4, body.testing h5, body.testing h6, body.testing article, body.testing aside, body.testing dialog, body.testing figure, body.testing footer, body.testing header, body.testing hgroup, body.testing nav, body.testing section, body.testing blockquote, body.testing q, body.testing th, body.testing td, body.testing caption, body.testing table, body.testing h1, body.testing h2, body.testing h3, body.testing h4, body.testing h5, body.testing h6, body.testing article, body.testing aside, body.testing dialog, body.testing figure, body.testing footer, body.testing header, body.testing hgroup, body.testing nav, body.testing section, body.testing blockquote, body.testing q, body.testing th, body.testing td, body.testing caption, body.testing table, +body.testing .bp-reset-element, body.testing body, body.testing h1, body.testing h2, body.testing h3, body.testing h4, body.testing h5, body.testing h6, body.testing article, body.testing aside, body.testing details, body.testing figcaption, body.testing figure, body.testing footer, body.testing header, body.testing hgroup, body.testing menu, body.testing nav, body.testing section, body.testing summary, body.testing blockquote, body.testing q, body.testing th, body.testing td, body.testing caption, body.testing table, body.testing h1, body.testing h2, body.testing h3, body.testing h4, body.testing h5, body.testing h6, body.testing article, body.testing aside, body.testing details, body.testing figcaption, body.testing figure, body.testing footer, body.testing header, body.testing hgroup, body.testing menu, body.testing nav, body.testing section, body.testing summary, body.testing blockquote, body.testing q, body.testing th, body.testing td, body.testing caption, body.testing table, body.testing div, body.testing span, body.testing object, body.testing iframe, body.testing p, body.testing pre, body.testing a, body.testing abbr, body.testing acronym, body.testing address, body.testing code, body.testing del, body.testing dfn, body.testing em, body.testing img, @@ -50,7 +50,7 @@ body.testing caption, body.testing tbody, body.testing tfoot, body.testing thead font-size: 100%; font-family: inherit; vertical-align: baseline; } -body.testing article, body.testing aside, body.testing dialog, body.testing figure, body.testing footer, body.testing header, body.testing hgroup, body.testing nav, body.testing section { +body.testing article, body.testing aside, body.testing details, body.testing figcaption, body.testing figure, body.testing footer, body.testing header, body.testing hgroup, body.testing menu, body.testing nav, body.testing section, body.testing summary { display: block; } body.testing blockquote, body.testing q { quotes: "" ""; } diff --git a/test/fixtures/stylesheets/blueprint/css/single-imports/reset.css b/test/fixtures/stylesheets/blueprint/css/single-imports/reset.css index 63bd86a7..4849fff3 100644 --- a/test/fixtures/stylesheets/blueprint/css/single-imports/reset.css +++ b/test/fixtures/stylesheets/blueprint/css/single-imports/reset.css @@ -3,7 +3,7 @@ html { padding: 0; border: 0; } -.bp-reset-element, body, h1, h2, h3, h4, h5, h6, article, aside, dialog, figure, footer, header, hgroup, nav, section, blockquote, q, th, td, caption, table, +.bp-reset-element, body, h1, h2, h3, h4, h5, h6, article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary, blockquote, q, th, td, caption, table, div, span, object, iframe, p, pre, a, abbr, acronym, address, code, del, dfn, em, img, @@ -19,7 +19,7 @@ caption, tbody, tfoot, thead, tr { font-family: inherit; vertical-align: baseline; } -article, aside, dialog, figure, footer, header, hgroup, nav, section { +article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { display: block; } blockquote, q { diff --git a/test/fixtures/stylesheets/compass/css/force-wrap.css b/test/fixtures/stylesheets/compass/css/force-wrap.css new file mode 100644 index 00000000..2fb33551 --- /dev/null +++ b/test/fixtures/stylesheets/compass/css/force-wrap.css @@ -0,0 +1,9 @@ +pre { + white-space: pre; + white-space: pre-wrap; + white-space: pre-line; + white-space: -pre-wrap; + white-space: -o-pre-wrap; + white-space: -moz-pre-wrap; + white-space: -hp-pre-wrap; + word-wrap: break-word; } diff --git a/test/fixtures/stylesheets/compass/css/gradients.css b/test/fixtures/stylesheets/compass/css/gradients.css index 1bfba05e..384db492 100644 --- a/test/fixtures/stylesheets/compass/css/gradients.css +++ b/test/fixtures/stylesheets/compass/css/gradients.css @@ -565,15 +565,12 @@ .ie-horizontal-filter { *zoom: 1; - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(gradientType=1, startColorstr='#FFFFFFFF', endColorstr='#FF000000')"; filter: progid:DXImageTransform.Microsoft.gradient(gradientType=1, startColorstr='#FFFFFFFF', endColorstr='#FF000000'); } .ie-vertical-filter { *zoom: 1; - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#FFFFFFFF', endColorstr='#FF000000')"; filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#FFFFFFFF', endColorstr='#FF000000'); } .ie-alpha-filter { *zoom: 1; - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#FFFFFFFF', endColorstr='#00FFFFFF')"; filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#FFFFFFFF', endColorstr='#00FFFFFF'); } diff --git a/test/fixtures/stylesheets/compass/css/opacity.css b/test/fixtures/stylesheets/compass/css/opacity.css index ea882d57..4f4385d3 100644 --- a/test/fixtures/stylesheets/compass/css/opacity.css +++ b/test/fixtures/stylesheets/compass/css/opacity.css @@ -1,4 +1,3 @@ div { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)"; filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=20); opacity: 0.2; } diff --git a/test/fixtures/stylesheets/compass/css/print.css b/test/fixtures/stylesheets/compass/css/print.css index 74dec933..0978b0d1 100644 --- a/test/fixtures/stylesheets/compass/css/print.css +++ b/test/fixtures/stylesheets/compass/css/print.css @@ -1,10 +1,10 @@ .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, article.print-only, aside.print-only, dialog.print-only, figure.print-only, footer.print-only, header.print-only, hgroup.print-only, nav.print-only, section.print-only { +address.print-only, article.print-only, aside.print-only, blockquote.print-only, center.print-only, dir.print-only, div.print-only, dd.print-only, details.print-only, dl.print-only, dt.print-only, fieldset.print-only, figcaption.print-only, figure.print-only, form.print-only, footer.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, header.print-only, hgroup.print-only, isindex.print-only, menu.print-only, nav.print-only, noframes.print-only, noscript.print-only, ol.print-only, p.print-only, pre.print-only, section.print-only, summary.print-only, ul.print-only { display: block; } -a.print-only, abbr.print-only, acronym.print-only, b.print-only, basefont.print-only, bdo.print-only, big.print-only, br.print-only, cite.print-only, code.print-only, dfn.print-only, em.print-only, font.print-only, i.print-only, img.print-only, input.print-only, kbd.print-only, label.print-only, q.print-only, s.print-only, samp.print-only, select.print-only, small.print-only, span.print-only, strike.print-only, strong.print-only, sub.print-only, sup.print-only, textarea.print-only, tt.print-only, u.print-only, var.print-only { +a.print-only, abbr.print-only, acronym.print-only, audio.print-only, b.print-only, basefont.print-only, bdo.print-only, big.print-only, br.print-only, canvas.print-only, cite.print-only, code.print-only, command.print-only, datalist.print-only, dfn.print-only, em.print-only, embed.print-only, font.print-only, i.print-only, img.print-only, input.print-only, keygen.print-only, kbd.print-only, label.print-only, mark.print-only, meter.print-only, output.print-only, progress.print-only, q.print-only, rp.print-only, rt.print-only, ruby.print-only, s.print-only, samp.print-only, select.print-only, small.print-only, span.print-only, strike.print-only, strong.print-only, sub.print-only, sup.print-only, textarea.print-only, time.print-only, tt.print-only, u.print-only, var.print-only, video.print-only, wbr.print-only { display: inline; } .print-only { diff --git a/test/fixtures/stylesheets/compass/css/reset.css b/test/fixtures/stylesheets/compass/css/reset.css index 1455b31b..dd912b3e 100644 --- a/test/fixtures/stylesheets/compass/css/reset.css +++ b/test/fixtures/stylesheets/compass/css/reset.css @@ -42,19 +42,19 @@ q, blockquote { a img { border: none; } -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { +article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { display: block; } .unregistered-only, .registered-only { display: none; } -body.registered a.registered-only, body.registered abbr.registered-only, body.registered acronym.registered-only, body.registered b.registered-only, body.registered basefont.registered-only, body.registered bdo.registered-only, body.registered big.registered-only, body.registered br.registered-only, body.registered cite.registered-only, body.registered code.registered-only, body.registered dfn.registered-only, body.registered em.registered-only, body.registered font.registered-only, body.registered i.registered-only, body.registered img.registered-only, body.registered input.registered-only, body.registered kbd.registered-only, body.registered label.registered-only, body.registered q.registered-only, body.registered s.registered-only, body.registered samp.registered-only, body.registered select.registered-only, body.registered small.registered-only, body.registered span.registered-only, body.registered strike.registered-only, body.registered strong.registered-only, body.registered sub.registered-only, body.registered sup.registered-only, body.registered textarea.registered-only, body.registered tt.registered-only, body.registered u.registered-only, body.registered var.registered-only { +body.registered a.registered-only, body.registered abbr.registered-only, body.registered acronym.registered-only, body.registered audio.registered-only, body.registered b.registered-only, body.registered basefont.registered-only, body.registered bdo.registered-only, body.registered big.registered-only, body.registered br.registered-only, body.registered canvas.registered-only, body.registered cite.registered-only, body.registered code.registered-only, body.registered command.registered-only, body.registered datalist.registered-only, body.registered dfn.registered-only, body.registered em.registered-only, body.registered embed.registered-only, body.registered font.registered-only, body.registered i.registered-only, body.registered img.registered-only, body.registered input.registered-only, body.registered keygen.registered-only, body.registered kbd.registered-only, body.registered label.registered-only, body.registered mark.registered-only, body.registered meter.registered-only, body.registered output.registered-only, body.registered progress.registered-only, body.registered q.registered-only, body.registered rp.registered-only, body.registered rt.registered-only, body.registered ruby.registered-only, body.registered s.registered-only, body.registered samp.registered-only, body.registered select.registered-only, body.registered small.registered-only, body.registered span.registered-only, body.registered strike.registered-only, body.registered strong.registered-only, body.registered sub.registered-only, body.registered sup.registered-only, body.registered textarea.registered-only, body.registered time.registered-only, body.registered tt.registered-only, body.registered u.registered-only, body.registered var.registered-only, body.registered video.registered-only, body.registered wbr.registered-only { display: inline; } -body.registered address.registered-only, body.registered blockquote.registered-only, body.registered center.registered-only, body.registered dir.registered-only, body.registered div.registered-only, body.registered dd.registered-only, body.registered dl.registered-only, body.registered dt.registered-only, body.registered fieldset.registered-only, body.registered form.registered-only, body.registered frameset.registered-only, body.registered h1.registered-only, body.registered h2.registered-only, body.registered h3.registered-only, body.registered h4.registered-only, body.registered h5.registered-only, body.registered h6.registered-only, body.registered hr.registered-only, body.registered isindex.registered-only, body.registered menu.registered-only, body.registered noframes.registered-only, body.registered noscript.registered-only, body.registered ol.registered-only, body.registered p.registered-only, body.registered pre.registered-only, body.registered ul.registered-only, body.registered article.registered-only, body.registered aside.registered-only, body.registered dialog.registered-only, body.registered figure.registered-only, body.registered footer.registered-only, body.registered header.registered-only, body.registered hgroup.registered-only, body.registered nav.registered-only, body.registered section.registered-only { + +body.registered address.registered-only, body.registered article.registered-only, body.registered aside.registered-only, body.registered blockquote.registered-only, body.registered center.registered-only, body.registered dir.registered-only, body.registered div.registered-only, body.registered dd.registered-only, body.registered details.registered-only, body.registered dl.registered-only, body.registered dt.registered-only, body.registered fieldset.registered-only, body.registered figcaption.registered-only, body.registered figure.registered-only, body.registered form.registered-only, body.registered footer.registered-only, body.registered frameset.registered-only, body.registered h1.registered-only, body.registered h2.registered-only, body.registered h3.registered-only, body.registered h4.registered-only, body.registered h5.registered-only, body.registered h6.registered-only, body.registered hr.registered-only, body.registered header.registered-only, body.registered hgroup.registered-only, body.registered isindex.registered-only, body.registered menu.registered-only, body.registered nav.registered-only, body.registered noframes.registered-only, body.registered noscript.registered-only, body.registered ol.registered-only, body.registered p.registered-only, body.registered pre.registered-only, body.registered section.registered-only, body.registered summary.registered-only, body.registered ul.registered-only { display: block; } -body.unregistered a.unregistered-only, body.unregistered abbr.unregistered-only, body.unregistered acronym.unregistered-only, body.unregistered b.unregistered-only, body.unregistered basefont.unregistered-only, body.unregistered bdo.unregistered-only, body.unregistered big.unregistered-only, body.unregistered br.unregistered-only, body.unregistered cite.unregistered-only, body.unregistered code.unregistered-only, body.unregistered dfn.unregistered-only, body.unregistered em.unregistered-only, body.unregistered font.unregistered-only, body.unregistered i.unregistered-only, body.unregistered img.unregistered-only, body.unregistered input.unregistered-only, body.unregistered kbd.unregistered-only, body.unregistered label.unregistered-only, body.unregistered q.unregistered-only, body.unregistered s.unregistered-only, body.unregistered samp.unregistered-only, body.unregistered select.unregistered-only, body.unregistered small.unregistered-only, body.unregistered span.unregistered-only, body.unregistered strike.unregistered-only, body.unregistered strong.unregistered-only, body.unregistered sub.unregistered-only, body.unregistered sup.unregistered-only, body.unregistered textarea.unregistered-only, body.unregistered tt.unregistered-only, body.unregistered u.unregistered-only, body.unregistered var.unregistered-only { +body.unregistered a.unregistered-only, body.unregistered abbr.unregistered-only, body.unregistered acronym.unregistered-only, body.unregistered audio.unregistered-only, body.unregistered b.unregistered-only, body.unregistered basefont.unregistered-only, body.unregistered bdo.unregistered-only, body.unregistered big.unregistered-only, body.unregistered br.unregistered-only, body.unregistered canvas.unregistered-only, body.unregistered cite.unregistered-only, body.unregistered code.unregistered-only, body.unregistered command.unregistered-only, body.unregistered datalist.unregistered-only, body.unregistered dfn.unregistered-only, body.unregistered em.unregistered-only, body.unregistered embed.unregistered-only, body.unregistered font.unregistered-only, body.unregistered i.unregistered-only, body.unregistered img.unregistered-only, body.unregistered input.unregistered-only, body.unregistered keygen.unregistered-only, body.unregistered kbd.unregistered-only, body.unregistered label.unregistered-only, body.unregistered mark.unregistered-only, body.unregistered meter.unregistered-only, body.unregistered output.unregistered-only, body.unregistered progress.unregistered-only, body.unregistered q.unregistered-only, body.unregistered rp.unregistered-only, body.unregistered rt.unregistered-only, body.unregistered ruby.unregistered-only, body.unregistered s.unregistered-only, body.unregistered samp.unregistered-only, body.unregistered select.unregistered-only, body.unregistered small.unregistered-only, body.unregistered span.unregistered-only, body.unregistered strike.unregistered-only, body.unregistered strong.unregistered-only, body.unregistered sub.unregistered-only, body.unregistered sup.unregistered-only, body.unregistered textarea.unregistered-only, body.unregistered time.unregistered-only, body.unregistered tt.unregistered-only, body.unregistered u.unregistered-only, body.unregistered var.unregistered-only, body.unregistered video.unregistered-only, body.unregistered wbr.unregistered-only { display: inline; } -body.unregistered address.unregistered-only, body.unregistered blockquote.unregistered-only, body.unregistered center.unregistered-only, body.unregistered dir.unregistered-only, body.unregistered div.unregistered-only, body.unregistered dd.unregistered-only, body.unregistered dl.unregistered-only, body.unregistered dt.unregistered-only, body.unregistered fieldset.unregistered-only, body.unregistered form.unregistered-only, body.unregistered frameset.unregistered-only, body.unregistered h1.unregistered-only, body.unregistered h2.unregistered-only, body.unregistered h3.unregistered-only, body.unregistered h4.unregistered-only, body.unregistered h5.unregistered-only, body.unregistered h6.unregistered-only, body.unregistered hr.unregistered-only, body.unregistered isindex.unregistered-only, body.unregistered menu.unregistered-only, body.unregistered noframes.unregistered-only, body.unregistered noscript.unregistered-only, body.unregistered ol.unregistered-only, body.unregistered p.unregistered-only, body.unregistered pre.unregistered-only, body.unregistered ul.unregistered-only, body.unregistered article.unregistered-only, body.unregistered aside.unregistered-only, body.unregistered dialog.unregistered-only, body.unregistered figure.unregistered-only, body.unregistered footer.unregistered-only, body.unregistered header.unregistered-only, body.unregistered hgroup.unregistered-only, body.unregistered nav.unregistered-only, body.unregistered section.unregistered-only { +body.unregistered address.unregistered-only, body.unregistered article.unregistered-only, body.unregistered aside.unregistered-only, body.unregistered blockquote.unregistered-only, body.unregistered center.unregistered-only, body.unregistered dir.unregistered-only, body.unregistered div.unregistered-only, body.unregistered dd.unregistered-only, body.unregistered details.unregistered-only, body.unregistered dl.unregistered-only, body.unregistered dt.unregistered-only, body.unregistered fieldset.unregistered-only, body.unregistered figcaption.unregistered-only, body.unregistered figure.unregistered-only, body.unregistered form.unregistered-only, body.unregistered footer.unregistered-only, body.unregistered frameset.unregistered-only, body.unregistered h1.unregistered-only, body.unregistered h2.unregistered-only, body.unregistered h3.unregistered-only, body.unregistered h4.unregistered-only, body.unregistered h5.unregistered-only, body.unregistered h6.unregistered-only, body.unregistered hr.unregistered-only, body.unregistered header.unregistered-only, body.unregistered hgroup.unregistered-only, body.unregistered isindex.unregistered-only, body.unregistered menu.unregistered-only, body.unregistered nav.unregistered-only, body.unregistered noframes.unregistered-only, body.unregistered noscript.unregistered-only, body.unregistered ol.unregistered-only, body.unregistered p.unregistered-only, body.unregistered pre.unregistered-only, body.unregistered section.unregistered-only, body.unregistered summary.unregistered-only, body.unregistered ul.unregistered-only { display: block; } diff --git a/test/fixtures/stylesheets/compass/css/sprites.css b/test/fixtures/stylesheets/compass/css/sprites.css index c31df2fa..3fc49c14 100644 --- a/test/fixtures/stylesheets/compass/css/sprites.css +++ b/test/fixtures/stylesheets/compass/css/sprites.css @@ -1,243 +1,243 @@ .flag-sprite, #flags .us, #flags .au, #flags .ca, #flags .es, #flags .eg, #flags .ly, .flag-ad, .flag-ae, .flag-af, .flag-ag, .flag-ai, .flag-al, .flag-am, .flag-an, .flag-ao, .flag-ar, .flag-as, .flag-at, .flag-au, .flag-aw, .flag-ax, .flag-az, .flag-ba, .flag-bb, .flag-bd, .flag-be, .flag-bf, .flag-bg, .flag-bh, .flag-bi, .flag-bj, .flag-bm, .flag-bn, .flag-bo, .flag-br, .flag-bs, .flag-bt, .flag-bv, .flag-bw, .flag-by, .flag-bz, .flag-ca, .flag-catalonia, .flag-cc, .flag-cd, .flag-cf, .flag-cg, .flag-ch, .flag-ci, .flag-ck, .flag-cl, .flag-cm, .flag-cn, .flag-co, .flag-cr, .flag-cs, .flag-cu, .flag-cv, .flag-cx, .flag-cy, .flag-cz, .flag-de, .flag-dj, .flag-dk, .flag-dm, .flag-do, .flag-dz, .flag-ec, .flag-ee, .flag-eg, .flag-eh, .flag-england, .flag-er, .flag-es, .flag-et, .flag-europeanunion, .flag-fam, .flag-fi, .flag-fj, .flag-fk, .flag-fm, .flag-fo, .flag-fr, .flag-ga, .flag-gb, .flag-gd, .flag-ge, .flag-gf, .flag-gh, .flag-gi, .flag-gl, .flag-gm, .flag-gn, .flag-gp, .flag-gq, .flag-gr, .flag-gs, .flag-gt, .flag-gu, .flag-gw, .flag-gy, .flag-hk, .flag-hm, .flag-hn, .flag-hr, .flag-ht, .flag-hu, .flag-id-2, .flag-ie, .flag-il, .flag-in, .flag-io, .flag-iq, .flag-ir, .flag-is, .flag-it, .flag-jm, .flag-jo, .flag-jp, .flag-ke, .flag-kg, .flag-kh, .flag-ki, .flag-km, .flag-kn, .flag-kp, .flag-kr, .flag-kw, .flag-ky, .flag-kz, .flag-la, .flag-lb, .flag-lc, .flag-li, .flag-lk, .flag-lr, .flag-ls, .flag-lt, .flag-lu, .flag-lv, .flag-ly, .flag-ma, .flag-mc, .flag-md, .flag-me, .flag-mg, .flag-mh, .flag-mk, .flag-ml, .flag-mm, .flag-mn, .flag-mo, .flag-mp, .flag-mq, .flag-mr, .flag-ms, .flag-mt, .flag-mu, .flag-mv, .flag-mw, .flag-mx, .flag-my, .flag-mz, .flag-na, .flag-nc, .flag-ne, .flag-nf, .flag-ng, .flag-ni, .flag-nl, .flag-no, .flag-np, .flag-nr, .flag-nu, .flag-nz, .flag-om, .flag-pa, .flag-pe, .flag-pf, .flag-pg, .flag-ph, .flag-pk, .flag-pl, .flag-pm, .flag-pn, .flag-pr, .flag-ps, .flag-pt, .flag-pw, .flag-py, .flag-qa, .flag-re, .flag-ro, .flag-rs, .flag-ru, .flag-rw, .flag-sa, .flag-sb, .flag-sc, .flag-scotland, .flag-sd, .flag-se, .flag-sg, .flag-sh, .flag-si, .flag-sj, .flag-sk, .flag-sl, .flag-sm, .flag-sn, .flag-so, .flag-sr, .flag-st, .flag-sv, .flag-sy, .flag-sz, .flag-tc, .flag-td, .flag-tf, .flag-tg, .flag-th, .flag-tj, .flag-tk, .flag-tl, .flag-tm, .flag-tn, .flag-to, .flag-tr, .flag-tt, .flag-tv, .flag-tw, .flag-tz, .flag-ua, .flag-ug, .flag-um, .flag-us, .flag-uy, .flag-uz, .flag-va, .flag-vc, .flag-ve, .flag-vg, .flag-vi, .flag-vn, .flag-vu, .flag-wales, .flag-wf, .flag-ws, .flag-ye, .flag-yt, .flag-za, .flag-zm, .flag-zw { - background: url('/images/flag-s03c3b29b35.png') no-repeat; } + background: url('/images/flag-s8c3c755a68.png') no-repeat; } #flags .us { - background-position: 0 -2520px; + background-position: 0 -407px; height: 11px; width: 16px; } #flags .au { - background-position: 0 -132px; + background-position: 0 -11px; height: 11px; width: 16px; } #flags .ca { - background-position: 0 -385px; + background-position: 0 -572px; height: 11px; width: 16px; } #flags .es { - background-position: 0 -737px; + background-position: 0 -2124px; height: 11px; width: 16px; } #flags .eg { - background-position: 0 -693px; + background-position: 0 -2058px; height: 11px; width: 16px; } #flags .ly { - background-position: 0 -1474px; + background-position: 0 -2663px; height: 11px; width: 16px; } .flag-ad { - background-position: 0 0; + background-position: 0 -781px; height: 11px; width: 16px; } .flag-ae { - background-position: 0 -11px; + background-position: 0 -2652px; height: 11px; width: 16px; } .flag-af { - background-position: 0 -22px; + background-position: 0 -1045px; height: 11px; width: 16px; } .flag-ag { - background-position: 0 -33px; + background-position: 0 -759px; height: 11px; width: 16px; } .flag-ai { - background-position: 0 -44px; - height: 11px; - width: 16px; } - -.flag-al { - background-position: 0 -55px; - height: 11px; - width: 16px; } - -.flag-am { - background-position: 0 -66px; - height: 11px; - width: 16px; } - -.flag-an { - background-position: 0 -77px; - height: 11px; - width: 16px; } - -.flag-ao { - background-position: 0 -88px; - height: 11px; - width: 16px; } - -.flag-ar { - background-position: 0 -99px; - height: 11px; - width: 16px; } - -.flag-as { - background-position: 0 -110px; - height: 11px; - width: 16px; } - -.flag-at { - background-position: 0 -121px; - height: 11px; - width: 16px; } - -.flag-au { - background-position: 0 -132px; - height: 11px; - width: 16px; } - -.flag-aw { - background-position: 0 -143px; - height: 11px; - width: 16px; } - -.flag-ax { - background-position: 0 -154px; - height: 11px; - width: 16px; } - -.flag-az { - background-position: 0 -165px; - height: 11px; - width: 16px; } - -.flag-ba { - background-position: 0 -176px; - height: 11px; - width: 16px; } - -.flag-bb { - background-position: 0 -187px; - height: 11px; - width: 16px; } - -.flag-bd { - background-position: 0 -198px; - height: 11px; - width: 16px; } - -.flag-be { - background-position: 0 -209px; - height: 11px; - width: 16px; } - -.flag-bf { - background-position: 0 -220px; - height: 11px; - width: 16px; } - -.flag-bg { - background-position: 0 -231px; - height: 11px; - width: 16px; } - -.flag-bh { - background-position: 0 -242px; - height: 11px; - width: 16px; } - -.flag-bi { - background-position: 0 -253px; - height: 11px; - width: 16px; } - -.flag-bj { - background-position: 0 -264px; - height: 11px; - width: 16px; } - -.flag-bm { - background-position: 0 -275px; - height: 11px; - width: 16px; } - -.flag-bn { - background-position: 0 -286px; - height: 11px; - width: 16px; } - -.flag-bo { background-position: 0 -297px; height: 11px; width: 16px; } -.flag-br { - background-position: 0 -308px; +.flag-al { + background-position: 0 -902px; height: 11px; width: 16px; } -.flag-bs { - background-position: 0 -319px; +.flag-am { + background-position: 0 -2300px; height: 11px; width: 16px; } -.flag-bt { - background-position: 0 -330px; +.flag-an { + background-position: 0 -1805px; height: 11px; width: 16px; } -.flag-bv { - background-position: 0 -341px; +.flag-ao { + background-position: 0 -1485px; height: 11px; width: 16px; } -.flag-bw { - background-position: 0 -352px; +.flag-ar { + background-position: 0 -1739px; height: 11px; width: 16px; } -.flag-by { - background-position: 0 -363px; +.flag-as { + background-position: 0 -121px; height: 11px; width: 16px; } -.flag-bz { - background-position: 0 -374px; +.flag-at { + background-position: 0 -2630px; height: 11px; width: 16px; } -.flag-ca { - background-position: 0 -385px; +.flag-au { + background-position: 0 -11px; height: 11px; width: 16px; } -.flag-catalonia { +.flag-aw { + background-position: 0 -1386px; + height: 11px; + width: 16px; } + +.flag-ax { + background-position: 0 -528px; + height: 11px; + width: 16px; } + +.flag-az { + background-position: 0 -1023px; + height: 11px; + width: 16px; } + +.flag-ba { + background-position: 0 -594px; + height: 11px; + width: 16px; } + +.flag-bb { + background-position: 0 -1254px; + height: 11px; + width: 16px; } + +.flag-bd { + background-position: 0 -1662px; + height: 11px; + width: 16px; } + +.flag-be { + background-position: 0 -2597px; + height: 11px; + width: 16px; } + +.flag-bf { + background-position: 0 -2168px; + height: 11px; + width: 16px; } + +.flag-bg { + background-position: 0 -2443px; + height: 11px; + width: 16px; } + +.flag-bh { + background-position: 0 -2080px; + height: 11px; + width: 16px; } + +.flag-bi { + background-position: 0 -44px; + height: 11px; + width: 16px; } + +.flag-bj { + background-position: 0 -2487px; + height: 11px; + width: 16px; } + +.flag-bm { background-position: 0 -396px; height: 11px; width: 16px; } +.flag-bn { + background-position: 0 -363px; + height: 11px; + width: 16px; } + +.flag-bo { + background-position: 0 -2179px; + height: 11px; + width: 16px; } + +.flag-br { + background-position: 0 -484px; + height: 11px; + width: 16px; } + +.flag-bs { + background-position: 0 -1408px; + height: 11px; + width: 16px; } + +.flag-bt { + background-position: 0 -605px; + height: 11px; + width: 16px; } + +.flag-bv { + background-position: 0 -1276px; + height: 11px; + width: 16px; } + +.flag-bw { + background-position: 0 -2355px; + height: 11px; + width: 16px; } + +.flag-by { + background-position: 0 -1463px; + height: 11px; + width: 16px; } + +.flag-bz { + background-position: 0 -550px; + height: 11px; + width: 16px; } + +.flag-ca { + background-position: 0 -572px; + height: 11px; + width: 16px; } + +.flag-catalonia { + background-position: 0 -2245px; + height: 11px; + width: 16px; } + .flag-cc { - background-position: 0 -407px; + background-position: 0 -451px; height: 11px; width: 16px; } .flag-cd { - background-position: 0 -418px; + background-position: 0 -638px; height: 11px; width: 16px; } .flag-cf { - background-position: 0 -429px; + background-position: 0 -748px; height: 11px; width: 16px; } .flag-cg { - background-position: 0 -440px; + background-position: 0 -1541px; height: 11px; width: 16px; } .flag-ch { - background-position: 0 -451px; + background-position: 0 -2696px; height: 11px; width: 11px; } .flag-ci { - background-position: 0 -462px; + background-position: 0 -2509px; height: 11px; width: 16px; } @@ -247,82 +247,82 @@ width: 16px; } .flag-cl { - background-position: 0 -484px; + background-position: 0 -2399px; height: 11px; width: 16px; } .flag-cm { - background-position: 0 -495px; + background-position: 0 -2069px; height: 11px; width: 16px; } .flag-cn { - background-position: 0 -506px; + background-position: 0 -2014px; height: 11px; width: 16px; } .flag-co { - background-position: 0 -517px; + background-position: 0 -2311px; height: 11px; width: 16px; } .flag-cr { - background-position: 0 -528px; + background-position: 0 -2036px; height: 11px; width: 16px; } .flag-cs { - background-position: 0 -539px; + background-position: 0 -2421px; height: 11px; width: 16px; } .flag-cu { - background-position: 0 -550px; + background-position: 0 -814px; height: 11px; width: 16px; } .flag-cv { - background-position: 0 -561px; + background-position: 0 -869px; height: 11px; width: 16px; } .flag-cx { - background-position: 0 -572px; + background-position: 0 -418px; height: 11px; width: 16px; } .flag-cy { - background-position: 0 -583px; + background-position: 0 -2190px; height: 11px; width: 16px; } .flag-cz { - background-position: 0 -594px; + background-position: 0 -1717px; height: 11px; width: 16px; } .flag-de { - background-position: 0 -605px; + background-position: 0 -1827px; height: 11px; width: 16px; } .flag-dj { - background-position: 0 -616px; + background-position: 0 -957px; height: 11px; width: 16px; } .flag-dk { - background-position: 0 -627px; + background-position: 0 -1970px; height: 11px; width: 16px; } .flag-dm { - background-position: 0 -638px; + background-position: 0 -374px; height: 11px; width: 16px; } .flag-do { - background-position: 0 -649px; + background-position: 0 -1783px; height: 11px; width: 16px; } @@ -332,322 +332,322 @@ width: 16px; } .flag-ec { - background-position: 0 -671px; + background-position: 0 -1915px; height: 11px; width: 16px; } .flag-ee { - background-position: 0 -682px; + background-position: 0 -2575px; height: 11px; width: 16px; } .flag-eg { - background-position: 0 -693px; + background-position: 0 -2058px; height: 11px; width: 16px; } .flag-eh { - background-position: 0 -704px; + background-position: 0 -1419px; height: 11px; width: 16px; } .flag-england { - background-position: 0 -715px; + background-position: 0 -1574px; height: 11px; width: 16px; } .flag-er { - background-position: 0 -726px; + background-position: 0 -429px; height: 11px; width: 16px; } .flag-es { - background-position: 0 -737px; + background-position: 0 -2124px; height: 11px; width: 16px; } .flag-et { - background-position: 0 -748px; - height: 11px; - width: 16px; } - -.flag-europeanunion { - background-position: 0 -759px; - height: 11px; - width: 16px; } - -.flag-fam { - background-position: 0 -770px; - height: 11px; - width: 16px; } - -.flag-fi { - background-position: 0 -781px; - height: 11px; - width: 16px; } - -.flag-fj { - background-position: 0 -792px; - height: 11px; - width: 16px; } - -.flag-fk { - background-position: 0 -803px; - height: 11px; - width: 16px; } - -.flag-fm { - background-position: 0 -814px; - height: 11px; - width: 16px; } - -.flag-fo { - background-position: 0 -825px; - height: 11px; - width: 16px; } - -.flag-fr { - background-position: 0 -836px; - height: 11px; - width: 16px; } - -.flag-ga { - background-position: 0 -847px; - height: 11px; - width: 16px; } - -.flag-gb { - background-position: 0 -858px; - height: 11px; - width: 16px; } - -.flag-gd { - background-position: 0 -869px; - height: 11px; - width: 16px; } - -.flag-ge { background-position: 0 -880px; height: 11px; width: 16px; } -.flag-gf { - background-position: 0 -891px; - height: 11px; - width: 16px; } - -.flag-gh { - background-position: 0 -902px; - height: 11px; - width: 16px; } - -.flag-gi { - background-position: 0 -913px; - height: 11px; - width: 16px; } - -.flag-gl { - background-position: 0 -924px; - height: 11px; - width: 16px; } - -.flag-gm { - background-position: 0 -935px; - height: 11px; - width: 16px; } - -.flag-gn { - background-position: 0 -946px; - height: 11px; - width: 16px; } - -.flag-gp { - background-position: 0 -957px; - height: 11px; - width: 16px; } - -.flag-gq { - background-position: 0 -968px; - height: 11px; - width: 16px; } - -.flag-gr { - background-position: 0 -979px; - height: 11px; - width: 16px; } - -.flag-gs { - background-position: 0 -990px; - height: 11px; - width: 16px; } - -.flag-gt { - background-position: 0 -1001px; - height: 11px; - width: 16px; } - -.flag-gu { - background-position: 0 -1012px; - height: 11px; - width: 16px; } - -.flag-gw { - background-position: 0 -1023px; - height: 11px; - width: 16px; } - -.flag-gy { - background-position: 0 -1034px; - height: 11px; - width: 16px; } - -.flag-hk { - background-position: 0 -1045px; - height: 11px; - width: 16px; } - -.flag-hm { - background-position: 0 -1056px; - height: 11px; - width: 16px; } - -.flag-hn { - background-position: 0 -1067px; - height: 11px; - width: 16px; } - -.flag-hr { - background-position: 0 -1078px; - height: 11px; - width: 16px; } - -.flag-ht { - background-position: 0 -1089px; - height: 11px; - width: 16px; } - -.flag-hu { - background-position: 0 -1100px; - height: 11px; - width: 16px; } - -.flag-id-2 { - background-position: 0 -1111px; - height: 11px; - width: 16px; } - -.flag-ie { - background-position: 0 -1122px; - height: 11px; - width: 16px; } - -.flag-il { - background-position: 0 -1133px; - height: 11px; - width: 16px; } - -.flag-in { - background-position: 0 -1144px; - height: 11px; - width: 16px; } - -.flag-io { - background-position: 0 -1155px; - height: 11px; - width: 16px; } - -.flag-iq { - background-position: 0 -1166px; - height: 11px; - width: 16px; } - -.flag-ir { - background-position: 0 -1177px; - height: 11px; - width: 16px; } - -.flag-is { - background-position: 0 -1188px; - height: 11px; - width: 16px; } - -.flag-it { - background-position: 0 -1199px; - height: 11px; - width: 16px; } - -.flag-jm { - background-position: 0 -1210px; - height: 11px; - width: 16px; } - -.flag-jo { - background-position: 0 -1221px; - height: 11px; - width: 16px; } - -.flag-jp { - background-position: 0 -1232px; - height: 11px; - width: 16px; } - -.flag-ke { +.flag-europeanunion { background-position: 0 -1243px; height: 11px; width: 16px; } -.flag-kg { - background-position: 0 -1254px; +.flag-fam { + background-position: 0 -2003px; height: 11px; width: 16px; } -.flag-kh { - background-position: 0 -1265px; +.flag-fi { + background-position: 0 -1772px; height: 11px; width: 16px; } -.flag-ki { - background-position: 0 -1276px; +.flag-fj { + background-position: 0 -286px; height: 11px; width: 16px; } -.flag-km { - background-position: 0 -1287px; +.flag-fk { + background-position: 0 -176px; height: 11px; width: 16px; } -.flag-kn { - background-position: 0 -1298px; +.flag-fm { + background-position: 0 -1166px; height: 11px; width: 16px; } -.flag-kp { - background-position: 0 -1309px; +.flag-fo { + background-position: 0 -1596px; height: 11px; width: 16px; } -.flag-kr { +.flag-fr { + background-position: 0 -1673px; + height: 11px; + width: 16px; } + +.flag-ga { + background-position: 0 -2135px; + height: 11px; + width: 16px; } + +.flag-gb { + background-position: 0 -99px; + height: 11px; + width: 16px; } + +.flag-gd { + background-position: 0 -693px; + height: 11px; + width: 16px; } + +.flag-ge { + background-position: 0 -462px; + height: 11px; + width: 16px; } + +.flag-gf { + background-position: 0 -1640px; + height: 11px; + width: 16px; } + +.flag-gh { + background-position: 0 -2267px; + height: 11px; + width: 16px; } + +.flag-gi { + background-position: 0 -1761px; + height: 11px; + width: 16px; } + +.flag-gl { + background-position: 0 -1992px; + height: 11px; + width: 16px; } + +.flag-gm { + background-position: 0 -1849px; + height: 11px; + width: 16px; } + +.flag-gn { + background-position: 0 -2454px; + height: 11px; + width: 16px; } + +.flag-gp { + background-position: 0 -1904px; + height: 11px; + width: 16px; } + +.flag-gq { + background-position: 0 -1210px; + height: 11px; + width: 16px; } + +.flag-gr { + background-position: 0 -1397px; + height: 11px; + width: 16px; } + +.flag-gs { + background-position: 0 -187px; + height: 11px; + width: 16px; } + +.flag-gt { + background-position: 0 -2212px; + height: 11px; + width: 16px; } + +.flag-gu { + background-position: 0 -1496px; + height: 11px; + width: 16px; } + +.flag-gw { + background-position: 0 -2091px; + height: 11px; + width: 16px; } + +.flag-gy { + background-position: 0 -242px; + height: 11px; + width: 16px; } + +.flag-hk { + background-position: 0 -1364px; + height: 11px; + width: 16px; } + +.flag-hm { + background-position: 0 -22px; + height: 11px; + width: 16px; } + +.flag-hn { + background-position: 0 -1155px; + height: 11px; + width: 16px; } + +.flag-hr { + background-position: 0 -1056px; + height: 11px; + width: 16px; } + +.flag-ht { + background-position: 0 -2333px; + height: 11px; + width: 16px; } + +.flag-hu { + background-position: 0 -2619px; + height: 11px; + width: 16px; } + +.flag-id-2 { + background-position: 0 -2542px; + height: 11px; + width: 16px; } + +.flag-ie { + background-position: 0 -2278px; + height: 11px; + width: 16px; } + +.flag-il { + background-position: 0 -2366px; + height: 11px; + width: 16px; } + +.flag-in { + background-position: 0 -1585px; + height: 11px; + width: 16px; } + +.flag-io { + background-position: 0 0; + height: 11px; + width: 16px; } + +.flag-iq { + background-position: 0 -1221px; + height: 11px; + width: 16px; } + +.flag-ir { background-position: 0 -1320px; height: 11px; width: 16px; } +.flag-is { + background-position: 0 -1177px; + height: 11px; + width: 16px; } + +.flag-it { + background-position: 0 -2641px; + height: 11px; + width: 16px; } + +.flag-jm { + background-position: 0 -319px; + height: 11px; + width: 16px; } + +.flag-jo { + background-position: 0 -1948px; + height: 11px; + width: 16px; } + +.flag-jp { + background-position: 0 -2465px; + height: 11px; + width: 16px; } + +.flag-ke { + background-position: 0 -935px; + height: 11px; + width: 16px; } + +.flag-kg { + background-position: 0 -1926px; + height: 11px; + width: 16px; } + +.flag-kh { + background-position: 0 -1034px; + height: 11px; + width: 16px; } + +.flag-ki { + background-position: 0 -88px; + height: 11px; + width: 16px; } + +.flag-km { + background-position: 0 -671px; + height: 11px; + width: 16px; } + +.flag-kn { + background-position: 0 -517px; + height: 11px; + width: 16px; } + +.flag-kp { + background-position: 0 -1012px; + height: 11px; + width: 16px; } + +.flag-kr { + background-position: 0 -308px; + height: 11px; + width: 16px; } + .flag-kw { - background-position: 0 -1331px; + background-position: 0 -1981px; height: 11px; width: 16px; } .flag-ky { - background-position: 0 -1342px; + background-position: 0 -143px; height: 11px; width: 16px; } .flag-kz { - background-position: 0 -1353px; + background-position: 0 -715px; height: 11px; width: 16px; } .flag-la { - background-position: 0 -1364px; + background-position: 0 -1111px; height: 11px; width: 16px; } @@ -657,62 +657,62 @@ width: 16px; } .flag-lc { - background-position: 0 -1386px; + background-position: 0 -836px; height: 11px; width: 16px; } .flag-li { - background-position: 0 -1397px; + background-position: 0 -1298px; height: 11px; width: 16px; } .flag-lk { - background-position: 0 -1408px; + background-position: 0 -682px; height: 11px; width: 16px; } .flag-lr { - background-position: 0 -1419px; + background-position: 0 -1618px; height: 11px; width: 16px; } .flag-ls { - background-position: 0 -1430px; + background-position: 0 -385px; height: 11px; width: 16px; } .flag-lt { - background-position: 0 -1441px; + background-position: 0 -2102px; height: 11px; width: 16px; } .flag-lu { - background-position: 0 -1452px; + background-position: 0 -2201px; height: 11px; width: 16px; } .flag-lv { - background-position: 0 -1463px; + background-position: 0 -2223px; height: 11px; width: 16px; } .flag-ly { - background-position: 0 -1474px; + background-position: 0 -2663px; height: 11px; width: 16px; } .flag-ma { - background-position: 0 -1485px; + background-position: 0 -2608px; height: 11px; width: 16px; } .flag-mc { - background-position: 0 -1496px; + background-position: 0 -2685px; height: 11px; width: 16px; } .flag-md { - background-position: 0 -1507px; + background-position: 0 -1232px; height: 11px; width: 16px; } @@ -722,132 +722,132 @@ width: 16px; } .flag-mg { - background-position: 0 -1530px; + background-position: 0 -2476px; height: 11px; width: 16px; } .flag-mh { - background-position: 0 -1541px; + background-position: 0 -275px; height: 11px; width: 16px; } .flag-mk { - background-position: 0 -1552px; + background-position: 0 -825px; height: 11px; width: 16px; } .flag-ml { - background-position: 0 -1563px; + background-position: 0 -2410px; height: 11px; width: 16px; } .flag-mm { - background-position: 0 -1574px; + background-position: 0 -2256px; height: 11px; width: 16px; } .flag-mn { - background-position: 0 -1585px; + background-position: 0 -2146px; height: 11px; width: 16px; } .flag-mo { - background-position: 0 -1596px; + background-position: 0 -737px; height: 11px; width: 16px; } .flag-mp { - background-position: 0 -1607px; + background-position: 0 -506px; height: 11px; width: 16px; } .flag-mq { - background-position: 0 -1618px; + background-position: 0 -132px; height: 11px; width: 16px; } .flag-mr { - background-position: 0 -1629px; + background-position: 0 -1188px; height: 11px; width: 16px; } .flag-ms { - background-position: 0 -1640px; + background-position: 0 -440px; height: 11px; width: 16px; } .flag-mt { - background-position: 0 -1651px; + background-position: 0 -2586px; height: 11px; width: 16px; } .flag-mu { - background-position: 0 -1662px; + background-position: 0 -1860px; height: 11px; width: 16px; } .flag-mv { - background-position: 0 -1673px; + background-position: 0 -1430px; height: 11px; width: 16px; } .flag-mw { - background-position: 0 -1684px; + background-position: 0 -1838px; height: 11px; width: 16px; } .flag-mx { - background-position: 0 -1695px; + background-position: 0 -990px; height: 11px; width: 16px; } .flag-my { - background-position: 0 -1706px; + background-position: 0 -561px; height: 11px; width: 16px; } .flag-mz { - background-position: 0 -1717px; + background-position: 0 -858px; height: 11px; width: 16px; } .flag-na { - background-position: 0 -1728px; + background-position: 0 -66px; height: 11px; width: 16px; } .flag-nc { - background-position: 0 -1739px; + background-position: 0 -616px; height: 11px; width: 16px; } .flag-ne { - background-position: 0 -1750px; + background-position: 0 -1353px; height: 11px; width: 16px; } .flag-nf { - background-position: 0 -1761px; + background-position: 0 -539px; height: 11px; width: 16px; } .flag-ng { - background-position: 0 -1772px; + background-position: 0 -2157px; height: 11px; width: 16px; } .flag-ni { - background-position: 0 -1783px; + background-position: 0 -1684px; height: 11px; width: 16px; } .flag-nl { - background-position: 0 -1794px; + background-position: 0 -2498px; height: 11px; width: 16px; } .flag-no { - background-position: 0 -1805px; + background-position: 0 -1287px; height: 11px; width: 16px; } @@ -857,92 +857,92 @@ width: 9px; } .flag-nr { - background-position: 0 -1827px; + background-position: 0 -1342px; height: 11px; width: 16px; } .flag-nu { - background-position: 0 -1838px; + background-position: 0 -627px; height: 11px; width: 16px; } .flag-nz { - background-position: 0 -1849px; + background-position: 0 -154px; height: 11px; width: 16px; } .flag-om { - background-position: 0 -1860px; + background-position: 0 -2234px; height: 11px; width: 16px; } .flag-pa { - background-position: 0 -1871px; + background-position: 0 -1441px; height: 11px; width: 16px; } .flag-pe { - background-position: 0 -1882px; + background-position: 0 -2674px; height: 11px; width: 16px; } .flag-pf { - background-position: 0 -1893px; + background-position: 0 -1552px; height: 11px; width: 16px; } .flag-pg { - background-position: 0 -1904px; + background-position: 0 -924px; height: 11px; width: 16px; } .flag-ph { - background-position: 0 -1915px; + background-position: 0 -979px; height: 11px; width: 16px; } .flag-pk { - background-position: 0 -1926px; + background-position: 0 -792px; height: 11px; width: 16px; } .flag-pl { - background-position: 0 -1937px; + background-position: 0 -2707px; height: 11px; width: 16px; } .flag-pm { - background-position: 0 -1948px; + background-position: 0 -33px; height: 11px; width: 16px; } .flag-pn { - background-position: 0 -1959px; + background-position: 0 -110px; height: 11px; width: 16px; } .flag-pr { - background-position: 0 -1970px; + background-position: 0 -803px; height: 11px; width: 16px; } .flag-ps { - background-position: 0 -1981px; + background-position: 0 -2047px; height: 11px; width: 16px; } .flag-pt { - background-position: 0 -1992px; + background-position: 0 -1199px; height: 11px; width: 16px; } .flag-pw { - background-position: 0 -2003px; + background-position: 0 -1001px; height: 11px; width: 16px; } .flag-py { - background-position: 0 -2014px; + background-position: 0 -2113px; height: 11px; width: 16px; } @@ -952,311 +952,311 @@ width: 16px; } .flag-re { - background-position: 0 -2036px; + background-position: 0 -1651px; height: 11px; width: 16px; } .flag-ro { - background-position: 0 -2047px; - height: 11px; - width: 16px; } - -.flag-rs { - background-position: 0 -2058px; - height: 11px; - width: 16px; } - -.flag-ru { - background-position: 0 -2069px; - height: 11px; - width: 16px; } - -.flag-rw { - background-position: 0 -2080px; - height: 11px; - width: 16px; } - -.flag-sa { - background-position: 0 -2091px; - height: 11px; - width: 16px; } - -.flag-sb { - background-position: 0 -2102px; - height: 11px; - width: 16px; } - -.flag-sc { - background-position: 0 -2113px; - height: 11px; - width: 16px; } - -.flag-scotland { - background-position: 0 -2124px; - height: 11px; - width: 16px; } - -.flag-sd { - background-position: 0 -2135px; - height: 11px; - width: 16px; } - -.flag-se { - background-position: 0 -2146px; - height: 11px; - width: 16px; } - -.flag-sg { - background-position: 0 -2157px; - height: 11px; - width: 16px; } - -.flag-sh { - background-position: 0 -2168px; - height: 11px; - width: 16px; } - -.flag-si { - background-position: 0 -2179px; - height: 11px; - width: 16px; } - -.flag-sj { - background-position: 0 -2190px; - height: 11px; - width: 16px; } - -.flag-sk { - background-position: 0 -2201px; - height: 11px; - width: 16px; } - -.flag-sl { - background-position: 0 -2212px; - height: 11px; - width: 16px; } - -.flag-sm { - background-position: 0 -2223px; - height: 11px; - width: 16px; } - -.flag-sn { - background-position: 0 -2234px; - height: 11px; - width: 16px; } - -.flag-so { - background-position: 0 -2245px; - height: 11px; - width: 16px; } - -.flag-sr { - background-position: 0 -2256px; - height: 11px; - width: 16px; } - -.flag-st { - background-position: 0 -2267px; - height: 11px; - width: 16px; } - -.flag-sv { - background-position: 0 -2278px; - height: 11px; - width: 16px; } - -.flag-sy { background-position: 0 -2289px; height: 11px; width: 16px; } -.flag-sz { - background-position: 0 -2300px; +.flag-rs { + background-position: 0 -1871px; height: 11px; width: 16px; } -.flag-tc { - background-position: 0 -2311px; - height: 11px; - width: 16px; } - -.flag-td { - background-position: 0 -2322px; - height: 11px; - width: 16px; } - -.flag-tf { - background-position: 0 -2333px; - height: 11px; - width: 16px; } - -.flag-tg { - background-position: 0 -2344px; - height: 11px; - width: 16px; } - -.flag-th { - background-position: 0 -2355px; - height: 11px; - width: 16px; } - -.flag-tj { - background-position: 0 -2366px; - height: 11px; - width: 16px; } - -.flag-tk { - background-position: 0 -2377px; - height: 11px; - width: 16px; } - -.flag-tl { - background-position: 0 -2388px; - height: 11px; - width: 16px; } - -.flag-tm { - background-position: 0 -2399px; - height: 11px; - width: 16px; } - -.flag-tn { - background-position: 0 -2410px; - height: 11px; - width: 16px; } - -.flag-to { - background-position: 0 -2421px; - height: 11px; - width: 16px; } - -.flag-tr { - background-position: 0 -2432px; - height: 11px; - width: 16px; } - -.flag-tt { - background-position: 0 -2443px; - height: 11px; - width: 16px; } - -.flag-tv { - background-position: 0 -2454px; - height: 11px; - width: 16px; } - -.flag-tw { - background-position: 0 -2465px; - height: 11px; - width: 16px; } - -.flag-tz { - background-position: 0 -2476px; - height: 11px; - width: 16px; } - -.flag-ua { - background-position: 0 -2487px; - height: 11px; - width: 16px; } - -.flag-ug { - background-position: 0 -2498px; - height: 11px; - width: 16px; } - -.flag-um { - background-position: 0 -2509px; - height: 11px; - width: 16px; } - -.flag-us { - background-position: 0 -2520px; - height: 11px; - width: 16px; } - -.flag-uy { - background-position: 0 -2531px; - height: 11px; - width: 16px; } - -.flag-uz { - background-position: 0 -2542px; - height: 11px; - width: 16px; } - -.flag-va { - background-position: 0 -2553px; - height: 11px; - width: 16px; } - -.flag-vc { +.flag-ru { background-position: 0 -2564px; height: 11px; width: 16px; } +.flag-rw { + background-position: 0 -1530px; + height: 11px; + width: 16px; } + +.flag-sa { + background-position: 0 -968px; + height: 11px; + width: 16px; } + +.flag-sb { + background-position: 0 -253px; + height: 11px; + width: 16px; } + +.flag-sc { + background-position: 0 -495px; + height: 11px; + width: 16px; } + +.flag-scotland { + background-position: 0 -55px; + height: 11px; + width: 16px; } + +.flag-sd { + background-position: 0 -1750px; + height: 11px; + width: 16px; } + +.flag-se { + background-position: 0 -1452px; + height: 11px; + width: 16px; } + +.flag-sg { + background-position: 0 -1959px; + height: 11px; + width: 16px; } + +.flag-sh { + background-position: 0 -209px; + height: 11px; + width: 16px; } + +.flag-si { + background-position: 0 -1507px; + height: 11px; + width: 16px; } + +.flag-sj { + background-position: 0 -1265px; + height: 11px; + width: 16px; } + +.flag-sk { + background-position: 0 -891px; + height: 11px; + width: 16px; } + +.flag-sl { + background-position: 0 -2432px; + height: 11px; + width: 16px; } + +.flag-sm { + background-position: 0 -1331px; + height: 11px; + width: 16px; } + +.flag-sn { + background-position: 0 -1893px; + height: 11px; + width: 16px; } + +.flag-so { + background-position: 0 -1607px; + height: 11px; + width: 16px; } + +.flag-sr { + background-position: 0 -1706px; + height: 11px; + width: 16px; } + +.flag-st { + background-position: 0 -946px; + height: 11px; + width: 16px; } + +.flag-sv { + background-position: 0 -1629px; + height: 11px; + width: 16px; } + +.flag-sy { + background-position: 0 -2377px; + height: 11px; + width: 16px; } + +.flag-sz { + background-position: 0 -330px; + height: 11px; + width: 16px; } + +.flag-tc { + background-position: 0 -352px; + height: 11px; + width: 16px; } + +.flag-td { + background-position: 0 -1563px; + height: 11px; + width: 16px; } + +.flag-tf { + background-position: 0 -1309px; + height: 11px; + width: 16px; } + +.flag-tg { + background-position: 0 -1089px; + height: 11px; + width: 16px; } + +.flag-th { + background-position: 0 -2344px; + height: 11px; + width: 16px; } + +.flag-tj { + background-position: 0 -1695px; + height: 11px; + width: 16px; } + +.flag-tk { + background-position: 0 -220px; + height: 11px; + width: 16px; } + +.flag-tl { + background-position: 0 -1078px; + height: 11px; + width: 16px; } + +.flag-tm { + background-position: 0 -770px; + height: 11px; + width: 16px; } + +.flag-tn { + background-position: 0 -1794px; + height: 11px; + width: 16px; } + +.flag-to { + background-position: 0 -2553px; + height: 11px; + width: 16px; } + +.flag-tr { + background-position: 0 -1728px; + height: 11px; + width: 16px; } + +.flag-tt { + background-position: 0 -231px; + height: 11px; + width: 16px; } + +.flag-tv { + background-position: 0 -847px; + height: 11px; + width: 16px; } + +.flag-tw { + background-position: 0 -2322px; + height: 11px; + width: 16px; } + +.flag-tz { + background-position: 0 -264px; + height: 11px; + width: 16px; } + +.flag-ua { + background-position: 0 -2531px; + height: 11px; + width: 16px; } + +.flag-ug { + background-position: 0 -1474px; + height: 11px; + width: 16px; } + +.flag-um { + background-position: 0 -583px; + height: 11px; + width: 16px; } + +.flag-us { + background-position: 0 -407px; + height: 11px; + width: 16px; } + +.flag-uy { + background-position: 0 -1144px; + height: 11px; + width: 16px; } + +.flag-uz { + background-position: 0 -1122px; + height: 11px; + width: 16px; } + +.flag-va { + background-position: 0 -1067px; + height: 11px; + width: 16px; } + +.flag-vc { + background-position: 0 -1133px; + height: 11px; + width: 16px; } + .flag-ve { - background-position: 0 -2575px; + background-position: 0 -1100px; height: 11px; width: 16px; } .flag-vg { - background-position: 0 -2586px; + background-position: 0 -341px; height: 11px; width: 16px; } .flag-vi { - background-position: 0 -2597px; + background-position: 0 -165px; height: 11px; width: 16px; } .flag-vn { - background-position: 0 -2608px; + background-position: 0 -2388px; height: 11px; width: 16px; } .flag-vu { - background-position: 0 -2619px; + background-position: 0 -726px; height: 11px; width: 16px; } .flag-wales { - background-position: 0 -2630px; + background-position: 0 -77px; height: 11px; width: 16px; } .flag-wf { - background-position: 0 -2641px; + background-position: 0 -913px; height: 11px; width: 16px; } .flag-ws { - background-position: 0 -2652px; + background-position: 0 -1937px; height: 11px; width: 16px; } .flag-ye { - background-position: 0 -2663px; + background-position: 0 -2520px; height: 11px; width: 16px; } .flag-yt { - background-position: 0 -2674px; + background-position: 0 -704px; height: 11px; width: 16px; } .flag-za { - background-position: 0 -2685px; + background-position: 0 -198px; height: 11px; width: 16px; } .flag-zm { - background-position: 0 -2696px; + background-position: 0 -1882px; height: 11px; width: 16px; } .flag-zw { - background-position: 0 -2707px; + background-position: 0 -649px; height: 11px; width: 16px; } diff --git a/test/fixtures/stylesheets/compass/images/flag-s03c3b29b35.png b/test/fixtures/stylesheets/compass/images/flag-s03c3b29b35.png deleted file mode 100644 index 3ec1e90d..00000000 Binary files a/test/fixtures/stylesheets/compass/images/flag-s03c3b29b35.png and /dev/null differ diff --git a/test/fixtures/stylesheets/compass/images/flag-s8c3c755a68.png b/test/fixtures/stylesheets/compass/images/flag-s8c3c755a68.png new file mode 100644 index 00000000..49090342 Binary files /dev/null and b/test/fixtures/stylesheets/compass/images/flag-s8c3c755a68.png differ diff --git a/test/fixtures/stylesheets/compass/sass/force-wrap.scss b/test/fixtures/stylesheets/compass/sass/force-wrap.scss new file mode 100644 index 00000000..c71f28e6 --- /dev/null +++ b/test/fixtures/stylesheets/compass/sass/force-wrap.scss @@ -0,0 +1,3 @@ +@import "compass/typography/text"; + +pre { @include force-wrap; } diff --git a/test/integrations/sprites_test.rb b/test/integrations/sprites_test.rb index 6f6834bd..3db8e640 100644 --- a/test/integrations/sprites_test.rb +++ b/test/integrations/sprites_test.rb @@ -448,7 +448,7 @@ class SpritesTest < Test::Unit::TestCase CSS end - it "should render corret sprite with css selectors via issue#248" do + it "should render correct sprite with css selectors via issue#248" do css = render <<-SCSS @import "selectors/*.png"; @include all-selectors-sprites; @@ -472,8 +472,33 @@ class SpritesTest < Test::Unit::TestCase } CSS end + + it "should honor offsets when rendering selectors via issue#449" do + css = render <<-SCSS + @import "selectors/*.png"; + @include all-selectors-sprites($offset-x: 20px, $offset-y: 20px); + SCSS + assert_correct css, <<-CSS + .selectors-sprite, .selectors-ten-by-ten { + background: url('/selectors-sedfef809e2.png') no-repeat; + } + + .selectors-ten-by-ten { + background-position: 20px 20px; + } + .selectors-ten-by-ten:hover, .selectors-ten-by-ten.ten-by-ten_hover, .selectors-ten-by-ten.ten-by-ten-hover { + background-position: 20px 0; + } + .selectors-ten-by-ten:target, .selectors-ten-by-ten.ten-by-ten_target, .selectors-ten-by-ten.ten-by-ten-target { + background-position: 20px -10px; + } + .selectors-ten-by-ten:active, .selectors-ten-by-ten.ten-by-ten_active, .selectors-ten-by-ten.ten-by-ten-active { + background-position: 20px 10px; + } + CSS + end - it "should render corret sprite with css selectors via magic mixin" do + it "should render correct sprite with css selectors via magic mixin" do css = render <<-SCSS @import "selectors/*.png"; a { @@ -499,6 +524,7 @@ class SpritesTest < Test::Unit::TestCase } CSS end + it "should not render corret sprite with css selectors via magic mixin" do css = render <<-SCSS @@ -518,6 +544,33 @@ class SpritesTest < Test::Unit::TestCase } CSS end + + it "should render corret sprite with css selectors via magic mixin with the correct offsets" do + css = render <<-SCSS + @import "selectors/*.png"; + a { + @include selectors-sprite(ten-by-ten, false, 5, -5) + } + SCSS + assert_correct css, <<-CSS + .selectors-sprite, a { + background: url('/selectors-sedfef809e2.png') no-repeat; + } + + a { + background-position: 5px -5px; + } + a:hover, a.ten-by-ten_hover, a.ten-by-ten-hover { + background-position: 5px -25px; + } + a:target, a.ten-by-ten_target, a.ten-by-ten-target { + background-position: 5px -35px; + } + a:active, a.ten-by-ten_active, a.ten-by-ten-active { + background-position: 5px -15px; + } + CSS + end it "should raise error on filenames that are not valid sass syntax" do assert_raise(Compass::Error) do diff --git a/test/test_helper.rb b/test/test_helper.rb index a4146cc6..43981842 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -39,6 +39,11 @@ end module SpriteHelper URI = "selectors/*.png" + def init_sprite_helper + @images_src_path = File.join(File.dirname(__FILE__), 'fixtures', 'sprites', 'public', 'images') + @images_tmp_path = File.join(File.dirname(__FILE__), 'fixtures', 'sprites', 'public', 'images-tmp') + end + def sprite_map_test(options) importer = Compass::SpriteImporter.new path, name = Compass::SpriteImporter.path_and_name(URI) @@ -47,4 +52,14 @@ module SpriteHelper Compass::SassExtensions::Sprites::SpriteMap.new(sprite_names.map{|n| "selectors/#{n}.png"}, path, name, sass_engine, options) end + def create_sprite_temp + init_sprite_helper + ::FileUtils.cp_r @images_src_path, @images_tmp_path + end + + def clean_up_sprites + init_sprite_helper + ::FileUtils.rm_r @images_tmp_path + end + end \ No newline at end of file diff --git a/test/units/sprites/image_test.rb b/test/units/sprites/image_test.rb index afcc0c7c..24b635b1 100644 --- a/test/units/sprites/image_test.rb +++ b/test/units/sprites/image_test.rb @@ -5,7 +5,7 @@ require 'ostruct' class SpritesImageTest < Test::Unit::TestCase include SpriteHelper def setup - @images_src_path = File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'sprites', 'public', 'images') + create_sprite_temp file = StringIO.new("images_path = #{@images_src_path.inspect}\n") Compass.add_configuration(file, "sprite_config") @repeat = 'no-repeat' diff --git a/test/units/sprites/importer_test.rb b/test/units/sprites/importer_test.rb index f9b0d79d..9d058704 100644 --- a/test/units/sprites/importer_test.rb +++ b/test/units/sprites/importer_test.rb @@ -1,10 +1,10 @@ require 'test_helper' require 'timecop' class ImporterTest < Test::Unit::TestCase - URI = "selectors/*.png" + include SpriteHelper def setup - @images_src_path = File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'sprites', 'public', 'images') + create_sprite_temp file = StringIO.new("images_path = #{@images_src_path.inspect}\n") Compass.add_configuration(file, "sprite_config") @importer = Compass::SpriteImporter.new @@ -18,6 +18,27 @@ class ImporterTest < Test::Unit::TestCase {:foo => 'bar'} end + test "should use search path to find sprites" do + Compass.reset_configuration! + uri = 'foo/*.png' + other_folder = File.join(@images_tmp_path, '../other-temp') + FileUtils.mkdir_p other_folder + FileUtils.mkdir_p File.join(other_folder, 'foo') + %w(my bar).each do |file| + FileUtils.touch(File.join(other_folder, "foo/#{file}.png")) + end + config = Compass::Configuration::Data.new('config') + config.images_path = @images_tmp_path + config.sprite_search_path = [@images_tmp_path, other_folder] + Compass.add_configuration(config, "sprite_config") + importer = Compass::SpriteImporter.new + assert_equal 2, Compass.configuration.sprite_search_path.compact.size + assert Compass.configuration.sprite_search_path.include?(other_folder) + assert_equal ["bar", "my"], Compass::SpriteImporter.sprite_names(uri) + + FileUtils.rm_rf other_folder + end + test "name should return the sprite name" do assert_equal 'selectors', Compass::SpriteImporter.sprite_name(URI) end diff --git a/test/units/sprites/sprite_command_test.rb b/test/units/sprites/sprite_command_test.rb index 240b00c3..4e4354fb 100644 --- a/test/units/sprites/sprite_command_test.rb +++ b/test/units/sprites/sprite_command_test.rb @@ -2,10 +2,8 @@ require 'test_helper' class SpriteCommandTest < Test::Unit::TestCase attr_reader :test_dir - + include SpriteHelper def setup - @images_src_path = File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'sprites', 'public', 'images') - @images_tmp_path = File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'sprites', 'public', 'images-tmp') @before_dir = ::Dir.pwd create_temp_cli_dir create_sprite_temp @@ -14,14 +12,6 @@ class SpriteCommandTest < Test::Unit::TestCase end end - def create_sprite_temp - ::FileUtils.cp_r @images_src_path, @images_tmp_path - end - - def clean_up_sprites - ::FileUtils.rm_r @images_tmp_path - end - def config_data return <<-CONFIG images_path = #{@images_tmp_path.inspect} diff --git a/test/units/sprites/sprite_map_test.rb b/test/units/sprites/sprite_map_test.rb index 9afa868a..25d5a98e 100644 --- a/test/units/sprites/sprite_map_test.rb +++ b/test/units/sprites/sprite_map_test.rb @@ -10,6 +10,7 @@ class SpriteMapTest < Test::Unit::TestCase FileUtils.cp_r @images_src_path, @images_tmp_path config = Compass::Configuration::Data.new('config') config.images_path = @images_tmp_path + config.sprite_search_path = [@images_tmp_path] Compass.add_configuration(config) Compass.configure_sass_plugin! @options = {'cleanup' => Sass::Script::Bool.new(true), 'layout' => Sass::Script::String.new('vertical')} @@ -115,5 +116,11 @@ class SpriteMapTest < Test::Unit::TestCase FileUtils.rm base.filename end + it "should generate vertical sprites in decending order" do + sizes = @base.images.map{|image| File.size(image.file) } + assert_equal sizes.min, File.size(@base.images.first.file) + assert_equal sizes.max, File.size(@base.images.last.file) + end + end \ No newline at end of file