1
0
Fork 0
mirror of https://github.com/twbs/bootstrap-sass.git synced 2022-11-09 12:27:02 -05:00

Drop Sprockets depend_on

Sprockets does not require depend_on for our use case since v2.1.4
Drop the directives, and instruct Rails users to use sprockets-rails
v2.1.4+.

Profit: Bower package can now be used from Rails

Related issues: #592, #689
This commit is contained in:
Gleb Mazovetskiy 2014-09-06 03:39:24 +02:00
parent 7aabf8a25a
commit fe4aaa4b8a
4 changed files with 5 additions and 6 deletions

View file

@ -64,6 +64,10 @@ When using [bootstrap-sass Bower package](#c-bower) in Rails, ensure [minimum Sa
`bootstrap-sprockets` must be imported before `bootstrap` for the icon fonts to work.
#### Rails 4.x
Please make sure `sprockets-rails` is at least v2.1.4.
#### Rails 3.2.x
Rails 3.2 is [no longer maintained for bugfixes](http://guides.rubyonrails.org/maintenance_policy.html), and you should upgrade as soon as possible.

View file

@ -1,7 +1,3 @@
//= depend_on "bootstrap/glyphicons-halflings-regular.eot"
//= depend_on "bootstrap/glyphicons-halflings-regular.svg"
//= depend_on "bootstrap/glyphicons-halflings-regular.ttf"
//= depend_on "bootstrap/glyphicons-halflings-regular.woff"
//
// Glyphicons for Bootstrap
//

View file

@ -114,7 +114,6 @@ class Converter
when 'thumbnails.less', 'labels.less', 'badges.less'
file = extract_nested_rule file, 'a&'
when 'glyphicons.less'
file = bootstrap_font_files.map { |p| %Q(//= depend_on "bootstrap/#{File.basename(p)}") } * "\n" + "\n" + file
file = replace_rules(file, '@font-face') { |rule|
rule = replace_all rule, /(\$icon-font(?:-\w+)+)/, '#{\1}'
replace_asset_url rule, :font

View file

@ -60,7 +60,7 @@ class Converter
# get sha of the branch (= the latest commit)
def get_branch_sha
@branch_sha ||= begin
if %x[git rev-parse #@branch].chomp == @branch
if @branch + "\n" == %x[git rev-parse #@branch]
@branch
else
cmd = "git ls-remote #{Shellwords.escape "https://github.com/#@repo"} #@branch"