Kouhei Sutou
null+****@clear*****
Wed Jul 5 10:57:50 JST 2017
Kouhei Sutou 2017-07-05 10:57:50 +0900 (Wed, 05 Jul 2017) New Revision: 3dbb3108589c18a044fbf85f8751222bd42fea6a https://github.com/ranguba/chupa-text-http-server/commit/3dbb3108589c18a044fbf85f8751222bd42fea6a Message: Use Bootstrap Added files: app/assets/stylesheets/application.scss Removed files: app/assets/stylesheets/application.css Modified files: Gemfile Gemfile.lock app/assets/javascripts/application.js Modified: Gemfile (+3 -0) =================================================================== --- Gemfile 2017-07-05 10:29:09 +0900 (0d55d63) +++ Gemfile 2017-07-05 10:57:50 +0900 (9eb3929) @@ -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' Modified: Gemfile.lock (+18 -0) =================================================================== --- Gemfile.lock 2017-07-05 10:29:09 +0900 (71821ed) +++ Gemfile.lock 2017-07-05 10:57:50 +0900 (4a1cd68) @@ -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: @@ -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) @@ -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) @@ -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) @@ -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) Modified: app/assets/javascripts/application.js (+3 -0) =================================================================== --- app/assets/javascripts/application.js 2017-07-05 10:29:09 +0900 (46b2035) +++ app/assets/javascripts/application.js 2017-07-05 10:57:50 +0900 (9380ae2) @@ -12,4 +12,7 @@ // //= require rails-ujs //= require turbolinks +//= require jquery3 +//= require popper +//= require bootstrap-sprockets //= require_tree . Deleted: app/assets/stylesheets/application.css (+0 -15) 100644 =================================================================== --- app/assets/stylesheets/application.css 2017-07-05 10:29:09 +0900 (d05ea0f) +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's - * vendor/assets/stylesheets directory can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS - * files in this directory. Styles in this file should be added after the last require_* statement. - * It is generally better to create a new file per style scope. - * - *= require_tree . - *= require_self - */ Added: app/assets/stylesheets/application.scss (+1 -0) 100644 =================================================================== --- /dev/null +++ app/assets/stylesheets/application.scss 2017-07-05 10:57:50 +0900 (cbd46a7) @@ -0,0 +1 @@ + �� import "bootstrap"; -------------- next part -------------- HTML����������������������������...Télécharger
