github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source 
* stable:
  [Tests] Add a test case for the blueprint-scaffolding-body mixin.
  [Tests] Don't rely on file timestamps for test fixtures.
This commit is contained in:
Chris Eppstein 2010-06-01 08:52:40 -07:00
commit 3367f18d78
6 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/fixtures/stylesheets/blueprint/config.rb vendored
View File

@ -8,3 +8,7 @@ line_comments = false
# To enable relative image paths using the images_url() function: # To enable relative image paths using the images_url() function:
# http_images_path = :relative # http_images_path = :relative
http_images_path = "/images" http_images_path = "/images"
asset_cache_buster do |path, file|
"busted=true"
end

2
test/fixtures/stylesheets/blueprint/css/screen.css vendored
View File

@ -669,7 +669,7 @@ input.span-24, textarea.span-24, select.span-24 {
margin-bottom: 1.5em; } margin-bottom: 1.5em; }
.showgrid { .showgrid {
background: url('/images/grid.png?1275242906'); } background: url('/images/grid.png?busted=true'); }
.error { .error {
padding: 0.8em; padding: 0.8em;

2
test/fixtures/stylesheets/blueprint/css/single-imports/debug.css vendored
View File

@ -1,2 +1,2 @@
.showgrid { .showgrid {
background: url('/images/grid.png?1275242906'); } background: url('/images/grid.png?busted=true'); }

18
test/fixtures/stylesheets/blueprint/css/single-imports/link-icons.css vendored
View File

@ -12,22 +12,22 @@ body a[href^="aim:"] {
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: right center; } background-position: right center; }
body a[href^="http:"] { body a[href^="http:"] {
background-image: url('/images/link_icons/external.png?1275377962'); } background-image: url('/images/link_icons/external.png?busted=true'); }
body a[href^="mailto:"] { body a[href^="mailto:"] {
background-image: url('/images/link_icons/email.png?1275377962'); } background-image: url('/images/link_icons/email.png?busted=true'); }
body a[href^="http:"]:visited { body a[href^="http:"]:visited {
background-image: url('/images/link_icons/visited.png?1275377962'); } background-image: url('/images/link_icons/visited.png?busted=true'); }
body a[href$=".pdf"] { body a[href$=".pdf"] {
background-image: url('/images/link_icons/pdf.png?1275377962'); } background-image: url('/images/link_icons/pdf.png?busted=true'); }
body a[href$=".doc"] { body a[href$=".doc"] {
background-image: url('/images/link_icons/doc.png?1275377962'); } background-image: url('/images/link_icons/doc.png?busted=true'); }
body a[href$=".xls"] { body a[href$=".xls"] {
background-image: url('/images/link_icons/xls.png?1275377962'); } background-image: url('/images/link_icons/xls.png?busted=true'); }
body a[href$=".rss"], body a[href$=".rss"],
body a[href$=".rdf"] { body a[href$=".rdf"] {
background-image: url('/images/link_icons/feed.png?1275377962'); } background-image: url('/images/link_icons/feed.png?busted=true'); }
body a[href^="aim:"] { body a[href^="aim:"] {
background-image: url('/images/link_icons/im.png?1275377962'); } background-image: url('/images/link_icons/im.png?busted=true'); }
body a.noicon { body a.noicon {
background: transparent none !important; background: transparent none !important;
padding: 0 !important; padding: 0 !important;
@ -37,4 +37,4 @@ body a#this-is-a-pdf-link {
margin: -2px 0; margin: -2px 0;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: right center; background-position: right center;
background-image: url('/images/link_icons/pdf.png?1275377962'); } background-image: url('/images/link_icons/pdf.png?busted=true'); }

3
test/fixtures/stylesheets/blueprint/css/single-imports/scaffolding.css vendored
View File

@ -40,3 +40,6 @@ form.inline {
line-height: 3; } line-height: 3; }
form.inline p { form.inline p {
margin-bottom: 0; } margin-bottom: 0; }
body {
margin: 1.5em 0; }

4
test/fixtures/stylesheets/blueprint/sass/single-imports/scaffolding.scss vendored
View File

@ -1,3 +1,5 @@
@import "blueprint/scaffolding"; @import "blueprint/scaffolding";
@include blueprint-scaffolding; @include blueprint-scaffolding;
body { @include blueprint-scaffolding-body; }