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

relative paths for depend_on_asset and //=require

Browse source
This commit is contained in:
Gleb Mazovetskiy 2014-06-17 21:00:30 +02:00
parent f9af31710f
commit 2dc2274848
5 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/bootstrap-sass/version.rb
View file

@ -1,4 +1,4 @@
module Bootstrap
VERSION = '3.1.1.1'
BOOTSTRAP_SHA = '045aceef943330a84042a6f3a5c81dc79a10e7e5'
BOOTSTRAP_SHA = '3f68c40ac1011059ad0e3a7098bc1c75e4cd92bc'
end

2
tasks/converter/js_conversion.rb
View file

@ -12,7 +12,7 @@ class Converter
content = ''
bootstrap_js_files.each do |name|
name = name.gsub(/\.js$/, '')
content << "//= require bootstrap/#{name}\n"
content << "//= require ./bootstrap/#{name}\n"
end
path = 'vendor/assets/javascripts/bootstrap.js'
save_file(path, content)

2
tasks/converter/less_conversion.rb
View file

@ -111,7 +111,7 @@ 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_asset "../../fonts/bootstrap/#{File.basename(p)}") } * "\n" + "\n" + file
file = bootstrap_font_files.map { |p| %Q(//= depend_on_asset "./../../fonts/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

24
vendor/assets/javascripts/bootstrap.js vendored
View file

@ -1,12 +1,12 @@
//= require bootstrap/affix
//= require bootstrap/alert
//= require bootstrap/button
//= require bootstrap/carousel
//= require bootstrap/collapse
//= require bootstrap/dropdown
//= require bootstrap/tab
//= require bootstrap/transition
//= require bootstrap/scrollspy
//= require bootstrap/modal
//= require bootstrap/tooltip
//= require bootstrap/popover
//= require ./bootstrap/affix
//= require ./bootstrap/alert
//= require ./bootstrap/button
//= require ./bootstrap/carousel
//= require ./bootstrap/collapse
//= require ./bootstrap/dropdown
//= require ./bootstrap/tab
//= require ./bootstrap/transition
//= require ./bootstrap/scrollspy
//= require ./bootstrap/modal
//= require ./bootstrap/tooltip
//= require ./bootstrap/popover

8
vendor/assets/stylesheets/bootstrap/_glyphicons.scss vendored
View file

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