From 4160ff0e4497920ef2ea3a7a06b36eeb52deb6dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 23 Nov 2013 17:41:31 +0100 Subject: Kick up grunt-recess dependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 9d4912d53..12df3477c 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ , "grunt-contrib-watch": "~0.5.3" , "grunt-html-validation": "~0.1.6" , "grunt-jekyll": "~0.4.0" - , "grunt-recess": "~0.4.0" + , "grunt-recess": "~0.5.0" , "grunt-sed": "~0.1.1" , "regexp-quote": "~0.0.0" } -- cgit v1.2.3 From ac6cfbbaad65a773590c61b82179d3b21c835338 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Tue, 26 Nov 2013 12:10:06 +0200 Subject: include jspm package configuration --- package.json | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 12df3477c..009b7bf58 100644 --- a/package.json +++ b/package.json @@ -37,4 +37,15 @@ , "grunt-sed": "~0.1.1" , "regexp-quote": "~0.0.0" } + , "jspm": { + "main": "js/bootstrap" + , "directories": { "lib": "dist" } + , "shim": { + "js/bootstrap": { + "imports": "jquery" + , "exports": "$" + } + } + , "buildConfig": { "uglify": true } + } } -- cgit v1.2.3 From 8a74264344489e8b9e10c5c5e2098bb75116b8bd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Dec 2013 19:31:52 -0800 Subject: bump version numbers to 3.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 009b7bf58..bc2a004af 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap" , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development." - , "version": "3.0.2" + , "version": "3.0.3" , "keywords": ["bootstrap", "css"] , "homepage": "http://getbootstrap.com" , "author": "Twitter, Inc." -- cgit v1.2.3 From bd9332a58a9c75d831a1dc877ddfc9b846ef1344 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 3 Dec 2013 18:42:31 -0800 Subject: switch to Sauce Labs for our cross-browser JS unit testing needs Fixes #11087 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index bc2a004af..813cf1d13 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,7 @@ } ] , "devDependencies": { - "browserstack-runner": "~0.0.12" - , "btoa": "~1.1.1" + "btoa": "~1.1.1" , "grunt": "~0.4.1" , "grunt-contrib-clean": "~0.5.0" , "grunt-contrib-concat": "~0.3.0" @@ -34,6 +33,7 @@ , "grunt-html-validation": "~0.1.6" , "grunt-jekyll": "~0.4.0" , "grunt-recess": "~0.5.0" + , "grunt-saucelabs": "~4.1.2" , "grunt-sed": "~0.1.1" , "regexp-quote": "~0.0.0" } -- cgit v1.2.3 From c1dae1e13c0dd5c53aa39b6aa6af8e07e4d3037f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 6 Dec 2013 16:51:38 -0800 Subject: integrate JSCS --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 813cf1d13..3c9fd7fe6 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ , "grunt-contrib-watch": "~0.5.3" , "grunt-html-validation": "~0.1.6" , "grunt-jekyll": "~0.4.0" + , "grunt-jscs-checker": "~0.2.5" , "grunt-recess": "~0.5.0" , "grunt-saucelabs": "~4.1.2" , "grunt-sed": "~0.1.1" -- cgit v1.2.3 From fdc5d1dc34bf28e55c6359aeb098e608585ca6cb Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 18 Sep 2013 08:45:38 +0300 Subject: Minify css with clean-css. --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 3c9fd7fe6..be4b58afe 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ , "grunt-contrib-concat": "~0.3.0" , "grunt-contrib-connect": "~0.5.0" , "grunt-contrib-copy": "~0.4.1" + , "grunt-contrib-cssmin": "~0.7.0" , "grunt-contrib-jshint": "~0.7.0" , "grunt-contrib-qunit": "~0.3.0" , "grunt-contrib-uglify": "~0.2.4" -- cgit v1.2.3 From cbfbf1b2dd16b1aa17e3feef9a4643e98a0f967e Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 8 Dec 2013 13:01:18 +0200 Subject: Add csslint support. --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 3c9fd7fe6..e6adbc17e 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ , "grunt-contrib-concat": "~0.3.0" , "grunt-contrib-connect": "~0.5.0" , "grunt-contrib-copy": "~0.4.1" + , "grunt-contrib-csslint": "~0.2.0" , "grunt-contrib-jshint": "~0.7.0" , "grunt-contrib-qunit": "~0.3.0" , "grunt-contrib-uglify": "~0.2.4" -- cgit v1.2.3 From c0200426ee72b165de400db740a60bae5d344b3c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Dec 2013 19:09:27 -0800 Subject: Drop grunt-recess for grunt-contrib-less & co --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 3c9fd7fe6..a69639ca2 100644 --- a/package.json +++ b/package.json @@ -22,18 +22,20 @@ , "devDependencies": { "btoa": "~1.1.1" , "grunt": "~0.4.1" + , "grunt-banner": "~0.2.0" , "grunt-contrib-clean": "~0.5.0" , "grunt-contrib-concat": "~0.3.0" , "grunt-contrib-connect": "~0.5.0" , "grunt-contrib-copy": "~0.4.1" , "grunt-contrib-jshint": "~0.7.0" + , "grunt-contrib-less": "~0.8.0" , "grunt-contrib-qunit": "~0.3.0" , "grunt-contrib-uglify": "~0.2.4" , "grunt-contrib-watch": "~0.5.3" + , "grunt-csscomb": "~1.1.0" , "grunt-html-validation": "~0.1.6" , "grunt-jekyll": "~0.4.0" , "grunt-jscs-checker": "~0.2.5" - , "grunt-recess": "~0.5.0" , "grunt-saucelabs": "~4.1.2" , "grunt-sed": "~0.1.1" , "regexp-quote": "~0.0.0" -- cgit v1.2.3 From d466d527a496e14ef1c8fdbeb7a221bd3a239f09 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Dec 2013 00:12:11 -0800 Subject: Undo merge of #11778 and use cleancss min option --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 5cd7c90ec..a63efc007 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ , "grunt-contrib-connect": "~0.5.0" , "grunt-contrib-copy": "~0.4.1" , "grunt-contrib-csslint": "~0.2.0" - , "grunt-contrib-cssmin": "~0.7.0" , "grunt-contrib-jshint": "~0.7.0" , "grunt-contrib-less": "~0.8.0" , "grunt-contrib-qunit": "~0.3.0" -- cgit v1.2.3 From 9f12f840b94293392cb0da008d744107b952d149 Mon Sep 17 00:00:00 2001 From: Tobias Lindig Date: Tue, 10 Dec 2013 10:28:44 +0100 Subject: Buildprocess: use module "load-grunt-tasks" to load grunt tasks directly from the package.json --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index a63efc007..8a5b76e41 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ , "grunt-saucelabs": "~4.1.2" , "grunt-sed": "~0.1.1" , "regexp-quote": "~0.0.0" + , "load-grunt-tasks": "~0.2.0" } , "jspm": { "main": "js/bootstrap" -- cgit v1.2.3