Skip to content

Commit

Permalink
bootstrap 4
Browse files Browse the repository at this point in the history
  • Loading branch information
Arie committed Sep 23, 2018
1 parent 530afc2 commit 7686784
Show file tree
Hide file tree
Showing 52 changed files with 42,248 additions and 6,170 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Expand Up @@ -53,7 +53,7 @@ gem 'jbuilder'

gem 'ffi'
gem "pg"
gem 'therubyracer'
gem 'mini_racer'
gem 'oily_png'


Expand Down Expand Up @@ -122,9 +122,9 @@ gem 'jquery-rails'
gem 'sass'
gem 'sass-rails'
gem 'sassc'
gem 'bootstrap-sass'
gem 'bootstrap', '~> 4.1.3'
gem 'will_paginate-bootstrap4'
gem 'simple_form'
gem 'will_paginate-bootstrap'
gem 'execjs'
gem 'font-awesome-rails'
gem 'coffee-rails'
37 changes: 22 additions & 15 deletions Gemfile.lock
Expand Up @@ -108,9 +108,10 @@ GEM
rack (>= 0.9.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
sass (>= 3.3.4)
bootstrap (4.1.3)
autoprefixer-rails (>= 6.0.3)
popper_js (>= 1.12.9, < 2)
sass (>= 3.5.2)
builder (3.2.3)
capistrano (3.11.0)
airbrussh (>= 1.0.0)
Expand Down Expand Up @@ -140,7 +141,7 @@ GEM
capistrano-bundler
puma (~> 3.4)
capistrano_colors (0.5.5)
capybara (3.7.2)
capybara (3.8.1)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
Expand Down Expand Up @@ -254,7 +255,7 @@ GEM
json_expressions (0.9.0)
launchy (2.4.3)
addressable (~> 2.3)
libv8 (3.16.14.19)
libv8 (6.7.288.46.1)
lograge (0.10.0)
actionpack (>= 4)
activesupport (>= 4)
Expand Down Expand Up @@ -287,6 +288,8 @@ GEM
mimemagic (0.3.2)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
mini_racer (0.2.0)
libv8 (>= 6.3)
minitest (5.11.3)
msgpack (1.2.4)
multi_json (1.13.1)
Expand Down Expand Up @@ -322,6 +325,7 @@ GEM
multi_json (~> 1.0)
xml-simple
pg (1.1.3)
popper_js (1.14.3)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
Expand Down Expand Up @@ -371,12 +375,14 @@ GEM
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rbtrace (0.4.11)
ffi (>= 1.0.6)
msgpack (>= 0.4.3)
optimist (>= 3.0.0)
redis (4.0.2)
ref (2.0.0)
request_store (1.4.1)
rack (>= 1.4)
responders (2.4.0)
Expand Down Expand Up @@ -411,7 +417,11 @@ GEM
rufus-scheduler (3.4.2)
et-orbi (~> 1.0)
safe_yaml (1.0.4)
sass (3.4.25)
sass (3.6.0)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
Expand Down Expand Up @@ -458,9 +468,6 @@ GEM
tins (~> 1.0)
tf2_line_parser (0.2.0)
activesupport
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.8)
Expand All @@ -484,8 +491,8 @@ GEM
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
will_paginate (3.1.6)
will_paginate-bootstrap (1.0.1)
will_paginate (>= 3.0.3)
will_paginate-bootstrap4 (0.2.2)
will_paginate (~> 3.0, >= 3.0.0)
xml-simple (1.1.5)
xpath (3.1.0)
nokogiri (~> 1.8)
Expand All @@ -499,7 +506,7 @@ DEPENDENCIES
base32_pure
better_errors
binding_of_caller
bootstrap-sass
bootstrap (~> 4.1.3)
capistrano
capistrano-bundler
capistrano-ext
Expand Down Expand Up @@ -544,6 +551,7 @@ DEPENDENCIES
logs_tf
maxminddb
mechanize
mini_racer
minitest
net-sftp
net-ssh
Expand Down Expand Up @@ -579,12 +587,11 @@ DEPENDENCIES
steam-condenser!
stripe
tf2_line_parser
therubyracer
uglifier
vcr
webmock
will_paginate
will_paginate-bootstrap
will_paginate-bootstrap4
zonebie

BUNDLED WITH
Expand Down
4 changes: 1 addition & 3 deletions app/assets/javascripts/application.js
Expand Up @@ -13,8 +13,6 @@
//= require jquery
//= require jquery_ujs
//= require_tree .
//// Loads all Bootstrap javascripts
//
//= require bootstrap
//= require datepicker
//= require select2
//= require clipboard

0 comments on commit 7686784

Please sign in to comment.