Mark Otto
58082cd83e
Merge branch 'master' into v4
...
Conflicts:
.gitignore
Gruntfile.js
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.js
dist/js/bootstrap.min.js
docs/_includes/components/navbar.html
docs/_includes/components/progress-bars.html
docs/_includes/css/grid.html
docs/_includes/css/overview.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/community.html
docs/_includes/getting-started/disabling-responsiveness.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/examples.html
docs/_includes/getting-started/license.html
docs/_includes/getting-started/third-party-support.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/js/transitions.html
docs/_includes/nav/javascript.html
docs/_includes/nav/main.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/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.js
docs/dist/js/bootstrap.min.js
docs/migration.html
js/affix.js
js/alert.js
js/button.js
js/carousel.js
js/collapse.js
js/dropdown.js
js/modal.js
js/popover.js
js/scrollspy.js
js/tab.js
js/tests/unit/affix.js
js/tests/unit/button.js
js/tests/unit/carousel.js
js/tests/unit/modal.js
js/tests/unit/tooltip.js
js/tests/visual/modal.html
js/tooltip.js
less/component-animations.less
less/jumbotron.less
less/mixins/background-variant.less
less/mixins/buttons.less
less/mixins/responsive-visibility.less
less/mixins/text-emphasis.less
less/navbar.less
less/navs.less
less/scaffolding.less
less/tooltip.less
less/utilities.less
less/variables.less
package.json
scss/_buttons.scss
scss/_forms.scss
scss/_modal.scss
2015-03-29 00:08:54 -07:00
Chris Rebert
4d652035dc
v3.3.2 => v3.3.4
2015-03-16 08:39:31 -07:00
XhmikosR
0ca3fa42e8
Bump devDependencies.
2015-03-15 04:26:35 -07:00
Mark Otto
c16fee5efd
Merge branch 'master' into v4
...
Conflicts:
.travis.yml
Gruntfile.js
bower.json
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.js
dist/js/bootstrap.min.js
docs/_data/glyphicons.yml
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/labels.html
docs/_includes/components/list-group.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/components/thumbnails.html
docs/_includes/components/wells.html
docs/_includes/css/buttons.html
docs/_includes/css/forms.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/community.html
docs/_includes/getting-started/examples.html
docs/_includes/getting-started/grunt.html
docs/_includes/getting-started/license.html
docs/_includes/getting-started/template.html
docs/_includes/header.html
docs/_includes/js/affix.html
docs/_includes/js/alerts.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/dropdowns.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/scrollspy.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/js/transitions.html
docs/_includes/nav/javascript.html
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/vendor/FileSaver.js
docs/assets/js/vendor/autoprefixer.js
docs/assets/js/vendor/uglify.min.js
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.min.js
docs/examples/blog/index.html
docs/examples/carousel/index.html
docs/examples/cover/index.html
docs/examples/dashboard/index.html
docs/examples/narrow-jumbotron/narrow-jumbotron.css
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/non-responsive/non-responsive.css
docs/examples/theme/index.html
grunt/configBridge.json
js/affix.js
js/carousel.js
js/collapse.js
js/dropdown.js
js/modal.js
js/popover.js
js/scrollspy.js
js/tab.js
js/tests/unit/affix.js
js/tests/unit/button.js
js/tests/unit/carousel.js
js/tests/unit/modal.js
js/tests/unit/tooltip.js
js/tooltip.js
less/badges.less
less/glyphicons.less
less/type.less
less/variables.less
package.json
scss/_dropdown.scss
scss/_forms.scss
test-infra/npm-shrinkwrap.json
2015-03-01 13:44:10 -08:00
Chris Rebert
7f7c7901ae
bump time-grunt to ^1.1.0
2015-02-24 14:14:59 -08:00
Chris Rebert
d8ffd57b93
update shrinkwrap
...
[skip validator]
2015-02-22 18:47:00 -08:00
XhmikosR
b8a0ea1224
Update dependencies.
2015-02-20 11:35:39 +02:00
XhmikosR
b9aad573f9
Travis: test against node.js 0.12.
2015-02-16 21:09:32 -08:00
Chris Rebert
de90cd7a80
update shrinkwrap
2015-02-10 12:57:39 -08:00
XhmikosR
c388870cef
Downgrade grunt-contrib-cssmin.
...
v0.12.0-v0.12.1 breaks paths in URL.
2015-02-10 10:49:59 +02:00
XhmikosR
a3419df829
Bump devDependencies.
2015-02-10 08:30:51 +02:00
Chris Rebert
aed1cd3121
update shrinkwrap
2015-02-04 21:15:20 -08:00
Chris Rebert
85ded1440c
update shrinkwrap
2015-02-04 14:11:26 -08:00
Mark Otto
65a723b602
Update shrinkwrap.
2015-02-02 04:36:13 +02:00
XhmikosR
420088d316
Bump load-grunt-tasks.
2015-01-30 15:13:24 +02:00
Chris Rebert
6a84b5a090
update shrinkwrap
2015-01-23 16:03:23 -08:00
Chris Rebert
9238337cbb
Merge branch 'master' into v4
2015-01-21 13:00:12 -08:00
Chris Rebert
92b267f357
update shrinkwrap
2015-01-20 13:05:58 -08:00
Chris Rebert
0b7f6b941a
update shrinkwrap
2015-01-20 12:49:46 -08:00
Chris Rebert
429809c9cc
update grunt-saucelabs to ~8.5.0
2015-01-20 12:49:08 -08:00
Mark Otto
325748ff68
Merge branch 'master' into v4
...
Conflicts:
_config.yml
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/_includes/components/thumbnails.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/template.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.js
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.js
docs/dist/js/bootstrap.min.js
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/theme/index.html
grunt/configBridge.json
less/alerts.less
less/badges.less
less/jumbotron.less
less/panels.less
less/tables.less
less/theme.less
less/variables.less
package.json
scss/_button-group.scss
scss/_buttons.scss
scss/_forms.scss
2015-01-19 14:48:12 -08:00
XhmikosR
fbc220defd
Update devDependencies.
2015-01-19 19:20:13 +02:00
Mark Otto
c683e7dea7
bump versions
2015-01-19 08:32:13 -08:00
XhmikosR
f5a5621af2
Update devDependencies.
2015-01-16 17:49:58 +02:00
Chris Rebert
050babda0d
update shrinkwrap
2015-01-07 17:44:16 -08:00
Chris Rebert
b3b7ece174
update shrinkwrap
2015-01-06 14:13:07 -08:00
Chris Rebert
796634eb95
update shrinkwrap
...
[skip sauce]
2015-01-05 16:33:43 -08:00
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
9e66526766
update shrinkwrap
2014-12-29 12:00:47 -08:00
Chris Rebert
c14ff80f01
update shrinkwrap
...
[skip sauce]
[skip validator]
2014-12-28 20:29:42 -08:00
Chris Rebert
d6ab6731e6
update shrinkwrap
...
[skip sauce]
[skip validator]
2014-12-28 19:49:12 -08:00
Chris Rebert
a462676075
update shrinkwrap
...
[skip sauce]
[skip validator]
2014-12-28 19:37:16 -08:00
Chris Rebert
109e4c7c16
update shrinkwrap
...
[skip sauce]
2014-12-28 18:55:50 -08:00
Chris Rebert
6099bfdea8
update shrinkwrap
...
[skip sauce]
[skip validator]
2014-12-28 18:45:56 -08:00
Chris Rebert
952f7e9a4e
update shrinkwrap
2014-12-28 18:32:02 -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
8be858aac4
update shrinkwrap
...
[skip validator]
2014-12-12 14:19:42 -08:00
Chris Rebert
0d413c5c08
update shrinkwrap
...
[skip sauce]
[skip validator]
2014-12-12 14:08:03 -08:00
Chris Rebert
5f41801083
update shrinkwrap
2014-12-12 13:22:09 -08:00
XhmikosR
4e27c48248
Run grunt.
2014-12-11 08:24:31 +02: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
2033f169b5
Update test-infra/npm-shrinkwrap.json
2014-12-05 11:38:19 +00: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
