From 4768a4548ae7f61ac97e0bf05b917983fc301f81 Mon Sep 17 00:00:00 2001 From: chomik Date: Thu, 19 Jul 2018 17:09:29 +0200 Subject: [PATCH] upgrade bootstrap --- .gitignore | 1 + Gemfile | 1 - Gemfile.lock | 26 +++++++++++++------------- package.json | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index ec72c02c0..6e4977679 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ deploy-site /commits.sh /assets/css/ /vendor/ +/package-lock.json diff --git a/Gemfile b/Gemfile index 6043325ed..a5671666a 100644 --- a/Gemfile +++ b/Gemfile @@ -3,5 +3,4 @@ source 'https://rubygems.org' do gem 'jekyll-redirect-from' gem 'jekyll-toc' gem 'jekyll-random' - gem 'public_suffix', '3.0.0' end diff --git a/Gemfile.lock b/Gemfile.lock index 4eb12b005..7d81d6a39 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,15 +8,15 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.5) - ffi (1.9.21) + eventmachine (1.2.7) + ffi (1.9.25) forwardable-extended (2.6.0) htmlbeautifier (1.3.1) htmlcompressor (0.4.0) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.7.2) + jekyll (3.8.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -31,7 +31,7 @@ GEM safe_yaml (~> 1.0) jekyll-random (0.0.3) jekyll (~> 3.3) - jekyll-redirect-from (0.13.0) + jekyll-redirect-from (0.14.0) jekyll (~> 3.3) jekyll-sass-converter (1.5.2) sass (~> 3.4) @@ -39,11 +39,11 @@ GEM htmlbeautifier htmlcompressor jekyll - jekyll-toc (0.5.1) - nokogiri (~> 1.6) + jekyll-toc (0.6.0) + nokogiri (~> 1.7) jekyll-watch (2.0.0) listen (~> 3.0) - kramdown (1.16.2) + kramdown (1.17.0) liquid (4.0.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -51,18 +51,18 @@ GEM ruby_dep (~> 1.2) mercenary (0.3.6) mini_portile2 (2.3.0) - nokogiri (1.8.2) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) pathutil (0.16.1) forwardable-extended (~> 2.6) - public_suffix (3.0.0) - rb-fsevent (0.10.2) + public_suffix (3.0.2) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) rouge (3.1.1) ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.5) + sass (3.5.7) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -76,7 +76,7 @@ DEPENDENCIES jekyll-redirect-from! jekyll-tidy! jekyll-toc! - public_suffix (= 3.0.0)! + public_suffix (= 3.0.2)! BUNDLED WITH - 1.16.1 + 1.16.3 diff --git a/package.json b/package.json index a1c631230..6d2ec5add 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "gulp-autoprefixer": "^5.0.0", "gulp-rename": "^1.2.2", "gulp-rtlcss": "^1.2.0", - "gulp-sass": "^3.1.0", + "gulp-sass": "^4.0.1", "bootstrap": "^4.1.0", "npm-run-all": "^4.1.2" },