Browse files

Make bootstrap under static so less and js can easily stay synchroniz…

…ed and upgrading is easy
  • Loading branch information...
1 parent 9b2dac3 commit 56309985236ca44c9462ecb6587fd97206ec69c1 @stenington stenington committed Feb 22, 2013
Showing with 9 additions and 9 deletions.
  1. +3 −0 .gitmodules
  2. +4 −6 app.js
  3. +1 −3 package.json
  4. +1 −0 static/vendor/bootstrap
View
3 .gitmodules
@@ -0,0 +1,3 @@
+[submodule "static/vendor/bootstrap"]
+ path = static/vendor/bootstrap
+ url = git://github.com/twitter/bootstrap.git
View
10 app.js
@@ -39,13 +39,11 @@ env.addFilter('formatdate', function (rawDate) {
// Middleware. Also see `middleware.js`
// ------------------------------------
-var bootstrapPath = path.join(__dirname, 'node_modules', 'bootstrap');
app.use(less({
- src: path.join(__dirname, "static", "less"),
- paths: [path.join(bootstrapPath, "less")],
- dest: path.join(__dirname, "static", "css"),
- prefix: '/css',
- debug: true
+ src: path.join(__dirname, "static/less"),
+ paths: [path.join(__dirname, "static/vendor/bootstrap/less")],
+ dest: path.join(__dirname, "static/css"),
+ prefix: '/css'
}));
app.use(express.static(path.join(__dirname, "static")));
app.use(express.static(path.join(configuration.get('var_dir'), "badges")));
View
4 package.json
@@ -4,11 +4,9 @@
"version": "0.5.0",
"private": true,
"scripts": {
- "test": "NODE_ENV=test ./node_modules/.bin/tap test/*.test.js",
- "postinstall": "cp ./node_modules/bootstrap/js/*.js static/js/bootstrap/"
+ "test": "NODE_ENV=test ./node_modules/.bin/tap test/*.test.js"
},
"dependencies": {
- "bootstrap": "git+https://github.com/twitter/bootstrap.git#v2.2.2",
"colors": "*",
"commander": "~0.5.2",
"connect-flash": "*",
1 static/vendor/bootstrap
@@ -0,0 +1 @@
+Subproject commit 9376a7c221a64c2bf508d02ea2ccd85748d10fcc

0 comments on commit 5630998

Please sign in to comment.