Skip to content

Commit

Permalink
Use Bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Jul 5, 2017
1 parent 6033ba7 commit 3dbb310
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 15 deletions.
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,6 @@ end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'bootstrap', github: 'twbs/bootstrap-rubygem'
gem 'jquery-rails'
18 changes: 18 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
GIT
remote: https://github.com/twbs/bootstrap-rubygem.git
revision: 7cdeca9a0e8db3bb7548d9fa5bdaad9b644fca32
specs:
bootstrap (4.0.0.alpha6)
autoprefixer-rails (>= 6.0.3)
popper_js (>= 1.9.9, < 2.0)
sass (>= 3.4.19)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -41,6 +50,8 @@ GEM
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
arel (8.0.0)
autoprefixer-rails (7.1.1.3)
execjs
bindex (0.5.0)
builder (3.2.3)
byebug (9.0.6)
Expand Down Expand Up @@ -70,6 +81,10 @@ GEM
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.2.2)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand All @@ -88,6 +103,7 @@ GEM
nio4r (2.1.0)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
popper_js (1.9.9)
public_suffix (2.0.5)
puma (3.9.1)
rack (2.0.3)
Expand Down Expand Up @@ -169,10 +185,12 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap!
byebug
capybara (~> 2.13)
coffee-rails (~> 4.2)
jbuilder (~> 2.5)
jquery-rails
listen (>= 3.0.5, < 3.2)
puma (~> 3.7)
rails (~> 5.1.2)
Expand Down
3 changes: 3 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@
//
//= require rails-ujs
//= require turbolinks
//= require jquery3
//= require popper
//= require bootstrap-sprockets
//= require_tree .
15 changes: 0 additions & 15 deletions app/assets/stylesheets/application.css

This file was deleted.

1 change: 1 addition & 0 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "bootstrap";

0 comments on commit 3dbb310

Please sign in to comment.