diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index a96356f..502667f 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,12 +2,16 @@ - {{ partial "title-item.html" . }}{{ .Site.Title }} {{ partial "style.html" "scss/style.scss" }} {{ partial "style.html" "css/highlight.css" }} {{ partial "style.html" "css/font-awesome.css" }} + + {{ partial "title-item.html" . }}{{ .Site.Title }} {{ block "main" . }}{{ end }} + + {{ partial "script_async.html" "js/bootstrap.min.js" }} + {{ block "scripts_extra" . }}{{ end }} diff --git a/layouts/partials/script_async.html b/layouts/partials/script_async.html new file mode 100644 index 0000000..b3b273d --- /dev/null +++ b/layouts/partials/script_async.html @@ -0,0 +1,9 @@ +{{ $script := resources.Get . }} + +{{ if in . "min" }} + {{ $script = $script | minify | fingerprint }} +{{ else }} + {{ $script = $script | js.Build (dict "minify" true) | fingerprint }} +{{ end }} + + diff --git a/scripts/build.sh b/scripts/build.sh index 1d41ca3..2a64b2e 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -11,6 +11,7 @@ mkdir -p "$STATIC_BUILD/img" mkdir -p "$STATIC_BUILD/js" #cp -r "$STATIC_SRC/js/*" "$STATIC_BUILD/js" +cp $BASEDIR/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js $STATIC_BUILD/js/bootstrap.min.js mkdir -p "$STATIC_BUILD/css" #cp -r "$STATIC_SRC/css/*" "$STATIC_BUILD/css"