Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace :twitter do

icons_path = 'app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss'
icons = File.read icons_path
icons.gsub!(/url\(/, "font-url(")
icons.gsub!(/url\((.*)\)/, 'url(asset_path(\1))')
File.write(icons_path, icons)
end

Expand Down
10 changes: 5 additions & 5 deletions app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
// Import the fonts
@font-face {
font-family: 'Glyphicons Halflings';
src: font-url('#{$icon-font-path}#{$icon-font-name}.eot');
src: font-url('#{$icon-font-path}#{$icon-font-name}.eot?#iefix') format('embedded-opentype'),
font-url('#{$icon-font-path}#{$icon-font-name}.woff') format('woff'),
font-url('#{$icon-font-path}#{$icon-font-name}.ttf') format('truetype'),
font-url('#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular') format('svg');
src: url(asset_path('#{$icon-font-path}#{$icon-font-name}.eot'));
src: url(asset_path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
url(asset_path('#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
url(asset_path('#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
url(asset_path('#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular')) format('svg');
}

// Catchall baseclass
Expand Down