This is an automated email from the ASF dual-hosted git repository. abulatski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne-website.git
The following commit(s) were added to refs/heads/master by this push: new 6a470fe Update main dependencies 6a470fe is described below commit 6a470fe87ed0ef00e6db1b4c524173c82e985d21 Author: Arseni Bulatski <ancars...@gmail.com> AuthorDate: Tue Mar 26 17:53:08 2019 +0300 Update main dependencies --- src/main/assets/package.json | 8 ++++---- src/main/assets/styles/_variables.scss | 22 +++++++++++++--------- src/main/assets/yarn.lock | 24 ++++++++++++------------ 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/main/assets/package.json b/src/main/assets/package.json index 49bbb6d..bacc1a9 100644 --- a/src/main/assets/package.json +++ b/src/main/assets/package.json @@ -3,10 +3,10 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "jquery": "3.2.1", - "bootstrap": "4.0.0-beta.2", - "popper.js": "1.12.9", - "highlight.js": "9.12.0", + "jquery": "3.3.1", + "bootstrap": "4.3.1", + "popper.js": "1.14.7", + "highlight.js": "9.15.6", "font-awesome": "4.7.0" }, "devDependencies" : { diff --git a/src/main/assets/styles/_variables.scss b/src/main/assets/styles/_variables.scss index 3b8586c..3f2d70e 100644 --- a/src/main/assets/styles/_variables.scss +++ b/src/main/assets/styles/_variables.scss @@ -129,15 +129,19 @@ $enable-print-styles: true !default; // You can add more entries to the $spacers map, should you need more variation. $spacer: 1rem !default; -$spacers: ( - 0: 0, - 1l4: ($spacer * .25), - 1l2: ($spacer * .5), - 1: $spacer, - 3l2: $spacer * 1.5, - 2: ($spacer * 2), - 3: ($spacer * 3), - 5: ($spacer * 5) +$spacers: () !default; +// stylelint-disable-next-line scss/dollar-variable-default +$spacers: map-merge( + ( + 0: 0, + 1l2: ($spacer * .5), + 1: $spacer, + 3l2: ($spacer * 1.5), + 2: ($spacer * 2), + 3: ($spacer * 3), + 5: ($spacer * 5) + ), + $spacers ); // This variable affects the `.h-*` and `.w-*` classes. diff --git a/src/main/assets/yarn.lock b/src/main/assets/yarn.lock index 1419ca4..93b2ef2 100644 --- a/src/main/assets/yarn.lock +++ b/src/main/assets/yarn.lock @@ -389,9 +389,9 @@ boom@5.x.x: dependencies: hoek "4.x.x" -bootstrap@4.0.0-beta.2: - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0-beta.2.tgz#4d67d2aa2219f062cd90bc1247e6747b9e8fd051" +bootstrap@4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac" boxen@^1.2.1: version "1.3.0" @@ -2471,9 +2471,9 @@ hawk@~6.0.2: hoek "4.x.x" sntp "2.x.x" -highlight.js@9.12.0: - version "9.12.0" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e" +highlight.js@9.15.6: + version "9.15.6" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.6.tgz#72d4d8d779ec066af9a17cb14360c3def0aa57c4" hmac-drbg@^1.0.0: version "1.0.1" @@ -2959,9 +2959,9 @@ jpegtran-bin@^3.0.0: bin-wrapper "^3.0.0" logalot "^2.0.0" -jquery@3.2.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" js-base64@^2.1.8: version "2.3.2" @@ -4151,9 +4151,9 @@ plur@^2.1.2: dependencies: irregular-plurals "^1.0.0" -popper.js@1.12.9: - version "1.12.9" - resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.12.9.tgz#0dfbc2dff96c451bb332edcfcfaaf566d331d5b3" +popper.js@1.14.7: + version "1.14.7" + resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.14.7.tgz#e31ec06cfac6a97a53280c3e55e4e0c860e7738e" portscanner@2.1.1: version "2.1.1"