Skip to content

Commit bb7dbf8

Browse files
committed
v3.4.0
1 parent 3c126b3 commit bb7dbf8

File tree

8 files changed

+15
-10
lines changed

8 files changed

+15
-10
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## 3.4.0
4+
5+
* Bootstrap rubygem now depends on SassC instead of Sass.
6+
* Compass no longer supported.
7+
38
## 3.3.7
49

510
* Allows jQuery 3.x in bower.json. [#1048](https://github.com/twbs/bootstrap-sass/issues/1048)

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Please see the appropriate guide for your environment of choice:
2323
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.
2424

2525
```ruby
26-
gem 'bootstrap-sass', '~> 3.3.7'
27-
gem 'sassc-rails', '>= 1.3.0'
26+
gem 'bootstrap-sass', '~> 3.4.0'
27+
gem 'sassc-rails', '>= 2.0.0'
2828
```
2929

3030
`bundle install` and restart your server to make the files available through the pipeline.

Rakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ task :debug do
4646
require 'bootstrap-sass'
4747
path = Bootstrap.stylesheets_path
4848
%w(_bootstrap).each do |file|
49-
engine = SassC::Engine.new(File.read("#{path}/#{file}.scss"), syntax: :scss, load_paths: [path])
49+
engine = SassC::Engine.new(File.read("#{path}/#{file}.scss"), syntax: :scss, load_paths: ['.', path])
5050
File.open("tmp/#{file}.css", 'w') { |f| f.write(engine.render) }
5151
end
5252
end
@@ -76,7 +76,7 @@ task :compile, :css_path do |t, args|
7676
%w(_bootstrap bootstrap/_theme).each do |file|
7777
save_path = "#{css_path}/#{file.sub(/(^|\/)?_+/, '\1').sub('/', '-')}.css"
7878
puts Term::ANSIColor.cyan(" #{save_path}") + '...'
79-
engine = SassC::Engine.new(File.read("#{path}/#{file}.scss"), syntax: :scss, load_paths: [path])
79+
engine = SassC::Engine.new(File.read("#{path}/#{file}.scss"), syntax: :scss, load_paths: ['.', path])
8080
css = engine.render
8181
File.open(save_path, 'w') { |f| f.write css }
8282
end

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
"dependencies": {
3333
"jquery": "1.9.1 - 3"
3434
},
35-
"version": "3.3.7"
35+
"version": "3.4.0"
3636
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"license": "MIT",
3030
"extra": {
3131
"branch-alias": {
32-
"dev-master": "3.3.x-dev"
32+
"dev-master": "3.4.x-dev"
3333
}
3434
}
3535
}

lib/bootstrap-sass/version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module Bootstrap
2-
VERSION = '3.3.7'
3-
BOOTSTRAP_SHA = 'v3.4.0-dev'
2+
VERSION = '3.4.0'
3+
BOOTSTRAP_SHA = '4c547f2175b9a05aa43551f6927da83fe249ce42'
44
end

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap-sass",
3-
"version": "3.3.7",
3+
"version": "3.4.0",
44
"description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
55
"main": "assets/javascripts/bootstrap.js",
66
"style": "assets/stylesheets/_bootstrap.scss",

templates/project/_bootstrap-variables.sass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Override Bootstrap variables here (defaults from bootstrap-sass v3.3.7):
1+
// Override Bootstrap variables here (defaults from bootstrap-sass v3.4.0):
22
33
//
44
// Variables

0 commit comments

Comments
 (0)