From fd9b29b43e089719ca6d6b690f83874a05a83ab8 Mon Sep 17 00:00:00 2001 From: Daniel Erickson Date: Sun, 2 Feb 2014 17:33:40 -0800 Subject: Allow the bootstrap package in npm to expose css and less --- package.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package.json') diff --git a/package.json b/package.json index 6b38c31ab..52bcb4dc8 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,8 @@ "scripts": { "test": "grunt test" }, + "style": "./dist/css/bootstrap.css", + "less": "./less/bootstrap.less", "repository": { "type": "git", "url": "https://github.com/twbs/bootstrap.git" -- cgit v1.2.3 From 96fd2dca020d6c43c5797cc29caec7bedb917d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Thu, 6 Feb 2014 11:37:39 +0100 Subject: Use license object instead of licenses array --- package.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index b93ae15ba..8e6c43494 100644 --- a/package.json +++ b/package.json @@ -20,12 +20,10 @@ "bugs": { "url": "https://github.com/twbs/bootstrap/issues" }, - "licenses": [ - { - "type": "MIT", - "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" - } - ], + "license": { + "type": "MIT", + "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" + }, "devDependencies": { "browserstack-runner": "~0.1.0", "btoa": "~1.1.1", -- cgit v1.2.3 From 1e1f5102944632beedc60c059a5c493e5f71aff1 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 10 Feb 2014 11:20:50 -0800 Subject: rm BrowserStack testing from build --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 8e6c43494..33acf49d9 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" }, "devDependencies": { - "browserstack-runner": "~0.1.0", "btoa": "~1.1.1", "canonical-json": "~0.0.3", "grunt": "~0.4.2", -- cgit v1.2.3 From 88fdd4542749275d6ab970ee040f2efe10018d5b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 13 Feb 2014 01:12:26 -0800 Subject: v3.1.1 bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 33acf49d9..ed98e90e2 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.1.1", "keywords": [ "bootstrap", "css" -- cgit v1.2.3 From 2d18944d982a567b07b95d4b0719e7f85ff78e77 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 12 Feb 2014 21:32:52 +0200 Subject: Update dependencies. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index ed98e90e2..2001df35b 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "grunt-contrib-copy": "~0.5.0", "grunt-contrib-csslint": "~0.2.0", "grunt-contrib-cssmin": "~0.7.0", - "grunt-contrib-jade": "~0.9.1", + "grunt-contrib-jade": "~0.10.0", "grunt-contrib-jshint": "~0.8.0", "grunt-contrib-less": "~0.9.0", "grunt-contrib-qunit": "~0.4.0", -- cgit v1.2.3 From cdb381bb7559495ba257b9ac98910990c5527665 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 13 Feb 2014 13:54:02 -0800 Subject: bump grunt-exec to v0.4.5 & add missing tilde to version spec --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 2001df35b..bae0afe6d 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "grunt-contrib-uglify": "~0.3.0", "grunt-contrib-watch": "~0.5.3", "grunt-csscomb": "~2.0.1", - "grunt-exec": "0.4.3", + "grunt-exec": "~0.4.5", "grunt-html-validation": "~0.1.13", "grunt-jekyll": "~0.4.1", "grunt-jscs-checker": "~0.3.0", -- cgit v1.2.3 From db32afe6cf972d1101ee86a64b72a37b252173c7 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 18 Feb 2014 07:28:27 +0200 Subject: Update grunt-contrib-cssmin. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index bae0afe6d..6986bfad6 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "grunt-contrib-connect": "~0.6.0", "grunt-contrib-copy": "~0.5.0", "grunt-contrib-csslint": "~0.2.0", - "grunt-contrib-cssmin": "~0.7.0", + "grunt-contrib-cssmin": "~0.8.0", "grunt-contrib-jade": "~0.10.0", "grunt-contrib-jshint": "~0.8.0", "grunt-contrib-less": "~0.9.0", -- cgit v1.2.3 From af83e569c35e7f3732b34d599126ffe2aa207d82 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 22 Feb 2014 13:23:37 +0200 Subject: Update grunt-contrib-connect. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 6986bfad6..553165f98 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "grunt-banner": "~0.2.0", "grunt-contrib-clean": "~0.5.0", "grunt-contrib-concat": "~0.3.0", - "grunt-contrib-connect": "~0.6.0", + "grunt-contrib-connect": "~0.7.0", "grunt-contrib-copy": "~0.5.0", "grunt-contrib-csslint": "~0.2.0", "grunt-contrib-cssmin": "~0.8.0", -- cgit v1.2.3 From 429fc9331e9c74a77f575d136351630e1271cd3d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 24 Feb 2014 19:10:23 -0800 Subject: grunt dist --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 553165f98..1b64c92e5 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,8 @@ "grunt-saucelabs": "~5.0.0", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~0.3.0", - "markdown": "~0.5.0" + "markdown": "~0.5.0", + "css-flip": "~0.3.0" }, "jspm": { "main": "js/bootstrap", -- cgit v1.2.3 From e40c1e5e6d78870a0e9c6b01c6dd8909181af479 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 24 Feb 2014 20:46:45 -0800 Subject: add Grunt task for css-flip-ing & add RTL to Gruntfile configs --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 1b64c92e5..2e718eae2 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "devDependencies": { "btoa": "~1.1.1", "canonical-json": "~0.0.3", + "css-flip": "~0.3.0", "grunt": "~0.4.2", "grunt-banner": "~0.2.0", "grunt-contrib-clean": "~0.5.0", -- cgit v1.2.3 From db69420d747fe3107c1abb3cb85219b6fc03027a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Mon, 24 Feb 2014 09:55:33 +0100 Subject: Remove bootstrap keyword --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 553165f98..1330b7f1f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,6 @@ "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.", "version": "3.1.1", "keywords": [ - "bootstrap", "css" ], "homepage": "http://getbootstrap.com", -- cgit v1.2.3 From db9fca23ff30ca464483f67391e95a898e7ada63 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 26 Feb 2014 19:32:30 +0200 Subject: Update load-grunt-tasks. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 256eece28..7f63ee5c5 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "grunt-jscs-checker": "~0.3.0", "grunt-saucelabs": "~5.0.0", "grunt-sed": "~0.1.1", - "load-grunt-tasks": "~0.3.0", + "load-grunt-tasks": "~0.4.0", "markdown": "~0.5.0", "css-flip": "~0.3.0" }, -- cgit v1.2.3 From 63031a3ca5a44d828122226c26232c00f4463f98 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 26 Feb 2014 01:25:57 +0200 Subject: Bump grunt-jscs-checker. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 7f63ee5c5..d84bd8516 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "grunt-exec": "~0.4.5", "grunt-html-validation": "~0.1.13", "grunt-jekyll": "~0.4.1", - "grunt-jscs-checker": "~0.3.0", + "grunt-jscs-checker": "~0.4.0", "grunt-saucelabs": "~5.0.0", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~0.4.0", -- cgit v1.2.3 From 256baf802692b0a0e961f5b174e033e77fee837d Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 1 Mar 2014 20:14:31 +0200 Subject: Update grunt-contib-less. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index d84bd8516..38a57f1c8 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "grunt-contrib-cssmin": "~0.8.0", "grunt-contrib-jade": "~0.10.0", "grunt-contrib-jshint": "~0.8.0", - "grunt-contrib-less": "~0.9.0", + "grunt-contrib-less": "~0.10.0", "grunt-contrib-qunit": "~0.4.0", "grunt-contrib-uglify": "~0.3.0", "grunt-contrib-watch": "~0.5.3", -- cgit v1.2.3 From cd65e512a21767861c57294dc720d7836a104d39 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 2 Mar 2014 09:27:01 +0200 Subject: Update dependencies. --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 38a57f1c8..fe4d2c0c2 100644 --- a/package.json +++ b/package.json @@ -25,27 +25,27 @@ }, "devDependencies": { "btoa": "~1.1.1", - "canonical-json": "~0.0.3", + "canonical-json": "~0.0.4", "grunt": "~0.4.2", - "grunt-banner": "~0.2.0", + "grunt-banner": "~0.2.1", "grunt-contrib-clean": "~0.5.0", "grunt-contrib-concat": "~0.3.0", - "grunt-contrib-connect": "~0.7.0", + "grunt-contrib-connect": "~0.7.1", "grunt-contrib-copy": "~0.5.0", "grunt-contrib-csslint": "~0.2.0", - "grunt-contrib-cssmin": "~0.8.0", + "grunt-contrib-cssmin": "~0.9.0", "grunt-contrib-jade": "~0.10.0", "grunt-contrib-jshint": "~0.8.0", "grunt-contrib-less": "~0.10.0", "grunt-contrib-qunit": "~0.4.0", - "grunt-contrib-uglify": "~0.3.0", + "grunt-contrib-uglify": "~0.4.0", "grunt-contrib-watch": "~0.5.3", "grunt-csscomb": "~2.0.1", "grunt-exec": "~0.4.5", "grunt-html-validation": "~0.1.13", "grunt-jekyll": "~0.4.1", "grunt-jscs-checker": "~0.4.0", - "grunt-saucelabs": "~5.0.0", + "grunt-saucelabs": "~5.0.1", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~0.4.0", "markdown": "~0.5.0", -- cgit v1.2.3 From 745111ba524ea6cdcff3454cbb0cf1bed3f1b130 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 3 Mar 2014 14:18:03 -0800 Subject: Match docs for description --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index fe4d2c0c2..15085c3b1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap", - "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.", + "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", "version": "3.1.1", "keywords": [ "css" -- cgit v1.2.3 From 6f1cc694fea395bf2669260ca8ebb593b3d9f169 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 3 Mar 2014 14:20:37 -0800 Subject: add more keywords to package.json & composer.json --- package.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 15085c3b1..9610cc1d4 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,13 @@ "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", "version": "3.1.1", "keywords": [ - "css" + "css", + "less", + "mobile-first", + "responsive", + "front-end", + "framework", + "web" ], "homepage": "http://getbootstrap.com", "author": "Twitter, Inc.", -- cgit v1.2.3 From 58201d7f119df7976ef996f4c02efdc2ca6b3733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Wed, 5 Mar 2014 09:23:54 +0100 Subject: grunt-contrib-jade@0.11.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 6b1673b85..2df9928f0 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "grunt-contrib-copy": "~0.5.0", "grunt-contrib-csslint": "~0.2.0", "grunt-contrib-cssmin": "~0.9.0", - "grunt-contrib-jade": "~0.10.0", + "grunt-contrib-jade": "~0.11.0", "grunt-contrib-jshint": "~0.8.0", "grunt-contrib-less": "~0.10.0", "grunt-contrib-qunit": "~0.4.0", -- cgit v1.2.3 From 56a5d93b821b547924858628eb7c2fc7518879ce Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 6 Mar 2014 11:37:32 -0800 Subject: switch to grunt-css-flip for RTL CSS generation --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 2df9928f0..3132b3ff8 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "grunt-contrib-qunit": "~0.4.0", "grunt-contrib-uglify": "~0.4.0", "grunt-contrib-watch": "~0.5.3", + "grunt-css-flip": "^0.1.0", "grunt-csscomb": "~2.0.1", "grunt-exec": "~0.4.5", "grunt-html-validation": "~0.1.13", -- cgit v1.2.3