From d17bd2f33506b5b75eaa98d9dd254aee0dfaf7d6 Mon Sep 17 00:00:00 2001 From: Francesco Pontillo Date: Mon, 25 Feb 2013 19:29:45 +0100 Subject: Added package.json (for npm) and component.json (for bower). Building with global variables is successful. TravisCI should build correctly. --- global/build-responsive.less | 3 +++ global/build-responsive_.less | 3 +++ global/build.less | 5 +++++ global/build_.less | 5 +++++ global/global.less | 2 ++ 5 files changed, 18 insertions(+) create mode 100644 global/build-responsive.less create mode 100644 global/build-responsive_.less create mode 100644 global/build.less create mode 100644 global/build_.less create mode 100644 global/global.less (limited to 'global') diff --git a/global/build-responsive.less b/global/build-responsive.less new file mode 100644 index 00000000..cd978fb3 --- /dev/null +++ b/global/build-responsive.less @@ -0,0 +1,3 @@ +@import "../components/bootstrap/less/responsive.less"; +@import "variables.less"; +@import "../global/global.less"; \ No newline at end of file diff --git a/global/build-responsive_.less b/global/build-responsive_.less new file mode 100644 index 00000000..cd978fb3 --- /dev/null +++ b/global/build-responsive_.less @@ -0,0 +1,3 @@ +@import "../components/bootstrap/less/responsive.less"; +@import "variables.less"; +@import "../global/global.less"; \ No newline at end of file diff --git a/global/build.less b/global/build.less new file mode 100644 index 00000000..6d7f3b83 --- /dev/null +++ b/global/build.less @@ -0,0 +1,5 @@ +@import "../components/bootstrap/less/bootstrap.less"; +@import "variables.less"; +@import "../global/global.less"; +@import "bootswatch.less"; +@import "../components/bootstrap/less/utilities.less"; \ No newline at end of file diff --git a/global/build_.less b/global/build_.less new file mode 100644 index 00000000..6d7f3b83 --- /dev/null +++ b/global/build_.less @@ -0,0 +1,5 @@ +@import "../components/bootstrap/less/bootstrap.less"; +@import "variables.less"; +@import "../global/global.less"; +@import "bootswatch.less"; +@import "../components/bootstrap/less/utilities.less"; \ No newline at end of file diff --git a/global/global.less b/global/global.less new file mode 100644 index 00000000..39bd32a0 --- /dev/null +++ b/global/global.less @@ -0,0 +1,2 @@ +@iconSpritePath: "../img/glyphicons-halflings.png"; +@iconWhiteSpritePath: "../img/glyphicons-halflings-white.png"; \ No newline at end of file -- cgit v1.2.3 From fc592d52f7b35444bd365df54923fb07e25a264c Mon Sep 17 00:00:00 2001 From: Francesco Pontillo Date: Tue, 26 Feb 2013 01:29:15 +0100 Subject: Gruntfile.js now considers all of the themes on "grunt build". package.json with a standard version number (from bootstrap). Removed backup .less files. --- Gruntfile.js | 4 +++- global/build-responsive_.less | 3 --- global/build_.less | 5 ----- package.json | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 global/build-responsive_.less delete mode 100644 global/build_.less (limited to 'global') diff --git a/Gruntfile.js b/Gruntfile.js index ed2c9288..4d8fcf7b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -17,7 +17,9 @@ module.exports = function (grunt) { ' * @license <%= pkg.license %>' + ' */' }, build: { - cerulean:{}, amelia: {} + amelia: {}, cerulean:{}, cosmo:{}, cyborg:{}, journal:{}, readable:{}, + shamrock:{}, simplex:{}, slate:{}, spacelab:{}, spruce:{}, superhero:{}, + united:{} }, clean: { build: { diff --git a/global/build-responsive_.less b/global/build-responsive_.less deleted file mode 100644 index cd978fb3..00000000 --- a/global/build-responsive_.less +++ /dev/null @@ -1,3 +0,0 @@ -@import "../components/bootstrap/less/responsive.less"; -@import "variables.less"; -@import "../global/global.less"; \ No newline at end of file diff --git a/global/build_.less b/global/build_.less deleted file mode 100644 index 6d7f3b83..00000000 --- a/global/build_.less +++ /dev/null @@ -1,5 +0,0 @@ -@import "../components/bootstrap/less/bootstrap.less"; -@import "variables.less"; -@import "../global/global.less"; -@import "bootswatch.less"; -@import "../components/bootstrap/less/utilities.less"; \ No newline at end of file diff --git a/package.json b/package.json index c5a376c0..30142e0e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Thomas Park", "name": "bootswatch", "description": "Bootswatch is a collection of free themes for Twitter Bootstrap.", - "version": "2.3.0+1", + "version": "2.3.0", "homepage": "http://bootswatch.com/", "license": "Apache License, Version 2.0, http://www.apache.org/licenses/LICENSE-2.0", "repository": { -- cgit v1.2.3