Skip to content

Commit

Permalink
Changed top level page and added comments to js code
Browse files Browse the repository at this point in the history
  • Loading branch information
lefou committed Dec 5, 2018
1 parent e9d6e00 commit 9964ba0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
5 changes: 4 additions & 1 deletion doc/docs.webpack.config.js
@@ -1,15 +1,18 @@
merge = require("webpack-merge"); merge = require("webpack-merge");
var config = require('./scalajs.webpack.config'); var config = require('./scalajs.webpack.config');
var ExtractTextPlugin = require("extract-text-webpack-plugin"); var ExtractTextPlugin = require("extract-text-webpack-plugin");
var path = require("path"); 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, "../../../../"); var rootDir = path.resolve(__dirname, "../../../../");


module.exports = merge(config, { module.exports = merge(config, {
entry: { entry: {
'blended-bootstrap' : [ path.resolve(rootDir, 'scss/bootstrap/blended.scss') ] 'blended-bootstrap' : [ path.resolve(rootDir, 'scss/bootstrap/blended.scss') ]
}, },
plugins: [ plugins: [
// convert *.scss files to *.css
new ExtractTextPlugin("[name].css") new ExtractTextPlugin("[name].css")
], ],
module: { module: {
Expand Down
5 changes: 5 additions & 0 deletions doc/templates/index.ftl
Expand Up @@ -2,11 +2,16 @@
<#include "menu.ftl"> <#include "menu.ftl">


<div class="container-fluid"> <div class="container-fluid">
<!--
<div class="row"> <div class="row">
<div class="col-md-4"><p>col-1</p></div> <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-2</p></div>
<div class="col-md-4"><p>col-3</p></div> <div class="col-md-4"><p>col-3</p></div>
</div> </div>
-->
<ul>
<li><a href="BUILDING.html">Building</a>
</ul>
</div> </div>


<#include "footer.ftl"> <#include "footer.ftl">
1 change: 1 addition & 0 deletions project/JBake.scala
Expand Up @@ -62,6 +62,7 @@ object JBake extends AutoPlugin {
}, },


jbakeSite := { jbakeSite := {
// Assest from blended docs
val site = jbakeBuild.dependsOn(BlendedDocsJs.project/Compile/fastOptJS/webpack).value val site = jbakeBuild.dependsOn(BlendedDocsJs.project/Compile/fastOptJS/webpack).value


val log = streams.value.log val log = streams.value.log
Expand Down

0 comments on commit 9964ba0

Please sign in to comment.