[#369] update bootstrap-sass
This commit is contained in:
parent
835fa4c65e
commit
a36e46a769
2
Gemfile
2
Gemfile
|
@ -85,7 +85,7 @@ gem 'time_diff'
|
|||
|
||||
gem 'sass-rails', '~> 4.0'
|
||||
gem 'coffee-rails', '~> 4.1'
|
||||
gem 'bootstrap-sass', '~> 3.2'
|
||||
gem 'bootstrap-sass', '~> 3.3'
|
||||
gem 'font-awesome-rails', '~> 4.2'
|
||||
gem 'zeroclipboard-rails', '~> 0.1.0'
|
||||
|
||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -94,6 +94,9 @@ GEM
|
|||
arel (4.0.2)
|
||||
attr_encrypted (1.3.3)
|
||||
encryptor (>= 1.3.0)
|
||||
autoprefixer-rails (5.1.3.1)
|
||||
execjs
|
||||
json
|
||||
bcrypt (3.1.7)
|
||||
better_errors (2.0.0)
|
||||
coderay (>= 1.0.0)
|
||||
|
@ -101,8 +104,9 @@ GEM
|
|||
rack (>= 0.9.0)
|
||||
binding_of_caller (0.7.2)
|
||||
debug_inspector (>= 0.0.1)
|
||||
bootstrap-sass (3.2.0.2)
|
||||
sass (~> 3.2)
|
||||
bootstrap-sass (3.3.3)
|
||||
autoprefixer-rails (>= 5.0.0.1)
|
||||
sass (>= 3.2.19)
|
||||
bourbon (3.2.3)
|
||||
sass (~> 3.2)
|
||||
thor
|
||||
|
@ -539,7 +543,7 @@ DEPENDENCIES
|
|||
attr_encrypted (~> 1.3)
|
||||
better_errors
|
||||
binding_of_caller
|
||||
bootstrap-sass (~> 3.2)
|
||||
bootstrap-sass (~> 3.3)
|
||||
cancan!
|
||||
cape
|
||||
capistrano
|
||||
|
|
Loading…
Reference in New Issue