diff --git a/Gemfile.lock b/Gemfile.lock index 0b0cf22..54fe54b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,83 +1,93 @@ GEM remote: https://rubygems.org/ specs: - activesupport (5.1.4) + activesupport (5.2.0) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) colorator (1.1.0) - colored (1.2) + colorize (0.8.1) concurrent-ruby (1.0.5) - ethon (0.10.1) + em-websocket (0.5.1) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + ethon (0.11.0) ffi (>= 1.3.0) - ffi (1.9.18) + eventmachine (1.2.5) + ffi (1.9.23) forwardable-extended (2.6.0) - html-proofer (3.7.2) + html-proofer (3.8.0) activesupport (>= 4.2, < 6.0) addressable (~> 2.3) - colored (~> 1.2) + colorize (~> 0.8) mercenary (~> 0.3.2) - nokogiri (~> 1.7) + nokogiri (~> 1.8.1) parallel (~> 1.3) - typhoeus (~> 0.7) + typhoeus (~> 1.3) yell (~> 2.0) - i18n (0.8.6) - jekyll (3.5.2) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.7.3) addressable (~> 2.4) colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) + jekyll-watch (~> 2.0) + kramdown (~> 1.14) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (~> 1.7) + rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-feed (0.9.2) + jekyll-feed (0.9.3) jekyll (~> 3.3) - jekyll-redirect-from (0.12.1) + jekyll-redirect-from (0.13.0) jekyll (~> 3.3) - jekyll-sass-converter (1.5.0) + jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.3.0) + jekyll-seo-tag (2.4.0) jekyll (~> 3.3) - jekyll-sitemap (1.1.1) + jekyll-sitemap (1.2.0) jekyll (~> 3.3) - jekyll-toc (0.3.0) + jekyll-toc (0.5.2) nokogiri (~> 1.6) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - kramdown (1.15.0) + jekyll-watch (2.0.0) + listen (~> 3.0) + kramdown (1.16.2) liquid (4.0.0) - listen (3.0.8) + listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) mercenary (0.3.6) mini_portile2 (2.3.0) - minitest (5.10.3) - nokogiri (1.8.1) + minitest (5.11.3) + nokogiri (1.8.2) mini_portile2 (~> 2.3.0) - parallel (1.12.0) - pathutil (0.14.0) + parallel (1.12.1) + 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 (1.11.1) + rouge (3.1.1) + ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.1) + sass (3.5.6) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) thread_safe (0.3.6) - typhoeus (0.8.0) - ethon (>= 0.8.0) - tzinfo (1.2.3) + typhoeus (1.3.0) + ethon (>= 0.9.0) + tzinfo (1.2.5) thread_safe (~> 0.1) yell (2.0.7) diff --git a/Makefile b/Makefile index d227ee4..eccedbd 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,8 @@ check: _site install: $(PROJECT_DEPS) - $(BUNDLE) install --path vendor/bundler + #$(BUNDLE) install --path vendor/bundler + $(BUNDLE) install $(YARN) install update: $(PROJECT_DEPS) @@ -33,7 +34,7 @@ include-yarn-deps: cp node_modules/font-awesome/css/font-awesome.min.css $(VENDOR_DIR) cp -r node_modules/font-awesome/fonts $(ASSETS_DIR) cp node_modules/jquery/dist/jquery.min.js $(VENDOR_DIR) - cp node_modules/tether/dist/js/tether.min.js $(VENDOR_DIR) + cp node_modules/popper.js/dist/umd/popper.min.js $(VENDOR_DIR) cp node_modules/bootstrap/dist/js/bootstrap.min.js $(VENDOR_DIR) build: clean install include-yarn-deps diff --git a/_layouts/default.html b/_layouts/default.html index 36a30df..60b8845 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -83,7 +83,7 @@

{{site.data.locales[page.lang].site.nav_menu}}

- + diff --git a/assets/main.scss b/assets/main.scss index 17c003d..e42a3c7 100644 --- a/assets/main.scss +++ b/assets/main.scss @@ -1,9 +1,10 @@ --- --- +@import "bootstrap/scss/functions"; @import "variables"; @import "bootstrap/scss/bootstrap"; .content { font-size: $custom-font-size; -} \ No newline at end of file +} diff --git a/package.json b/package.json index 8f15d92..98747ef 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,9 @@ "author": "Marcelo Canina ", "license": "MIT", "dependencies": { - "bootstrap": "4.0.0-alpha.6", - "font-awesome": "^4.7.0" + "bootstrap": "4.0.0", + "font-awesome": "^4.7.0", + "jquery": "^3.3.1", + "popper.js": "^1.14.3" } } diff --git a/yarn.lock b/yarn.lock index 4846558..0a5599a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,21 +2,18 @@ # yarn lockfile v1 -bootstrap@4.0.0-alpha.6: - version "4.0.0-alpha.6" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz#4f54dd33ac0deac3b28407bc2df7ec608869c9c8" - dependencies: - jquery ">=1.9.1" - tether "^1.4.0" +bootstrap@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0.tgz#ceb03842c145fcc1b9b4e15da2a05656ba68469a" font-awesome@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" -jquery@>=1.9.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787" +jquery@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" -tether@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.0.tgz#0f9fa171f75bf58485d8149e94799d7ae74d1c1a" +popper.js@^1.14.3: + version "1.14.3" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.3.tgz#1438f98d046acf7b4d78cd502bf418ac64d4f095"