Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew Hilton committed Apr 3, 2012
2 parents b05d8cf + d2f3b5d commit b6d2e8c
Show file tree
Hide file tree
Showing 47 changed files with 9,413 additions and 709 deletions.
17 changes: 14 additions & 3 deletions app.js
Expand Up @@ -4,26 +4,37 @@
*/

var express = require('express')
, less = require('less')
;

var app = module.exports = express.createServer();

// Hack connect.js to allow relative @import statements in less.js'
express.compiler.compilers.less.compile = function (str, fn) {
try {
less.render(str, {paths: [__dirname + '/public/stylesheets/bootstrap']}, fn);
} catch (err) {
fn(err);
}
};

// Configuration

app.configure(function(){
app.configure(function () {
app.set('views', __dirname + '/views');
app.set('view engine', 'jade');
app.use(express.bodyParser());
app.use(express.methodOverride());
app.use(app.router);
app.use(express.compiler({ src: __dirname + '/public', enable: ['less']}));
app.use(express.static(__dirname + '/public'));
});

app.configure('development', function(){
app.configure('development', function () {
app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
});

app.configure('production', function(){
app.configure('production', function () {
app.use(express.errorHandler());
});

Expand Down
2 changes: 2 additions & 0 deletions hint.cmd
@@ -0,0 +1,2 @@
@ECHO OFF
node .\utils\hint.js
3 changes: 3 additions & 0 deletions package.json
Expand Up @@ -5,5 +5,8 @@
, "dependencies": {
"express": "2.5.8"
, "jade": ">= 0.0.1"
, "less": "1.3.0"
}, "devDependencies": {
"jshint": "*"
}
}
12 changes: 0 additions & 12 deletions public/stylesheets/bootstrap-responsive.min.css

This file was deleted.

0 comments on commit b6d2e8c

Please sign in to comment.