Commit 36f4fe67 authored by Evan Chou's avatar Evan Chou
Browse files

add missing files from merge

parent 4a0a7071
......@@ -68,6 +68,10 @@
"@steem/crypto-session": "git+https://github.com/steemit/crypto-session.git#83a90b319ce5bc6a70362d52a15a815de7e729bb",
"assert": "1.4.1",
"autoprefixer": "^9.6.1",
"babel-eslint": "10.1.0",
"babel-loader": "^8.2.0",
"babel-plugin-react-intl": "2.3.1",
"babel-plugin-transform-inline-environment-variables": "0.2.0",
"bigi": "1.4.2",
"blocked": "1.2.1",
"blueimp-file-upload": "9.22.1",
......@@ -87,15 +91,12 @@
"dsteem": "0.11.3",
"ecurve": "1.0.5",
"estraverse-fb": "1.3.2",
"file-loader": "0.11.2",
"foundation-sites": "git+https://github.com/steemit/foundation-sites.git#e8e32c715bbc4c822b80b555345f61337269ca78",
"highcharts": "6.1.0",
"hivesigner": "3.2.1",
"humanize-number": "0.0.2",
"imports-loader": "0.7.1",
"intl": "1.2.5",
"iso": "5.2.0",
"json-loader": "0.5.7",
"koa": "1.4.1",
"koa-body": "1.6.0",
"koa-compressor": "1.0.3",
......@@ -126,8 +127,6 @@
"os": "0.1.1",
"picturefill": "3.0.2",
"postcss": "^8.1.6",
"postcss-loader": "^4.0.4",
"raw-loader": "0.5.1",
"react": "15.6.2",
"react-ab-test": "1.7.0",
"react-addons-pure-render-mixin": "15.4.2",
......@@ -155,7 +154,7 @@
"redux-saga": "0.16.0",
"remarkable": "1.7.1",
"sanitize-html": "1.14.1",
"sass-loader": "6.0.6",
"sass": "^1.29.0",
"secure-random": "1.1.1",
"sendgrid": "4.10.0",
"sequelize": "5.15.1",
......@@ -165,7 +164,6 @@
"statsd-client": "0.4.2",
"steemscript": "1.1.0",
"store": "1.3.20",
"style-loader": "0.18.2",
"svg-inline-loader": "0.8.0",
"svg-inline-react": "1.0.3",
"svgo-loader": "1.2.1",
......@@ -173,7 +171,6 @@
"uncontrollable": "3.3.1",
"underscore.string": "3.3.5",
"universal-cookie": "^4.0.4",
"url-loader": "0.6.2",
"web-push": "3.2.3",
"webpack-isomorphic-tools": "3.0.5",
"websocket": "1.0.24",
......@@ -203,7 +200,10 @@
"@babel/plugin-transform-runtime": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"babel-eslint": "10.1.0",
"babel-loader": "^8.2.0",
"co-supertest": "0.0.10",
"css-loader": "5.0.1",
"dev-ip": "1.0.1",
"enzyme": "3.3.0",
"enzyme-adapter-react-15": "1.0.5",
......@@ -214,8 +214,10 @@
"eslint-plugin-import": "2.20.2",
"eslint-plugin-jsx-a11y": "6.2.3",
"eslint-plugin-react": "7.19.0",
"file-loader": "6.2.0",
"git-rev-sync": "1.9.1",
"husky": "0.14.3",
"imports-loader": "1.2.0",
"jest": "23",
"jsdom": "9.12.0",
"koa-webpack-dev-middleware": "1.4.6",
......@@ -223,7 +225,9 @@
"lint-staged": "6.0.0",
"mock-local-storage": "1.0.5",
"node-watch": "0.5.5",
"postcss-loader": "^4.0.4",
"prettier": "2.0.5",
"raw-loader": "4.0.2",
"react-addons-perf": "15.4.2",
"react-addons-test-utils": "15.4.2",
"react-test-renderer": "15.6.2",
......@@ -232,8 +236,11 @@
"redux-devtools-extension": "2.13.5",
"redux-mock-store": "1.5.1",
"regenerator-runtime": "0.11.1",
"sass-loader": "10.0.5",
"sinon": "1.17.7",
"style-loader": "2.0.0",
"supertest": "1.2.0",
"url-loader": "4.1.1",
"webpack": "4.x.x",
"webpack-bundle-analyzer": "^4.1.0",
"webpack-cli": "^4.2.0",
......
......@@ -11,14 +11,14 @@
.SignUp--reddit-button {
background-color: #ef4623;
&:hover {
background-color: scale-color(#ef4623, -6%);
background-color: scale-color(#ef4623, $lightness: -6%);
}
}
.SignUp--fb-button {
background-color: #3b5998;
&:hover {
background-color: scale-color(#3b5998, -6%);
background-color: scale-color(#3b5998, $lightness: -6%);
}
}
......
......@@ -37,6 +37,7 @@ const scss_loaders = [
loader: 'css-loader',
options: {
importLoaders: 1,
url: false,
},
},
postcss_loader,
......@@ -70,7 +71,6 @@ module.exports = {
module: {
rules: [
{test: /\.(jpe?g|png)/, use: 'url-loader?limit=4096'},
{test: /\.json$/, use: 'json-loader'},
{test: /\.js$|\.jsx$/, exclude: /node_modules/, use: 'babel-loader'},
{test: /\.svg$/, use: 'svg-inline-loader'},
{
......
......@@ -12,28 +12,6 @@ module.exports = {
VERSION: JSON.stringify(git.long())
}
}),
new webpack.optimize.UglifyJsPlugin({
compress: {
warnings: false,
screw_ie8: true,
sequences: true,
dead_code: true,
drop_debugger: true,
comparisons: true,
conditionals: true,
evaluate: true,
booleans: true,
loops: true,
unused: true,
hoist_funs: true,
if_return: true,
join_vars: true,
cascade: true
},
output: {
comments: false
}
}),
...baseConfig.plugins,
// Fix window.onerror
// See https://github.com/webpack/webpack/issues/5681#issuecomment-345861733
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment