diff --git a/package-lock.json b/package-lock.json index 489d2b53..bc6c265d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8739,12 +8739,6 @@ } } }, - "webpack-shell-plugin": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/webpack-shell-plugin/-/webpack-shell-plugin-0.5.0.tgz", - "integrity": "sha1-Kbih2A3erg3bEOcpZn9yhlPCx0I=", - "dev": true - }, "webpack-sources": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz", diff --git a/package.json b/package.json index 0e027d12..06641b88 100644 --- a/package.json +++ b/package.json @@ -21,11 +21,10 @@ "uglifyjs-webpack-plugin": "^1.0.0-rc.0", "web-ext": "^1.8.1", "web-ext-types": "github:michael-zapata/web-ext-types", - "webpack": "^3.8.1", - "webpack-shell-plugin": "^0.5.0" + "webpack": "^3.8.1" }, "scripts": { - "build": "webpack", + "build": "scripts/build.sh", "watch": "chokidar src scripts --initial --silent -i 'src/excmds_{background,content}.ts' -i 'src/static/docs' -c 'webpack --display errors-only'", "clean": "rm -rf build generated", "test": "npm run build && jest --silent", diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100755 index 00000000..fd01fa89 --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +PATH=$(npm bin):"$PATH" +export PATH + +mkdir -p generated/static +scripts/excmds_macros.py +scripts/newtab.md.sh +scripts/make_docs.sh & + +webpack & + +wait diff --git a/src/static/newtab.css b/src/static/newtab.css index b38804f0..2c2a6e5d 100644 --- a/src/static/newtab.css +++ b/src/static/newtab.css @@ -33,5 +33,9 @@ code { } img { - max-width: 100% + max-width: 100%; + display: block; + margin-left: auto; + margin-right: auto; + padding-top: .5em; } diff --git a/src/static/newtab.md b/src/static/newtab.md index d5cdf6d1..865a711b 100644 --- a/src/static/newtab.md +++ b/src/static/newtab.md @@ -1,3 +1,5 @@ +![Tridactyl logo](logo/Tridactyl_100px.png) + # Tridactyl new tab page Tridactyl overrides your newtab page because it cannot insert its content script on the default about:newtab. Without the content script, our shortcuts won't work, even if you're just passing through the page. @@ -38,5 +40,3 @@ If you want a more fully-featured vimperator-alike, your best option is Firefox \[2]: https://github.com/cmcaine/tridactyl/blob/master/src/static/userChrome-minimal.css
\[3]: https://www.mozilla.org/en-US/firefox/organizations/
- -![Tridactyl logo](logo/Tridactyl_1024px.png) diff --git a/webpack.config.js b/webpack.config.js index 8e1d939c..8f30c93f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,6 +1,6 @@ const UglifyJSPlugin = require('uglifyjs-webpack-plugin') const CopyWebPackPlugin = require('copy-webpack-plugin') -const WebpackShellPlugin = require('webpack-shell-plugin') +// const WebpackShellPlugin = require('webpack-shell-plugin') module.exports = { entry: { @@ -37,15 +37,15 @@ module.exports = { // ecma: 8 // } // }), - new WebpackShellPlugin({onBuildStart: [ - 'mkdir -p generated/static', - 'scripts/excmds_macros.py', - 'scripts/newtab.md.sh', - 'scripts/make_docs.sh', - ]}), + // new WebpackShellPlugin({onBuildStart: [ + // 'mkdir -p generated/static', + // 'scripts/excmds_macros.py', + // 'scripts/newtab.md.sh', + // 'scripts/make_docs.sh', + // ]}), new CopyWebPackPlugin([ { from: "src/manifest.json" }, - { from: "src/static", to: "static" }, + { from: "src/static", to: "static", ignore: ['*.psd', '*1024px.png'] }, { from: "generated/static", to: "static" }, ]), ]