Permalink
Browse files

Changed top level page and added comments to js code

  • Loading branch information...
lefou committed Dec 5, 2018
1 parent e9d6e00 commit 9964ba0e9474fe9f9ab65ed611d22419e9455bb5
Showing with 10 additions and 1 deletion.
  1. +4 −1 doc/docs.webpack.config.js
  2. +5 −0 doc/templates/index.ftl
  3. +1 −0 project/JBake.scala
@@ -1,15 +1,18 @@
merge = require("webpack-merge");
merge = require("webpack-merge");
var config = require('./scalajs.webpack.config');
var ExtractTextPlugin = require("extract-text-webpack-plugin");
var path = require("path");
// out pwd is `target/scala_2.12/scalajs-bundler/node_modules`
// rootDir should be the project base dir
var rootDir = path.resolve(__dirname, "../../../../");
module.exports = merge(config, {
entry: {
'blended-bootstrap' : [ path.resolve(rootDir, 'scss/bootstrap/blended.scss') ]
},
plugins: [
// convert *.scss files to *.css
new ExtractTextPlugin("[name].css")
],
module: {
@@ -2,11 +2,16 @@
<#include "menu.ftl">
<div class="container-fluid">
<!--
<div class="row">
<div class="col-md-4"><p>col-1</p></div>
<div class="col-md-4"><p>col-2</p></div>
<div class="col-md-4"><p>col-3</p></div>
</div>
-->
<ul>
<li><a href="BUILDING.html">Building</a>
</ul>
</div>
<#include "footer.ftl">
@@ -62,6 +62,7 @@ object JBake extends AutoPlugin {
},
jbakeSite := {
// Assest from blended docs
val site = jbakeBuild.dependsOn(BlendedDocsJs.project/Compile/fastOptJS/webpack).value
val log = streams.value.log

0 comments on commit 9964ba0

Please sign in to comment.