From c5860f338bf0b30d47f11e513a349977386998b4 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Mon, 1 Apr 2019 06:42:33 +0200 Subject: [PATCH] Gems for design upgraded --- Gemfile | 5 +++-- Gemfile.lock | 34 ++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index add1dd0..aefe82d 100755 --- a/Gemfile +++ b/Gemfile @@ -17,11 +17,12 @@ gem 'webrick'#, '1.3.1' # in production environments by default. gem 'sass-rails', '~> 5.0' gem 'coffee-rails', '~> 4.2.2' - gem 'bootstrap-sass','~> 3.4' + gem 'bootstrap'#,'~> 3.4' #group :assets do # See https://github.com/sstephenson/execjs#readme for more supported runtimes - gem 'therubyracer', :platforms => :ruby +# gem 'therubyracer', :platforms => :ruby + gem 'mini_racer' gem 'uglifier'#, '>= 1.0.3' #end gem 'active_record_query_trace' diff --git a/Gemfile.lock b/Gemfile.lock index 1243014..ac2d312 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,7 +64,7 @@ GEM rake (>= 10.4, < 13.0) arel (6.0.4) attr_required (1.0.1) - autoprefixer-rails (9.4.7) + autoprefixer-rails (9.5.0) execjs awesome_nested_set (3.1.4) activerecord (>= 4.0.0, < 5.3) @@ -74,11 +74,12 @@ GEM railties (>= 3.1.0) blueimp-gallery-rails (2.7.0) railties (>= 3.0, < 5.0) + bootstrap (4.3.1) + autoprefixer-rails (>= 9.1.0) + popper_js (>= 1.14.3, < 2) + sassc-rails (>= 2.0.0) bootstrap-addons-rails (0.1.2) rails - bootstrap-sass (3.4.1) - autoprefixer-rails (>= 5.2.1) - sassc (>= 2.0.0) builder (3.2.3) cancan (1.6.10) capybara (3.13.2) @@ -131,7 +132,7 @@ GEM multi_json (>= 1.3) rack-oauth2 (>= 0.14.4) tzinfo - ffi (1.9.25) + ffi (1.10.0) font-awesome-rails (4.7.0.4) railties (>= 3.2, < 6.0) formtastic (3.1.5) @@ -191,7 +192,7 @@ GEM activerecord kaminari-core (= 1.1.1) kaminari-core (1.1.1) - libv8 (3.16.14.19) + libv8 (6.7.288.46.1) loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -205,6 +206,8 @@ GEM mimemagic (0.3.3) mini_mime (1.0.1) mini_portile2 (2.4.0) + mini_racer (0.2.4) + libv8 (>= 6.3) minitest (5.11.3) multi_json (1.13.1) multi_xml (0.6.0) @@ -250,6 +253,7 @@ GEM mime-types mimemagic (~> 0.3.0) terrapin (~> 0.6.0) + popper_js (1.14.5) pr_geohash (1.0.0) progress_bar (1.3.0) highline (>= 1.6, < 3) @@ -296,7 +300,6 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - ref (2.0.0) regexp_parser (1.3.0) request_store (1.4.1) rack (>= 1.4) @@ -355,9 +358,15 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (2.0.0) - ffi (~> 1.9.6) + sassc (2.0.1) + ffi (~> 1.9) rake + sassc-rails (2.1.0) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt seed_dump (3.3.1) activerecord (>= 4) activesupport (>= 4) @@ -396,9 +405,6 @@ GEM climate_control (>= 0.0.3, < 1.0) themes_on_rails (0.4.0) rails (>= 3.2) - therubyracer (0.12.3) - libv8 (~> 3.16.14.15) - ref thor (0.20.3) thread_safe (0.3.6) tilt (2.0.9) @@ -433,9 +439,9 @@ DEPENDENCIES awesome_nested_set blueimp-gallery blueimp-gallery-rails + bootstrap bootstrap-addons-rails bootstrap-kaminari-views! - bootstrap-sass (~> 3.4) cancan capybara carrierwave @@ -459,6 +465,7 @@ DEPENDENCIES jquery-ui-rails kaminari meta-tags + mini_racer minitest mysql2 omniauth (~> 1.6) @@ -495,7 +502,6 @@ DEPENDENCIES sunspot_solr sunspot_test themes_on_rails - therubyracer tinymce-rails (~> 4.1.0) uglifier webrick