This commit is contained in:
Gleb Mazovetskiy 2018-12-14 12:16:02 +00:00
parent 3c126b3d96
commit bb7dbf8af7
8 changed files with 15 additions and 10 deletions

View File

@ -1,5 +1,10 @@
# Changelog # Changelog
## 3.4.0
* Bootstrap rubygem now depends on SassC instead of Sass.
* Compass no longer supported.
## 3.3.7 ## 3.3.7
* Allows jQuery 3.x in bower.json. [#1048](https://github.com/twbs/bootstrap-sass/issues/1048) * Allows jQuery 3.x in bower.json. [#1048](https://github.com/twbs/bootstrap-sass/issues/1048)

View File

@ -23,8 +23,8 @@ Please see the appropriate guide for your environment of choice:
In your Gemfile you need to add the `bootstrap-sass` gem, and ensure that the `sass-rails` gem is present - it is added to new Rails applications by default. In your Gemfile you need to add the `bootstrap-sass` gem, and ensure that the `sass-rails` gem is present - it is added to new Rails applications by default.
```ruby ```ruby
gem 'bootstrap-sass', '~> 3.3.7' gem 'bootstrap-sass', '~> 3.4.0'
gem 'sassc-rails', '>= 1.3.0' gem 'sassc-rails', '>= 2.0.0'
``` ```
`bundle install` and restart your server to make the files available through the pipeline. `bundle install` and restart your server to make the files available through the pipeline.

View File

@ -46,7 +46,7 @@ task :debug do
require 'bootstrap-sass' require 'bootstrap-sass'
path = Bootstrap.stylesheets_path path = Bootstrap.stylesheets_path
%w(_bootstrap).each do |file| %w(_bootstrap).each do |file|
engine = SassC::Engine.new(File.read("#{path}/#{file}.scss"), syntax: :scss, load_paths: [path]) engine = SassC::Engine.new(File.read("#{path}/#{file}.scss"), syntax: :scss, load_paths: ['.', path])
File.open("tmp/#{file}.css", 'w') { |f| f.write(engine.render) } File.open("tmp/#{file}.css", 'w') { |f| f.write(engine.render) }
end end
end end
@ -76,7 +76,7 @@ task :compile, :css_path do |t, args|
%w(_bootstrap bootstrap/_theme).each do |file| %w(_bootstrap bootstrap/_theme).each do |file|
save_path = "#{css_path}/#{file.sub(/(^|\/)?_+/, '\1').sub('/', '-')}.css" save_path = "#{css_path}/#{file.sub(/(^|\/)?_+/, '\1').sub('/', '-')}.css"
puts Term::ANSIColor.cyan(" #{save_path}") + '...' puts Term::ANSIColor.cyan(" #{save_path}") + '...'
engine = SassC::Engine.new(File.read("#{path}/#{file}.scss"), syntax: :scss, load_paths: [path]) engine = SassC::Engine.new(File.read("#{path}/#{file}.scss"), syntax: :scss, load_paths: ['.', path])
css = engine.render css = engine.render
File.open(save_path, 'w') { |f| f.write css } File.open(save_path, 'w') { |f| f.write css }
end end

View File

@ -32,5 +32,5 @@
"dependencies": { "dependencies": {
"jquery": "1.9.1 - 3" "jquery": "1.9.1 - 3"
}, },
"version": "3.3.7" "version": "3.4.0"
} }

View File

@ -29,7 +29,7 @@
"license": "MIT", "license": "MIT",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.3.x-dev" "dev-master": "3.4.x-dev"
} }
} }
} }

View File

@ -1,4 +1,4 @@
module Bootstrap module Bootstrap
VERSION = '3.3.7' VERSION = '3.4.0'
BOOTSTRAP_SHA = 'v3.4.0-dev' BOOTSTRAP_SHA = '4c547f2175b9a05aa43551f6927da83fe249ce42'
end end

View File

@ -1,6 +1,6 @@
{ {
"name": "bootstrap-sass", "name": "bootstrap-sass",
"version": "3.3.7", "version": "3.4.0",
"description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.", "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
"main": "assets/javascripts/bootstrap.js", "main": "assets/javascripts/bootstrap.js",
"style": "assets/stylesheets/_bootstrap.scss", "style": "assets/stylesheets/_bootstrap.scss",

View File

@ -1,4 +1,4 @@
// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.7): // Override Bootstrap variables here (defaults from bootstrap-sass v3.4.0):
// //
// Variables // Variables