1st request #1

Merged
dtomlinson merged 70 commits from develop into master 2020-06-04 16:46:03 +00:00
4 changed files with 8 additions and 7 deletions
Showing only changes of commit 579771d53f - Show all commits

BIN
.DS_Store vendored

Binary file not shown.

BIN
blog/.DS_Store vendored

Binary file not shown.

View File

@@ -1,6 +1,7 @@
Tasks:
Move all the scss into the new theme.
Move all the scss into the new theme. @done (5/31/2020, 3:26:30 AM)
☐ Move the image shortcode into the new theme.
☐ Recreate the fonts scss file and apply it.
☐ Download and create the monospace font.
☐ Remove any unneccessary additions from old theme (custom css, prism etc).
☐ Create a gulpfile to build the search index.

View File

@@ -36,7 +36,7 @@ You should create the file structure for your project.
TODO: Link to the webpack-filestructure note in Trilium.
We will create `./src/js` and `./src/scss` folders. We create a `./dist` folder for webpacks output and we create a `./static` folder for anything that needs to be outside the bundle.
We will create `./src/js` and `./src/scss` folders. We create a `./static/dist` folder for webpacks output. The `./static` folder can also be used for files that go outside the bundle.
Inside `./src/js` we will create an `App.js`. Inside `./src` we will create a `main.js`.
@@ -76,11 +76,11 @@ module.exports = {
devtool: "source-map",
entry: path.resolve(__dirname, "src/main.js"),
output: {
path: path.resolve(__dirname, "dist"),
path: path.resolve(__dirname, "static/dist"),
},
plugins: [
new CleanWebpackPlugin({
cleanAfterEveryBuildPatterns: ["dist/*"],
cleanAfterEveryBuildPatterns: ["static/dist/*"],
}),
],
};
@@ -102,7 +102,7 @@ module.exports = {
devtool: "source-map",
entry: path.resolve(__dirname, "src/main.js"),
output: {
path: path.resolve(__dirname, "dist"),
path: path.resolve(__dirname, "static/dist"),
},
module: {
rules: [
@@ -115,7 +115,7 @@ module.exports = {
},
plugins: [
new CleanWebpackPlugin({
cleanAfterEveryBuildPatterns: ["dist/*"],
cleanAfterEveryBuildPatterns: ["static/dist/*"],
}),
new AssetsPlugin({
filename: "assets.json",
@@ -154,7 +154,7 @@ module.exports = merge(common, {
output: {
filename: "[name].[contenthash].min.js",
chunkFilename: "[id].[name].[contenthash].min.js",
publicPath: "dist/",
publicPath: "/dist/",
},
});
```