Skip to content

Commit

Permalink
Package up Glyphicons and use less-rails' asset-url() helper.
Browse files Browse the repository at this point in the history
  • Loading branch information
metaskills committed Feb 1, 2012
1 parent 7bc1dcb commit 9daa35b
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
@@ -1,6 +1,11 @@
CHANGELOG
=========

2.0.1 - 01/31/2011

* Package up Glyphicons and use less-rails' asset-url() helper.


2.0.0 - 01/31/2011

* Update to Twitter Bootstrap 2.0.0
Expand Down
2 changes: 1 addition & 1 deletion lib/less/rails/bootstrap/version.rb
@@ -1,7 +1,7 @@
module Less
module Rails
module Bootstrap
VERSION = "2.0.0"
VERSION = "2.0.1"
end
end
end
5 changes: 5 additions & 0 deletions test/cases/usage_css_spec.rb
Expand Up @@ -14,6 +14,11 @@ class UsageCssSpec < Less::Rails::Bootstrap::Spec
app_css.must_include '#other-css { color: red; }', 'From our code afterward.'
end

it 'uses less-rails asset-url helper for images' do
app_css.must_include 'url(/assets/twitter/bootstrap/glyphicons-halflings.png)'
app_css.must_include 'url(/assets/twitter/bootstrap/glyphicons-halflings-white.png)'
end

end

describe 'framework.css.less' do
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions vendor/frameworks/twitter/bootstrap/sprites.less
Expand Up @@ -19,14 +19,14 @@
width: 14px;
height: 14px;
vertical-align: text-top;
background-image: url(../img/glyphicons-halflings.png);
background-image: asset-url("twitter/bootstrap/glyphicons-halflings.png");
background-position: 14px 14px;
background-repeat: no-repeat;

.ie7-restore-right-whitespace();
}
.icon-white {
background-image: url(../img/glyphicons-halflings-white.png);
background-image: asset-url("twitter/bootstrap/glyphicons-halflings-white.png");
}

.icon-glass { background-position: 0 0; }
Expand Down

0 comments on commit 9daa35b

Please sign in to comment.