Skip to content

Commit dd1f187

Browse files
authored
Merge pull request #128 from knoxfighter/Feature/general_mod_fixes
another npm update && fix of red incompatible background
2 parents 890bd00 + 7e8a6d1 commit dd1f187

File tree

3 files changed

+26
-20
lines changed

3 files changed

+26
-20
lines changed

package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"watch-poll": "npm run watch -- --watch-poll",
1111
"build": "npm run production",
1212
"prod": "npm run production",
13-
"production": "webpack --config=webpack.config.js --mode=production --hide-modules",
13+
"production": "webpack --config=webpack.config.js --mode=production --hide-modules --progress",
1414
"test": "echo \"Error: no test specified\" && exit 1"
1515
},
1616
"repository": {
@@ -24,35 +24,35 @@
2424
},
2525
"homepage": "https://github.com/mroote/factorio-server-manager#readme",
2626
"devDependencies": {
27-
"@babel/core": "^7.0.0",
28-
"@babel/preset-env": "^7.0.0",
27+
"@babel/core": "^7.2.2",
28+
"@babel/preset-env": "^7.2.3",
2929
"@babel/preset-react": "^7.0.0",
30-
"@fortawesome/fontawesome-free": "^5.2.0",
30+
"@fortawesome/fontawesome-free": "^5.6.3",
3131
"admin-lte": "^3.0.0-alpha.2",
32-
"babel-loader": "^8.0.0",
33-
"bootstrap": "^4.1.3",
34-
"bootstrap-fileinput": "^4.4.9",
32+
"babel-loader": "^8.0.5",
33+
"bootstrap": "^4.2.1",
34+
"bootstrap-fileinput": "^4.5.2",
3535
"classnames": "^2.2.6",
36-
"css-loader": "^1.0.0",
37-
"file-loader": "^2.0.0",
36+
"css-loader": "^2.1.0",
37+
"file-loader": "^3.0.1",
3838
"jquery": "^3.3.1",
3939
"locks": "^0.2.2",
40-
"mini-css-extract-plugin": "^0.4.1",
41-
"node-sass": "^4.9.3",
40+
"mini-css-extract-plugin": "^0.5.0",
41+
"node-sass": "^4.11.0",
4242
"optimize-css-assets-webpack-plugin": "^5.0.1",
4343
"prop-types": "^15.6.2",
44-
"react": "^16.4.2",
45-
"react-dom": "^16.4.2",
44+
"react": "^16.7.0",
45+
"react-dom": "^16.7.0",
4646
"react-native-listener": "^1.0.2",
4747
"react-router": "^4.3.1",
4848
"react-router-dom": "^4.3.1",
49-
"resolve-url-loader": "^2.3.0",
49+
"resolve-url-loader": "^3.0.0",
5050
"sass-loader": "^7.1.0",
51-
"semver": "^5.5.0",
52-
"sweetalert2": "^7.26.11",
51+
"semver": "^5.6.0",
52+
"sweetalert2": "^7.33.1",
5353
"sweetalert2-react-content": "^1.0.1",
54-
"webpack": "^4.16.5",
55-
"webpack-cli": "^3.1.0",
56-
"webpack-fix-style-only-entries": "0.0.3"
54+
"webpack": "^4.28.4",
55+
"webpack-cli": "^3.2.1",
56+
"webpack-fix-style-only-entries": "0.1.0"
5757
}
5858
}

ui/scss/customizations/sweetalert.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@
2121
height: 2.625em;
2222
padding: 0.75em;
2323
}
24+
25+
table tr.incompatible {
26+
background: rgba(255, 68, 68, 0.21);
27+
}
28+
table tr:nth-child(even).incompatible {
29+
background: rgba(255, 0, 0, 0.31);
30+
}
2431
}
2532

2633
.swal2-actions.swal2-loading {

webpack.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ module.exports = (env, argv) => {
6161
loader: "css-loader",
6262
options: {
6363
"sourceMap": !isProduction,
64-
"minimize": isProduction
6564
}
6665
},
6766
"resolve-url-loader",

0 commit comments

Comments
 (0)