0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

190 Commits

Author SHA1 Message Date
Gleb Mazovetskiy
8a51daf280 Compile with Ruby Sass or libsass.
* Separate configs for libsass and sass.
* Sass compiler selected based on `process.env.TWBS_SASS`.
* Travis:
  * Use Gemfile to manage ruby dependencies.
  * Run core tests with both Sass compilers.
  * Only install/cache ruby gems required by the test subset.
* Grunt: `update-gemfile-lock` task a la `update-shrinkwrap`.
2014-12-24 22:21:39 +02:00
Chris Rebert
405410a924 Travis: install scss-lint 2014-12-08 18:34:15 -08:00
Gleb Mazovetskiy
7fe70cb083 Disable source comments
Require latest grunt-sass, bumped dep
2014-12-05 10:53:14 +00:00
Mark Otto
c80b7e468a bit of cleanup 2014-12-02 14:03:43 -08:00
Mark Otto
27df020852 convert to scss 2014-12-02 14:02:35 -08:00
XhmikosR
61bbe74df1 Update devDependencies. 2014-11-30 12:51:16 +02:00
Chris Rebert
a7682e3fde bump remarkable devDependency to ~1.4.1
[skip sauce]
2014-11-13 13:53:40 -08:00
XhmikosR
13d2a03379 Pin npm-shrinkwrap to v5.0.0 so that it works with npm 2.x.
Fixes #15105.
2014-11-13 22:01:12 +02:00
Mark Otto
9a7e365c2c bump version to v3.3.1 2014-11-12 09:03:16 -08:00
XhmikosR
07c1881bc2 Update npm-shrinkwrap. 2014-11-12 09:51:28 +02:00
XhmikosR
7047f9df14 Update devDependencies. 2014-11-10 12:54:23 +02:00
Mark Otto
34c2f46c8b Merge branch 'master' into v3.3.0 2014-10-29 09:45:09 -07:00
Mark Otto
22baa8153b fixes #14911: bump dependencies to fix customizer text from being cut shor 2014-10-29 09:42:00 -07:00
Mark Otto
94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
jonschlinkert
3e9b461766 Replaces markdown.js with [remarkable](https://github.com/jonschlinkert/remarkable).
- remarkable has 100% support for [commonmark](http://jgm.github.io/CommonMark/spec.html)
  - [faster](https://github.com/jonschlinkert/remarkable/tree/master/benchmark)
  - easier to monkeypatch. this is a goal of ours, might be useful to you at some point given the custom tokenizing/parsing you're doing for documentation.
2014-10-26 06:38:10 -04:00
Mark Otto
0521913a99 Merge pull request #13824 from jsdf/node-requirable
Allow npm package to be resolved via node module resolution
2014-10-25 19:43:05 -07:00
XhmikosR
0ad97ab446 Update node dependencies. 2014-10-25 14:12:20 +03:00
XhmikosR
d59b235242 Update node dependencies. 2014-10-23 13:26:48 -07:00
Daijiro Wachi
2b70f94b15 Update grunt-contrib-jade version 2014-10-02 13:30:36 +09:00
XhmikosR
e26fcf470f Update dependencies.
Close #14664.
2014-09-25 18:39:42 +03:00
XhmikosR
5befcb991c Update dependencies. 2014-09-08 09:03:26 +03:00
XhmikosR
fe896923fc Update grunt-jscs. 2014-08-30 08:43:44 +03:00
James Friend
9aeaf19b1d Merge remote-tracking branch 'upstream/master' into node-requirable
Conflicts:
	Gruntfile.js
2014-08-28 09:32:08 +08:00
XhmikosR
701c27e22e Update dev dependencies. 2014-08-26 13:51:05 +03:00
Chris Rebert
b3e8001be2 bump grunt-autoprefixer to ~1.0.0 2014-08-05 18:38:29 -07:00
James Friend
689faaf16f added a separate npm-specific main file 2014-08-05 10:51:31 +08:00
Chris Rebert
460294ff77 bump grunt-saucelabs to ~8.2.0 2014-07-31 13:16:04 -07:00
Chris Rebert
80ca659154 bump grunt-contrib-clean to ~0.6.0 2014-07-31 13:15:27 -07:00
XhmikosR
88b4016ce6 Update all devDependencies. 2014-07-22 08:31:26 +03:00
XhmikosR
7ba5c5d5e4 Update grunt-csscomb. 2014-07-22 08:25:35 +03:00
XhmikosR
503ec4e5db Update dependencies. 2014-07-10 09:58:23 +03:00
XhmikosR
0a8845c3fd Update package.json.
* "grunt-jscs-checker" was renamed to "grunt-jscs"
* update deps
2014-07-06 14:25:56 +03:00
XhmikosR
a013c112c4 Update dependencies. 2014-07-01 07:32:50 +03:00
XhmikosR
225351431e Update dependencies. 2014-06-30 18:35:50 +03:00
XhmikosR
fec94e1695 Update "grunt-autoprefixer". 2014-06-27 07:38:46 +03:00
Mark Otto
ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Chris Rebert
df1aee56df upgrade grunt-saucelabs to ~8.1.0
update shrinkwrap too
2014-06-24 12:17:24 -07:00
XhmikosR
dc7da296e4 Update dependencies. 2014-06-24 18:58:38 +03:00
XhmikosR
898328655f Update dependencies. 2014-06-23 03:12:16 +03:00
Chris Rebert
856bc8694c bump npm-shrinkwrap to ~3.1.4 2014-06-19 16:04:40 -07:00
Heinrich Fenkart
7bc8db9558 Bump grunt-jscs-checker to 0.5.1 2014-06-19 21:08:04 +02:00
Chris Rebert
3c4ba2a08c Switch to uber/npm-shrinkwrap for npm-shrinkwrap.json generation
Instead of our homegrown grunt/shrinkwrap.js
Fixes #13483.
New npm-shrinkwrap.json is human-readable but still in a consistent/stable format.
Should aid debugging, produce better diffs, and be less prone to merge conflicts
2014-06-19 11:46:37 -07:00
XhmikosR
e42de7511a Update dependencies. 2014-06-17 18:29:17 -07:00
James Friend
33a6932d6f added 'main' field to package.json 2014-06-15 12:53:26 +08:00
Chris Rebert
624800aa4f bump load-grunt-tasks to ~0.5.0
[skip validator] [skip sauce]
2014-06-13 12:02:14 -07:00
Chris Rebert
2213a5b756 bump grunt-contrib-connect to ~0.8.0 2014-06-09 17:32:10 -07:00
Chris Rebert
f0c97bf758 bump grunt-saucelabs to ~8.0.2 2014-06-04 12:38:26 -07:00
Chris Rebert
34621740b3 bump grunt-contrib-jade to ~0.12.0 2014-06-04 12:06:47 -07:00
Chris Rebert
094e42883a bump grunt-contrib-qunit to ~0.5.1 2014-06-04 12:06:03 -07:00
Chris Rebert
7b2600cfc5 bump grunt-saucelabs to ~7.0.0 2014-05-23 12:53:12 -07:00