Skip to content

Commit

Permalink
Update Bootstrap to 4.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
lujanfernaud committed Jul 19, 2018
1 parent b4ca2e4 commit c19a6fc
Show file tree
Hide file tree
Showing 8 changed files with 735 additions and 591 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ gem 'rounding', '~> 1.0', '>= 1.0.1'
gem 'storext', '~> 2.2', '>= 2.2.2'

# Bootstrap.
gem 'bootstrap', '~> 4.0.0.beta2.1'
gem 'jquery-rails', '4.3.1'
gem 'bootstrap', '~> 4.1', '>= 4.1.1'
gem 'jquery-rails', '~> 4.3', '>= 4.3.3'

# Pagination and breadcrumbs.
gem 'bootstrap-will_paginate', '1.0.0'
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ GEM
ansi (1.5.0)
arel (8.0.0)
ast (2.4.0)
autoprefixer-rails (8.4.1)
autoprefixer-rails (9.0.0)
execjs
awesome_print (1.8.0)
aws_cf_signer (0.1.3)
Expand All @@ -71,7 +71,7 @@ GEM
bindex (0.5.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootstrap (4.0.0)
bootstrap (4.1.1)
autoprefixer-rails (>= 6.0.3)
popper_js (>= 1.12.9, < 2)
sass (>= 3.5.2)
Expand Down Expand Up @@ -198,7 +198,7 @@ GEM
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.1)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand Down Expand Up @@ -442,7 +442,7 @@ DEPENDENCIES
bcrypt (~> 3.1.7)
better_errors (~> 2.4)
binding_of_caller (~> 0.8.0)
bootstrap (~> 4.0.0.beta2.1)
bootstrap (~> 4.1, >= 4.1.1)
bootstrap-will_paginate (= 1.0.0)
breadcrumbs_on_rails (~> 3.0, >= 3.0.1)
bullet (~> 5.7, >= 5.7.5)
Expand All @@ -465,7 +465,7 @@ DEPENDENCIES
guard-rubycritic (~> 2.9, >= 2.9.3)
inline_svg (~> 1.3, >= 1.3.1)
jbuilder (~> 2.5)
jquery-rails (= 4.3.1)
jquery-rails (~> 4.3, >= 4.3.3)
listen (>= 3.0.5, < 3.2)
local_time (~> 2.0, >= 2.0.1)
mini_magick (~> 4.8)
Expand Down
Loading

0 comments on commit c19a6fc

Please sign in to comment.