Mark Otto
0e5d17d5f6
Merge branch 'master' into v4
...
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs/_data/glyphicons.yml
docs/_includes/components/alerts.html
docs/_includes/components/badges.html
docs/_includes/components/breadcrumbs.html
docs/_includes/components/button-dropdowns.html
docs/_includes/components/button-groups.html
docs/_includes/components/dropdowns.html
docs/_includes/components/glyphicons.html
docs/_includes/components/input-groups.html
docs/_includes/components/jumbotron.html
docs/_includes/components/labels.html
docs/_includes/components/list-group.html
docs/_includes/components/media.html
docs/_includes/components/navbar.html
docs/_includes/components/navs.html
docs/_includes/components/page-header.html
docs/_includes/components/pagination.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/components/responsive-embed.html
docs/_includes/components/thumbnails.html
docs/_includes/components/wells.html
docs/_includes/css/buttons.html
docs/_includes/css/code.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/css/tables.html
docs/_includes/css/type.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/disabling-responsiveness.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/whats-included.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/nav/components.html
docs/_includes/nav/javascript.html
docs/_jade/customizer-variables.jade
docs/_layouts/default.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.js
docs/customize.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/glyphicons.less
less/mixins/vendor-prefixes.less
less/navbar.less
less/popovers.less
less/tables.less
less/theme.less
less/tooltip.less
less/variables.less
package.json
scss/_carousel.scss
scss/_close.scss
scss/_forms.scss
test-infra/npm-shrinkwrap.json
2015-01-03 20:08:58 -08:00
Chris Rebert
2166f238d7
Merge pull request #15456 from twbs/bump-clean-css
...
Bump grunt-contrib-cssmin to ~0.11.0
2014-12-30 00:12:38 -08:00
Chris Rebert
9867b1d49e
bump grunt-jscs to ~1.1.0
2014-12-29 14:16:00 -08:00
Chris Rebert
880642ee62
update devDependencies to match upstream
2014-12-29 14:14:57 -08:00
Chris Rebert
995c768330
bump grunt-jscs to ~1.1.0
2014-12-29 11:57:56 -08:00
Chris Rebert
f91071bc1b
Bump grunt-contrib-cssmin to ~0.11.0
2014-12-28 19:58:29 -08:00
Chris Rebert
139226157e
bump grunt-contrib-uglify to ~0.7.0
2014-12-28 19:47:46 -08:00
Chris Rebert
f5dad0fa39
bump grunt-contrib-compress to ~0.13.0
2014-12-28 18:59:49 -08:00
Chris Rebert
b282e8a01f
bump grunt-contrib-jade to ~0.14.0
2014-12-28 18:53:55 -08:00
Chris Rebert
93cd02cd29
bump load-grunt-tasks to ~2.0.0
2014-12-28 18:43:47 -08:00
Chris Rebert
2879049163
bump remarkable to ~1.6.0
2014-12-28 18:25:49 -08:00
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
33cbf2142b
bump grunt-saucelabs to ~8.4.0
...
[skip validator]
2014-12-12 14:18:25 -08:00
Chris Rebert
74df3175b9
bump remarkable to ~1.5.0
2014-12-12 13:42:43 -08:00
Chris Rebert
f2ecc77562
use npm-shrinkwrap ^200.0.0 ; fixes #15279
2014-12-12 13:21:49 -08:00
XhmikosR
762acc826f
Merge pull request #15293 from twbs/grunt-contrib-compress
...
Add grunt-contrib-compress.
2014-12-09 10:19:05 +02:00
XhmikosR
afa46515d0
Update glob.
2014-12-09 07:59:57 +02:00
XhmikosR
71f6dd25fc
Add grunt-contrib-compress.
...
Now, the zip file is created when running `grunt prep-release`.
[ci skip]
2014-12-09 07:53:11 +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
