Skip to content

Commit 8fad591

Browse files
committed
htdocs: minor tweaks.
Update the tools to their latest versions.
1 parent 03747c0 commit 8fad591

6 files changed

Lines changed: 15 additions & 20 deletions

File tree

‎Readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ Getting started
55
* Install the node.js dependencies: `npm install`
66
* Run `node make` or `node make minify`
77

8-
You can run `npm run check` or `npm run lint` to run [JSHint](https://github.com/jshint/jshint)
8+
You can run `npm run lint` to run [JSHint](https://github.com/jshint/jshint)
99
and [csslint](https://github.com/stubbornella/csslint) for our files.

‎make.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
require("shelljs/make");
2323
var fs = require("fs"),
24-
cleanCSS = require("clean-css"),
24+
CleanCSS = require("clean-css"),
2525
UglifyJS = require("uglify-js"),
2626
rootDir = __dirname + "/"; // absolute path to project's root
2727

@@ -34,18 +34,17 @@
3434
echo("### Minifying css files...");
3535

3636
// pack.css
37-
3837
var inCss = cat(["site/css/normalize.css",
3938
"site/css/all.css",
4039
"site/css/demo.css"
4140
]);
4241

43-
var packCss = cleanCSS.process(inCss, {
44-
removeEmpty: true,
45-
keepSpecialComments: 0
46-
});
42+
var minifier = new CleanCSS({
43+
keepSpecialComments: 0,
44+
selectorsMergeMode: "ie8"
45+
});
4746

48-
fs.writeFileSync("site/css/pack.css", packCss, "utf8");
47+
fs.writeFileSync("site/css/pack.css", minifier.minify(inCss), "utf8");
4948

5049
echo();
5150
echo("### Finished site/css/pack.css.");

‎package.json‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cppcheck-web",
3-
"version": "0.1.4",
3+
"version": "0.2.0",
44
"author": "XhmikosR (https://github.com/XhmikosR)",
55
"description": "The dependencies to build cppcheck's website",
66
"homepage": "https://github.com/danmar/cppcheck",
@@ -13,17 +13,15 @@
1313
},
1414
"license": "GPLv3",
1515
"main": "make.js",
16-
"readmeFilename": "Readme.md",
1716
"scripts": {
18-
"check": "node run-tests",
1917
"lint": "node run-tests"
2018
},
2119
"dependencies": {
22-
"clean-css": "~1.1.1",
20+
"clean-css": "~2.0.0",
2321
"csslint": "~0.9.10",
24-
"jshint": "~2.1.11",
22+
"jshint": "~2.3.0",
2523
"shelljs": "~0.2.6",
26-
"uglify-js": "~2.4.0"
24+
"uglify-js": "~2.4.2"
2725
},
2826
"jshintConfig": {
2927
"bitwise": true,
@@ -38,9 +36,7 @@
3836
"noarg": true,
3937
"node": true,
4038
"noempty": true,
41-
"plusplus": false,
4239
"quotmark": "double",
43-
"regexp": true,
4440
"shelljs": true,
4541
"strict": true,
4642
"trailing": true,

‎site/css/pack.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/js/github.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jQuery.fn.listCommits = function(username, repository, branch) {
2424
var shortMessage = htmlEntities(cutLines(this.commit.message));
2525

2626
if (this.author !== null) {
27-
list.append('<li><a href="' + githubUrl + '">' + shortMessage + '</a><em> by <strong><a class="author" href="' + 'https://github.com/' + this.author.login + '">' + this.author.login + '</a></strong></em></li>');
27+
list.append('<li><a href="' + githubUrl + '">' + shortMessage + '</a> <em>by <strong><a class="author" href="' + 'https://github.com/' + this.author.login + '">' + this.author.login + '</a></strong></em></li>');
2828
} else {
29-
list.append('<li><a href="' + githubUrl + '">' + shortMessage + '</a><em> by <strong>' + this.commit.author.name + '</strong></em></li>');
29+
list.append('<li><a href="' + githubUrl + '">' + shortMessage + '</a> <em>by <strong>' + this.commit.author.name + '</strong></em></li>');
3030
}
3131

3232
if (i === 9) {

‎site/js/pack.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)