From 29aaf66a8ac3744a62b05dd7534aa6fabed98136 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 17 Dec 2013 14:39:36 +0200 Subject: Normalize package.json. --- package.json | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 882025622..c12e035f5 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,15 @@ "name": "bootstrap", "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.", "version": "3.1.0", - "keywords": ["bootstrap", "css"], + "keywords": [ + "bootstrap", + "css" + ], "homepage": "http://getbootstrap.com", "author": "Twitter, Inc.", - "scripts": { "test": "grunt test" }, + "scripts": { + "test": "grunt test" + }, "repository": { "type": "git", "url": "https://github.com/twbs/bootstrap.git" @@ -43,13 +48,18 @@ }, "jspm": { "main": "js/bootstrap", - "directories": { "lib": "dist" }, + "directories": { + "example": "examples", + "lib": "dist" + }, "shim": { "js/bootstrap": { "imports": "jquery", "exports": "$" } }, - "buildConfig": { "uglify": true } + "buildConfig": { + "uglify": true + } } } -- cgit v1.2.3 From 88c3619d2cc1e3e308071fa5fc9df1ec4204576b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sun, 22 Dec 2013 19:01:00 +0100 Subject: Update dependencies --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 882025622..9d00cc318 100644 --- a/package.json +++ b/package.json @@ -21,25 +21,25 @@ ], "devDependencies": { "btoa": "~1.1.1", - "grunt": "~0.4.1", + "grunt": "~0.4.2", "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-csslint": "~0.2.0", - "grunt-contrib-jshint": "~0.7.0", - "grunt-contrib-less": "~0.8.0", + "grunt-contrib-jshint": "~0.7.2", + "grunt-contrib-less": "~0.8.3", "grunt-contrib-qunit": "~0.3.0", - "grunt-contrib-uglify": "~0.2.4", + "grunt-contrib-uglify": "~0.2.7", "grunt-contrib-watch": "~0.5.3", "grunt-csscomb": "~1.2.1", - "grunt-html-validation": "~0.1.11", + "grunt-html-validation": "~0.1.12", "grunt-jekyll": "~0.4.0", - "grunt-jscs-checker": "~0.2.5", + "grunt-jscs-checker": "~0.2.6", "grunt-saucelabs": "~4.1.2", "grunt-sed": "~0.1.1", - "load-grunt-tasks": "~0.2.0" + "load-grunt-tasks": "~0.2.1" }, "jspm": { "main": "js/bootstrap", -- cgit v1.2.3 From cb7cdd0c0565f2872ef46fdc55b956aeb270e346 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 22 Dec 2013 21:18:45 -0800 Subject: Revert to CSScomb 1.1.0 because 1.2.0 and 1.2.1 fuck up our compiled CSS --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 9d00cc318..64f7b5e46 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "grunt-contrib-qunit": "~0.3.0", "grunt-contrib-uglify": "~0.2.7", "grunt-contrib-watch": "~0.5.3", - "grunt-csscomb": "~1.2.1", + "grunt-csscomb": "~1.1.0", "grunt-html-validation": "~0.1.12", "grunt-jekyll": "~0.4.0", "grunt-jscs-checker": "~0.2.6", -- cgit v1.2.3 From 4376ce84667264f63048bc3d13541bf273052579 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Dec 2013 13:25:51 -0800 Subject: Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 5de55a58f..dcaab99d5 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "grunt-contrib-qunit": "~0.3.0", "grunt-contrib-uglify": "~0.2.7", "grunt-contrib-watch": "~0.5.3", - "grunt-csscomb": "~1.1.0", + "grunt-csscomb": "~1.2.1", "grunt-html-validation": "~0.1.12", "grunt-jekyll": "~0.4.0", "grunt-jscs-checker": "~0.2.6", -- cgit v1.2.3 From 679c7862374be9b742862923181302f76b3a8c06 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 24 Dec 2013 12:16:17 -0800 Subject: roll back version numbers to avoid broken links in docs and readme (fixes #12000) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index dcaab99d5..d0563c6bc 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.1.0", + "version": "3.0.3", "keywords": [ "bootstrap", "css" -- cgit v1.2.3 From b590b268adda65b317966ecc17e36b113d4b8eef Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 26 Dec 2013 19:50:04 +0200 Subject: Update dependencies. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index d0563c6bc..1911a399a 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ "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-copy": "~0.5.0", "grunt-contrib-csslint": "~0.2.0", - "grunt-contrib-jshint": "~0.7.2", + "grunt-contrib-jshint": "~0.8.0", "grunt-contrib-less": "~0.8.3", "grunt-contrib-qunit": "~0.3.0", "grunt-contrib-uglify": "~0.2.7", @@ -41,7 +41,7 @@ "grunt-csscomb": "~1.2.1", "grunt-html-validation": "~0.1.12", "grunt-jekyll": "~0.4.0", - "grunt-jscs-checker": "~0.2.6", + "grunt-jscs-checker": "~0.3.0", "grunt-saucelabs": "~4.1.2", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~0.2.1" -- cgit v1.2.3 From 2426a2aeef2634dacd44d23e9a9f116ea887af3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 26 Dec 2013 21:55:55 +0100 Subject: Update dependencies Updates grunt-html-validation and grunt-jekyll dependencies. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 1911a399a..8f471206f 100644 --- a/package.json +++ b/package.json @@ -39,8 +39,8 @@ "grunt-contrib-uglify": "~0.2.7", "grunt-contrib-watch": "~0.5.3", "grunt-csscomb": "~1.2.1", - "grunt-html-validation": "~0.1.12", - "grunt-jekyll": "~0.4.0", + "grunt-html-validation": "~0.1.13", + "grunt-jekyll": "~0.4.1", "grunt-jscs-checker": "~0.3.0", "grunt-saucelabs": "~4.1.2", "grunt-sed": "~0.1.1", -- cgit v1.2.3