Chris Rebert
ffe646bb08
Sauce tests: upgrade iOS to v8.2
...
[skip validator]
2015-04-07 13:00:52 -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
9bdaf03607
Use OS X 10.10 for Sauce iPhone simulator
...
[skip validator]
2015-02-22 19:01:36 -08:00
XhmikosR
3f512c927b
Add AnchorJS for docs anchors.
2015-01-21 09:50:51 +02:00
Chris Rebert
30b74105dd
remarkable -> markdown-it
2015-01-20 13:04:55 -08:00
Chris Rebert
0dc8395590
use strict mode for jqueryVersionCheck; fixes #15535
2015-01-13 12:21:32 -08:00
Thomas McDonald
d2f29fd649
remove unused font files
2015-01-09 10:15:32 +00: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
57a64be749
Minor fix to Glyphicons data generator
2014-12-29 17:00:44 -08:00
Chris Rebert
96e108f2b2
Revert "remove Glyphicons docs autogeneration from Grunt"
...
This reverts commit 36b5308926
.
This reverts PR #14065 .
Turns out Glyphicons is more active than we'd thought.
2014-12-29 16:54:29 -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
Mark Otto
73e59c26e6
basic docs search
2014-12-24 02:44:38 -08:00
Mark Otto
36a99c68bf
restore configbridge to footer files, update paths
2014-12-19 00:35:54 -08:00
Chris Rebert
7d2b64cbc5
Merge pull request #36 from twbs/trim-config-bridge
...
Move stuff out of configBridge.json now that the Customizer is kaput
2014-12-17 22:36:25 -08:00
Chris Rebert
f24a1cb28d
remove remaining remnants of the Customizer
2014-12-17 13:44:52 -08:00
Chris Rebert
1afc0eec30
Move stuff out of configBridge.json now that the Customizer is kaput
2014-12-16 20:17:54 -08:00
Chris Rebert
7d8bad586b
Merge pull request #34 from twbs/sauce-android-notes
...
update Android comments in sauce_browsers.yml
2014-12-16 19:51:48 -08:00
Chris Rebert
35db839149
update Android comments in sauce_browsers.yml
2014-12-16 19:50:33 -08:00
Chris Rebert
e444c2c58f
remove IE8 from Sauce tests
2014-12-16 19:21:48 -08:00
Chris Rebert
57705e7d85
bump min Firefox in Autoprefixer config to v31 (latest ESR)
2014-12-15 18:26:41 -08:00
Chris Rebert
840b9a4c2e
bump min IE in Autoprefixer config to v9
2014-12-15 18:02:15 -08:00
Mark Otto
95da2a9428
nuke the customizer
2014-12-10 13:51:43 -08:00
Mark Otto
7a799af939
fixes and grunt
2014-11-30 21:01:50 -08:00
Chris Rebert
a7ae8c91f2
upgrade iOS tests to 8.1
...
[skip validator]
2014-11-15 21:28:11 -08:00
Chris Rebert
eb93b5db5f
upgrade OS X tests to Yosemite
...
[skip validator]
2014-11-15 21:20:45 -08:00
Heinrich Fenkart
d107004278
Remove duplicate code from Customizer/Gruntfile by sharing it
2014-11-04 12:35:38 +01:00
Chris Rebert
223d9b4b6b
Merge branch 'master' into jonschlinkert/master
2014-10-28 11:10:51 -07:00
Chris Rebert
0b9f69b9c8
Update Sauce iOS Safari test to iOS 8.0
...
[skip validator]
2014-10-27 15:26:55 -07:00
Chris Rebert
96801605a4
tweak banner of autogenerated CommonJS module
2014-10-27 15:20:55 -07:00
Chris Rebert
af70ac8ae1
Tweak parser to ignore empty Less section docstrings; fixes #14878
2014-10-27 13:50:45 -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
XhmikosR
37facee922
bs-commonjs-generator.js: always use forward slashes in the require path.
...
Since `path.resolve` is using backslashes on Windows, we ended up with different files. Just replace those with forward slashes.
2014-10-26 09:35:14 +02:00
James Friend
3440074bb7
code style improvement
2014-09-09 08:50:35 +08:00
James Friend
4ba4b7c3cf
added banner about generated file
2014-09-09 08:47:23 +08:00
James Friend
2bc417732c
code style fixes
2014-08-28 09:54:51 +08:00
James Friend
015ee2ed74
pulled output path out to gruntfile
2014-08-28 09:39:41 +08:00
James Friend
9aeaf19b1d
Merge remote-tracking branch 'upstream/master' into node-requirable
...
Conflicts:
Gruntfile.js
2014-08-28 09:32:08 +08:00
James Friend
e7991a9a1e
generate commonjs/npm entrypoint module via grunt task
2014-08-28 09:24:23 +08:00
Chris Rebert
c3ae289f4a
Gruntfile-specific JSHint config: disable ASI
...
Refs #14118
2014-07-10 16:58:18 -07:00
Chris Rebert
36b5308926
remove Glyphicons docs autogeneration from Grunt
...
Simplifies the build tooling a teeny bit.
This data file shouldn't need to be updated for v3 ever again.
This task will also be unnecessary in v4.
[skip sauce] [skip validator]
2014-07-07 11:06:19 -07:00
Chris Rebert
532dffdd46
reenable Win7 IE8-9 in Sauce
2014-06-24 12:37:44 -07:00
Chris Rebert
6352c85a65
reenable OS X Chrome in Sauce
2014-06-24 12:37:44 -07: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
5ef9383f53
Tweak JSHint and JSCS checks.
...
Be more consistent across the whole codebase.
Also, make use of JSHint's 2.5.1 `extends` and `qunit` options. This way we set our basis options in js/.jshintrc and override the rest.
2014-06-06 01:23:06 +03:00
XhmikosR
45b476bdbf
JS: remove unused variables.
2014-04-09 10:01:48 +03:00
Chris Rebert
a419e41c32
Sauce tests: update iOS to v7.1
2014-03-30 18:00:06 -07:00
Chris Rebert
24c5a453b2
use glob instead of fs.readdirSync since /less now has subdirs
2014-03-28 11:12:28 -07:00
Zlatan Vasović
cd13e22de1
#ffff -> #fff
...
😄
2014-03-20 21:12:59 +01:00
Zlatan Vasović
86dfcd1a96
Add build-glyphicons-data log
...
Closes #12987
2014-03-17 03:36:58 -07:00
Chris Rebert
dcffbbab61
pass grunt into generateRawFilesJs instead of require()ing it
2014-03-17 03:33:42 -07:00
Chris Rebert
96525fdec4
move sauce_browsers.yml into /grunt/; fixes #13065
2014-03-16 20:30:50 -07:00
Zlatan Vasović
cbec164a50
Remove redundant parens
2014-03-08 10:44:24 +01:00
Chris Rebert
51b825d6b3
fix #12959
2014-03-07 16:05:46 -08:00
XhmikosR
91e57e2738
Move license to the top of the file.
2014-03-07 18:59:43 +02:00
XhmikosR
6f9e3f0d23
Fix typo.
2014-03-07 13:25:59 +02:00
Chris Rebert
56a5d93b82
switch to grunt-css-flip for RTL CSS generation
2014-03-06 12:31:28 -08:00
XhmikosR
d7dc8a7bd3
Merge pull request #12853 from twbs/jscs
...
Switch to JSCS
2014-03-05 08:42:50 +02:00
XhmikosR
22d004e332
Re-indent grunt/.jshintrc.
2014-02-28 19:07:14 +02:00
XhmikosR
c586a56d57
Move immed
to JSCS.
2014-02-28 17:30:08 +02:00
XhmikosR
2545073024
Move trailing
check to JSCS.
2014-02-28 17:30:08 +02:00
XhmikosR
be8f125ce6
Move camelcase
check to JSCS.
2014-02-28 17:30:08 +02:00
XhmikosR
d65f749390
Move the quotes check to JSCS.
2014-02-28 17:30:08 +02:00
XhmikosR
537e10033e
Switch to using JSCS for the indentation check.
2014-02-28 17:30:08 +02:00
Chris Rebert
e40c1e5e6d
add Grunt task for css-flip-ing & add RTL to Gruntfile configs
2014-02-25 10:31:02 -08:00
Zlatan Vasović
dd60fcb467
Improve grunt/.jshintrc
2014-02-16 19:57:39 +01:00
Zlatan Vasović
7100e3a37e
Add build-raw-files log; fixes #12603
...
Fixes #12672
2014-02-13 11:26:55 -08:00
XhmikosR
55e6d4b9b5
Remove trailing space.
2014-02-12 21:27:31 +02:00
Zlatan Vasović
ba4206b644
Use different coding style for Gruntfile
...
Fixes #12657
2014-02-10 11:15:08 -08:00
Chris Rebert
dc79fecacd
add copyright header to shrinkwrap.js; fixes #12643
2014-02-10 10:06:33 -08:00
Zlatan Vasović
aead10fafa
Avoid setting jshint node: true
in every Grunt JS file
2014-02-07 13:34:17 +01:00
XhmikosR
5769b776e5
bs-raw-files-generator.js: use the global directive to define the btoa
variable.
2014-02-06 23:34:02 +02:00
Chris Rebert
46f9d27142
reorganize all grunt tasks into one directory
...
also fixes #12581
2014-02-04 13:18:54 -08:00