This is an automated email from the ASF dual-hosted git repository.
ntimofeev 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 a44594d Update highlight js
a44594d is described below
commit a44594d55aad5b22bd17b46e710ffdd5b7217a2d
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Wed Mar 25 12:01:39 2020 +0300
Update highlight js
---
src/main/assets/package.json | 2 +-
src/main/assets/scripts/main.js | 3 ++-
src/main/assets/styles/main.scss | 2 +-
src/main/assets/yarn.lock | 8 ++++----
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/assets/package.json b/src/main/assets/package.json
index 96cc713..85ede7d 100644
--- a/src/main/assets/package.json
+++ b/src/main/assets/package.json
@@ -6,7 +6,7 @@
"jquery": "3.4.1",
"bootstrap": "4.3.1",
"popper.js": "1.16.0",
- "highlight.js": "9.16.2",
+ "highlight.js": "9.18.1",
"font-awesome": "4.7.0",
"anchor-js": "4.2.1"
},
diff --git a/src/main/assets/scripts/main.js b/src/main/assets/scripts/main.js
index b32a426..d1ca76a 100644
--- a/src/main/assets/scripts/main.js
+++ b/src/main/assets/scripts/main.js
@@ -56,8 +56,9 @@ function initAnchors() {
}
$(document).ready(function () {
- initHljs();
initAnchors();
initGitHubBadge();
});
+initHljs();
+
diff --git a/src/main/assets/styles/main.scss b/src/main/assets/styles/main.scss
index cf667ad..de24b61 100644
--- a/src/main/assets/styles/main.scss
+++ b/src/main/assets/styles/main.scss
@@ -46,7 +46,7 @@
// Bootstrap v4 bet2
//@import "../node_modules/bootstrap/scss/bootstrap";
// this is for future, when we understand we can exclude
- @import 'bootstrap-optimized';
+@import 'bootstrap-optimized';
// Highlight.js
@import '../node_modules/highlight.js/styles/github.css';
// INNER PAGE
diff --git a/src/main/assets/yarn.lock b/src/main/assets/yarn.lock
index aedef41..cbbf0fe 100644
--- a/src/main/assets/yarn.lock
+++ b/src/main/assets/yarn.lock
@@ -2829,10 +2829,10 @@ hawk@~6.0.2:
hoek "4.x.x"
sntp "2.x.x"
-highlight.js@9.16.2:
- version "9.16.2"
- resolved
"https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.16.2.tgz#68368d039ffe1c6211bcc07e483daf95de3e403e";
- integrity
sha512-feMUrVLZvjy0oC7FVJQcSQRqbBq9kwqnYE4+Kj9ZjbHh3g+BisiPgF49NyQbVLNdrL/qqZr3Ca9yOKwgn2i/tw==
+highlight.js@9.18.1:
+ version "9.18.1"
+ resolved
"https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c";
+ integrity
sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==
hmac-drbg@^1.0.0:
version "1.0.1"
