Skip to content

Updated all dependencies #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated all dependencies #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/site.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ jobs:
- name: Setup Hugo...
uses: peaceiris/actions-hugo@v2
with:
hugo-version: '0.67.1'
hugo-version: '0.95.0'

- name: Set up JDK 11...
uses: actions/setup-java@v1
with:
java-version: 11

- name: Set up NodeJS 12...
- name: Set up NodeJS 16...
uses: actions/setup-node@v2
with:
node-version: '12'
node-version: '16'

- name: Retrieve mvn repo cache...
uses: actions/cache@v2
Expand Down
56 changes: 28 additions & 28 deletions app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,43 +4,43 @@
"main": "app.ts",
"license": "Apache-2.0",
"devDependencies": {
"@types/anchor-js": "^4.2.0",
"@types/highlight.js": "9.12.3",
"@types/jquery": "3.3.33",
"@types/anchor-js": "^4.2.1",
"@types/highlight.js": "9.12.2",
"@types/jquery": "3.5.14",
"@types/modernizr": "3.5.3",
"@types/slick-carousel": "1.6.34",
"@types/youtube": "0.0.38",
"autoprefixer": "9.7.4",
"css-loader": "3.4.2",
"@types/slick-carousel": "1.6.37",
"@types/youtube": "0.0.46",
"autoprefixer": "10.4.4",
"css-loader": "6.7.1",
"exports-loader": "^0.7.0",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"file-loader": "5.1.0",
"html-webpack-plugin": "3.2.0",
"postcss-loader": "3.0.0",
"mini-css-extract-plugin": "^2.6.0",
"file-loader": "6.2.0",
"html-webpack-plugin": "5.5.0",
"postcss-loader": "6.2.1",
"rimraf": "3.0.2",
"sass": "1.26.3",
"sass-loader": "8.0.2",
"style-loader": "1.1.3",
"ts-loader": "6.2.1",
"typescript": "3.8.3",
"url-loader": "3.0.0",
"webpack": "4.42.0",
"webpack-cli": "^3.3.11"
"sass": "1.49.9",
"sass-loader": "12.6.0",
"style-loader": "3.3.1",
"ts-loader": "9.2.8",
"typescript": "4.6.2",
"url-loader": "4.1.1",
"webpack": "5.70.0",
"webpack-cli": "^4.9.2"
},
"dependencies": {
"@fortawesome/fontawesome-free": "5.12.1",
"anchor-js": "^4.2.2",
"bootstrap": "4.4.1",
"clipboard": "^2.0.6",
"highlight.js": "9.18.1",
"jquery": "3.4.1",
"popper.js": "^1.16.0",
"@fortawesome/fontawesome-free": "6.1.0",
"anchor-js": "^4.3.1",
"bootstrap": "4.6.1",
"clipboard": "^2.0.10",
"highlight.js": "11.5.0",
"jquery": "3.6.0",
"popper.js": "^1.16.1",
"roboto-fontface": "0.10.0",
"slick-carousel": "1.8.1"
},
"scripts": {
"prebuild": "yarn install && rimraf ../themes/bootique-theme/static/assets/",
"build": "webpack -p --env.NODE_ENV production --env.SOURCE_MAP source-map",
"build:watch": "webpack --watch --env.NODE_ENV development --env.SOURCE_MAP eval-source-map"
"build": "webpack --mode=production --devtool=source-map",
"build:watch": "webpack --watch --mode=development --devtool=eval-source-map"
}
}
42 changes: 17 additions & 25 deletions app/scripts/app.hljs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,23 @@
import "highlight.js/styles/a11y-light.css";
import * as hljs from "highlight.js/lib/highlight.js";
import * as xml from "highlight.js/lib/languages/xml.js";
import * as bash from "highlight.js/lib/languages/bash.js";
import * as markdown from "highlight.js/lib/languages/markdown.js";
import * as gradle from "highlight.js/lib/languages/gradle.js";
import * as groovy from "highlight.js/lib/languages/groovy.js";
import * as java from "highlight.js/lib/languages/java.js";
import * as javascript from "highlight.js/lib/languages/javascript.js";
import * as json from "highlight.js/lib/languages/json.js";
import * as kotlin from "highlight.js/lib/languages/kotlin.js";
import * as sql from "highlight.js/lib/languages/sql.js";
import * as yaml from "highlight.js/lib/languages/yaml.js";
import hljs from "highlight.js/lib/core";
import * as ClipboardJS from "clipboard/dist/clipboard";

export function applyHighlightJs() {
hljs.registerLanguage("xml", xml);
hljs.registerLanguage("bash", bash);
hljs.registerLanguage("markdown", markdown);
hljs.registerLanguage("gradle", gradle);
hljs.registerLanguage("groovy", groovy);
hljs.registerLanguage("java", java);
hljs.registerLanguage("javascript", javascript);
hljs.registerLanguage("json", json);
hljs.registerLanguage("kotlin", kotlin);
hljs.registerLanguage("sql", sql);
hljs.registerLanguage("yaml", yaml);
hljs.initHighlightingOnLoad();
hljs.registerLanguage('xml', require('highlight.js/lib/languages/xml'));
hljs.registerLanguage("bash", require('highlight.js/lib/languages/bash'));
hljs.registerLanguage("markdown", require('highlight.js/lib/languages/markdown'));
hljs.registerLanguage("gradle", require('highlight.js/lib/languages/gradle'));
hljs.registerLanguage("groovy", require('highlight.js/lib/languages/groovy'));
hljs.registerLanguage("java", require('highlight.js/lib/languages/java'));
hljs.registerLanguage("javascript", require('highlight.js/lib/languages/javascript'));
hljs.registerLanguage("json", require('highlight.js/lib/languages/json'));
hljs.registerLanguage("kotlin", require('highlight.js/lib/languages/kotlin'));
hljs.registerLanguage("sql", require('highlight.js/lib/languages/sql'));
hljs.registerLanguage("yaml", require('highlight.js/lib/languages/yaml'));
hljs.configure({
ignoreUnescapedHTML: true
});
hljs.highlightAll();
}

export function applyCopyHighlightJs() {
Expand Down Expand Up @@ -55,4 +47,4 @@ export function applyCopyHighlightJs() {
pre.parentNode.insertBefore(button, pre);
}
});
}
}
3 changes: 2 additions & 1 deletion app/styles/_docbook.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// DOCBOOK
// Vars (global)
@use "sass:math";
@import "~bootstrap/scss/functions";
@import "variables";

Expand Down Expand Up @@ -76,7 +77,7 @@
max-height: calc(100vh - .5rem);
}

padding-left: $grid-gutter-width / 2;
padding-left: math.div($grid-gutter-width, 2);
overflow-y: auto;
overflow-x: hidden;
left: 0;
Expand Down
11 changes: 6 additions & 5 deletions app/styles/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs.


@use "sass:math";
//
// Color system
//
Expand Down Expand Up @@ -266,7 +267,7 @@ $h4-font-size: $font-size-base * 1.5 !default;
$h5-font-size: $font-size-base * 1.1 !default; // 1.25
$h6-font-size: $font-size-base !default;

$headings-margin-bottom: ($spacer / 2) !default;
$headings-margin-bottom: math.div($spacer, 2) !default;
$headings-font-family: inherit !default;
$headings-font-weight: 500 !default;
$headings-line-height: 1.2 !default;
Expand Down Expand Up @@ -628,11 +629,11 @@ $nav-pills-link-active-color: $component-active-color !default;
$nav-pills-link-active-bg: $component-active-bg !default;

$nav-divider-color: $gray-200 !default;
$nav-divider-margin-y: ($spacer / 2) !default;
$nav-divider-margin-y: math.div($spacer, 2) !default;

// Navbar

$navbar-padding-y: ($spacer / 2) !default;
$navbar-padding-y: math.div($spacer, 2) !default;
$navbar-padding-x: $spacer !default;

$navbar-nav-link-padding-x: .5rem !default;
Expand All @@ -641,7 +642,7 @@ $navbar-brand-font-size: $font-size-lg !default;
// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
$nav-link-height: ($font-size-base * $line-height-base + $nav-link-padding-y * 2) !default;
$navbar-brand-height: $navbar-brand-font-size * $line-height-base !default;
$navbar-brand-padding-y: ($nav-link-height - $navbar-brand-height) / 2 !default;
$navbar-brand-padding-y: math.div($nav-link-height - $navbar-brand-height, 2) !default;

$navbar-toggler-padding-y: .25rem !default;
$navbar-toggler-padding-x: .75rem !default;
Expand Down Expand Up @@ -712,7 +713,7 @@ $card-bg: $white !default;

$card-img-overlay-padding: 1.25rem !default;

$card-group-margin: ($grid-gutter-width / 2) !default;
$card-group-margin: math.div($grid-gutter-width, 2) !default;
$card-deck-margin: $card-group-margin !default;

$card-columns-count: 3 !default;
Expand Down
Loading