Commit Graph

9 Commits

Author SHA1 Message Date
Chris Rebert cdc92e8139 only run browserstack tests in Travis 2013-08-06 12:25:26 -07:00
Rohan Jain 093cda244a Integrate testing with browserstack 2013-08-06 12:24:14 -07:00
Jon Schlinkert 55df26ae20 This pull request organizes the Gruntfile, makes better use of Grunt conventions and placates my OCD.
Changes in the Gruntfile:

* Use two spaces for consistency with the rest of the codebase.
* Tasks are now organize based on task type. since lodash templates are used across tasks/targets, this makes it easier to follow.
* Use `src-dest` files format when only src-dest pairing is necessary. This saves a line over the files-object format, but more importantly it allows use the src or dest in lodash templates (e.g. `<%= concat.bootstrap.src %>`), which isn't possible in the files-object or files-array formats.
* Make the explicit order of the javascript files more obvious in concat task , maybe just a tiny bit more usable and easier to customize - but really just OCD
* Use `<%= pkg.name %>` variable for dest CSS, both for consistency with how javascript targets are defined, and to make it just little easier for devs to customize bootstrap.

ran the build to test, everything seems good.
2013-08-03 19:03:38 -04:00
Chris Rebert 7ae32074a0 Remove hack/workaround for jshint/grunt bug that's now fixed
See https://github.com/gruntjs/grunt-contrib-jshint/issues/86
2013-07-29 17:17:52 -07:00
Chris Rebert 03b2866b9e tweak Gruntfile.js so it passes jshint 2013-07-27 21:39:11 -07:00
Chris Rebert ba62cfeffe workaround possible bug in grunt-contrib-jshint 2013-07-27 21:38:59 -07:00
Chris Rebert a317f67c1c re-integrate #8560 using @fat's code from the comment on #8614 2013-07-26 01:15:41 -07:00
Chris Rebert 292d8d6819 specify explicit ordering for grunt concat step 2013-07-26 01:07:56 -07:00
John-Philip Johansson 0d33455ef4 Replace Makefile with GruntJS
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess

Rebased by @cvrebert
2013-07-26 00:39:14 -07:00