Skip to content

Commit

Permalink
v3.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
glebm committed Dec 14, 2018
1 parent 3c126b3 commit bb7dbf8
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 10 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## 3.4.0

* Bootstrap rubygem now depends on SassC instead of Sass.
* Compass no longer supported.

## 3.3.7

* Allows jQuery 3.x in bower.json. [#1048](https://github.com/twbs/bootstrap-sass/issues/1048)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

```ruby
gem 'bootstrap-sass', '~> 3.3.7'
gem 'sassc-rails', '>= 1.3.0'
gem 'bootstrap-sass', '~> 3.4.0'
gem 'sassc-rails', '>= 2.0.0'
```

`bundle install` and restart your server to make the files available through the pipeline.
Expand Down
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ task :debug do
require 'bootstrap-sass'
path = Bootstrap.stylesheets_path
%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) }
end
end
Expand Down Expand Up @@ -76,7 +76,7 @@ task :compile, :css_path do |t, args|
%w(_bootstrap bootstrap/_theme).each do |file|
save_path = "#{css_path}/#{file.sub(/(^|\/)?_+/, '\1').sub('/', '-')}.css"
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
File.open(save_path, 'w') { |f| f.write css }
end
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
"dependencies": {
"jquery": "1.9.1 - 3"
},
"version": "3.3.7"
"version": "3.4.0"
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"license": "MIT",
"extra": {
"branch-alias": {
"dev-master": "3.3.x-dev"
"dev-master": "3.4.x-dev"
}
}
}
4 changes: 2 additions & 2 deletions lib/bootstrap-sass/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module Bootstrap
VERSION = '3.3.7'
BOOTSTRAP_SHA = 'v3.4.0-dev'
VERSION = '3.4.0'
BOOTSTRAP_SHA = '4c547f2175b9a05aa43551f6927da83fe249ce42'
end
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"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.",
"main": "assets/javascripts/bootstrap.js",
"style": "assets/stylesheets/_bootstrap.scss",
Expand Down
2 changes: 1 addition & 1 deletion templates/project/_bootstrap-variables.sass
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit bb7dbf8

Please sign in to comment.