Commit Graph

387 Commits

Author SHA1 Message Date
XhmikosR 9eded912a0 Make jQuery 2.0 the minimum supported version. 2015-10-24 19:09:33 +03:00
nextgenthemes f80fdf2da5 add dash to .scsslint.yml 2015-09-30 00:48:56 +02:00
Chris Rebert 74cc05c032 Only run htmllint on Travis
So as to avoid any dependence on Java for normal users of the Gruntfile.

[skip sauce]
2015-09-25 15:34:31 -07:00
Chris Rebert f22f7beead Move {test-infra=>grunt}/npm-shrinkwrap.json 2015-09-23 23:26:23 -07:00
XhmikosR f14113133d Remove `gem install scss_lint` from Travis.
Instead, use `bundleExec: true` for grunt-scss-lint.
2015-09-06 12:28:35 +03:00
XhmikosR a3d0a2c045 Update htmllint rules for the new version. 2015-09-05 08:13:43 +03:00
Xavier Gallardo 750656fc9c Add a license header to bootstrap.scss 2015-09-02 15:08:21 -04:00
Chris Rebert 631f3eca4b Add babel:dev to Sauce Grunt subtasks so we don't test stale JS
Refs #17328
2015-08-26 00:58:39 -07:00
Chris Rebert 6c8bf4ca88 Add babel:dev to dist-js Grunt task so that `grunt test` doesn't use stale JS
[skip sauce]
2015-08-25 23:59:22 -07:00
Chris Rebert 3cc25428be rm broken bundle update task & defunct custom RubyGem caching scheme
[skip sauce]
2015-08-25 23:00:18 -07:00
Chris Rebert 8bc2e21754 Gruntfile: rm reference to defunct customizer
[skip sauce]
2015-08-25 22:51:21 -07:00
XhmikosR 606393502d Specify Internet Explorer 9 as the minimum supported version. 2015-08-25 18:52:27 +03:00
XhmikosR 4fae5a6f4b Fix `grunt validate-html` task. 2015-08-25 08:43:47 +03:00
Mark Otto 0de6584eda register task 2015-08-18 22:49:26 -07:00
Mark Otto cf8bb8882e grunt build control for pushing it all 2015-08-18 22:47:26 -07:00
Jacob Thornton 18ff57a183 js tests passing + eslint 2015-08-18 19:22:46 -07:00
Mark Otto c064eef67b Massive cleanup
- Simpler main nav on all pages
- Back to purple masthead on homepage instead of dark graphite
- Active link styles on the main nav
- Cleaned up sidebar nav
- New docs layout name
- Homepage copy edits
- Updated bright purple docs color
2015-08-14 22:45:55 -07:00
Mark Otto 0babe3568c simpler gruntfile watch 2015-08-12 20:14:14 -07:00
Mark Otto 3406e2fd7f Merge branch 'v4' of https://github.com/twbs/derpstrap into v4 2015-08-12 20:01:38 -07:00
Mark Otto 46fbaab5ef unfuck all that watch shit 2015-08-12 20:01:15 -07:00
Jacob Thornton 23d05f1585 get the js working for docs 2015-08-12 19:59:55 -07:00
Thomas McDonald b84bb4e218 Merge branch 'v4' into force-expanded 2015-08-09 23:33:52 -07:00
Thomas McDonald 0ef0825d01 specify expanded output style for generated css with libsass
(also fix license banner generator bug)
2015-08-09 23:16:43 -07:00
Mark Otto f651338a88 disable the custom builds generation for now: 2015-08-09 21:45:08 -07:00
Mark Otto 1ddc3f5e21 Merge branch 'master' into v4m 2015-08-04 22:29:45 -07:00
Mark Otto bc29c016b7 Merge branch 'v4' into v4_builds 2015-06-19 16:26:33 -07:00
Mark Otto 3df2d085ed fix scsslint.yml path 2015-06-19 00:14:52 -07:00
Mark Otto 169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
Mark Otto 8410afe0e1 Create new stylesheets for optional builds and add them to Gruntfile tasks 2015-06-18 10:19:50 -07:00
Kevin Kirsche 8b01de228f Include CSS Map file for bootstrap.min.css
X-Ref #16583
2015-06-04 21:05:59 -04:00
XhmikosR cbe0f352d1 Fix license header after e93c6a2216.
[ci skip]
2015-06-01 10:29:18 +03:00
Mark Otto 663576a7ae Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css
2015-05-27 15:49:55 -07:00
XhmikosR c56032a0e5 Remove grunt-banner completely.
Add a license header in theme instead.
2015-05-16 12:57:27 +03:00
Bryan Braun dec2faec3d Update Anchor.js and port over the existing styles.
Anchor.js 1.0.0 drops the need to use anchor.css, so we remove it
from the codebase and move any leftover styles over to docs.css.

Closes #16488 by merging it.
2015-05-16 09:58:15 +03:00
fat f8b2569ec8 implement global dispose method 2015-05-13 12:48:34 -07:00
fat dafdd180cd add umd module support in dist 2015-05-13 10:13:34 -07:00
fat ab1578465a grunt test-js, grunt dist-js now working 2015-05-12 16:52:54 -07:00
fat a58febf71a popover passing as well 2015-05-12 14:35:00 -07:00
fat 3452e8dc83 rewritten tooltip + tether integration and death to our positioner jank 2015-05-11 23:32:37 -07:00
fat 8eee78ca15 tab es6 2015-05-11 12:29:06 -07:00
fat 2d91494d96 scrollspy es6 2015-05-11 12:05:35 -07:00
fat ca9c850ebb add getters for Version and Default where applicable
add modal my gawd
2015-05-10 19:45:38 -07:00
fat bbb97a8660 add dropdown 2015-05-10 13:47:11 -07:00
fat 8bab38bb71 add collapse 2015-05-09 23:04:58 -07:00
fat 1b183e2ff7 carousel -> es6 2015-05-07 22:26:40 -07:00
fat 6605051882 button -> es6 2015-05-07 17:14:38 -07:00
fat 0724bd91ff es6 alert :| 2015-05-07 12:57:31 -07:00
fat d1fbe200f4 remove closureness from plugins 2015-05-06 13:34:14 -07:00
XhmikosR fae8c5d0dc Add package.js in Grunt tasks. 2015-04-28 11:03:37 +03:00
Chris Rebert 4f85fcfc28 Fix #16075 by switching to maintained fork of grunt-sed
[skip sauce]
[skip validator]
2015-04-23 12:11:57 -07:00
XhmikosR f3386079f3 Grunt: extend `prep-release` task.
Make it so that everything is done for us to reduce the possibility of missing something when releasing.
2015-04-23 19:56:40 +03:00
XhmikosR e778dc1348 Add grunt-contrib-htmlmin.
Only used for the GitHub docs.
2015-04-08 09:27:38 +03:00
XhmikosR a204780b8b Remove extra comma. 2015-04-08 09:27:13 +03:00
XhmikosR 381a55ed1a Update dependencies. 2015-04-08 09:24:23 +03:00
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
Zach Leatherman 7661456029 There is no jshint:src task 2015-03-27 15:31:56 -05:00
Chris Rebert f41acae9fc add TODO item regarding clean-css v3.2 & zeroUnits
Refs https://github.com/twbs/bootstrap/issues/14837#issuecomment-77441999
2015-03-08 21:31:58 -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
Heinrich Fenkart 4345e24479 Use different way to make failing test more visible in Sauce 2015-03-01 09:20:00 +01:00
XhmikosR b8a0ea1224 Update dependencies. 2015-02-20 11:35:39 +02:00
Chris Rebert cdd287da0d Exempt Closure part of Gruntfile from requireCamelCaseOrUpperCaseIdentifiers
This allows `grunt jscs:grunt` to succeed.
2015-02-16 17:38:54 -08:00
Chris Rebert 1daca5ac5c Gruntfile: make JSCS happier 2015-02-16 17:18:16 -08:00
fat 834220ea20 bootstrap onto closure 2015-02-11 11:29:43 -08:00
Chris Rebert 0013483d94 bump grunt-html to ~3.0.0 2015-02-10 12:57:00 -08:00
Chris Rebert f265fed3eb account for mq4-hover-shim's renaming & org move 2015-02-04 21:15:01 -08:00
Mark Otto ea8b51920a use grunt-html instead of grunt-html-validation because holy shit it's fast 2015-02-04 14:10:35 -08:00
Mark Otto 73b50769d8 Switch to grunt-html over grunt-html-validation. 2015-02-02 04:36:13 +02:00
XhmikosR 03e41b355c Gruntfile.js: Remove now unneeded validator relaxError option. 2015-01-26 18:02:58 +02:00
Chris Rebert eaaaa00520 Integrate mq4-hover-hover-shim 2015-01-22 11:37:37 -08:00
XhmikosR 3f512c927b Add AnchorJS for docs anchors. 2015-01-21 09:50:51 +02: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
Thomas McDonald 0964504fda remove less references from package files
Closes #62 (of v4)
2015-01-18 19:06:51 -08:00
Chris Rebert 3c6a307011 bump min Chrome in Autoprefixer to v35 2015-01-07 17:49:43 -08:00
Chris Rebert 9d0f6c05f4 Sauce testing: set maxPollRetries to 4 for increased robustness 2015-01-05 12:40:43 -08:00
Zlatan Vasović 576230b92a Happy New Year 🎅 2015-01-01 01:23:48 +01:00
Chris Rebert 45f5841785 Merge pull request #15464 from twbs/address-15419
Address #15419
2014-12-31 16:11:04 -08:00
Chris Rebert 473c75dc4c bump min OS X Safari in Autoprefixer config to v7.1 2014-12-30 12:49:46 -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
Chris Rebert f91071bc1b Bump grunt-contrib-cssmin to ~0.11.0 2014-12-28 19:58: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
Chris Rebert 736b7bdf93 bump min iOS in Autoprefixer config to v7 2014-12-19 18:11:54 -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 e86468702a Remove IE8 compatibility option from cssmin Grunt task config 2014-12-15 11:28:35 -08:00
Mark Otto e0a9a7722f Merge pull request #14 from twbs/nuke_customizer
Nuke the customizer
2014-12-11 12:21:05 -08:00
Mark Otto 95da2a9428 nuke the customizer 2014-12-10 13:51:43 -08: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 5a986744f7 add test-scss Grunt task 2014-12-08 19:02:25 -08:00
Chris Rebert 1f6f95a245 grunt-saucelabs now uses `throttled` instead of `concurrency`
[skip validator]
2014-12-08 14:58:06 -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
Chris Rebert a527aaa114 Whitelist <li role="separator">...</li>
Refs https://www.w3.org/Bugs/Public/show_bug.cgi?id=27120
Refs #15263

[skip sauce]
2014-12-02 12:56:30 -08:00
Mark Otto 4bba2d0e0c fix more broke shit, run grunt 2014-11-30 20:29:47 -08:00
XhmikosR cb29c9a41d Add a target to generate the gh-pages files.
It sets `github: true` for us.
2014-11-20 08:02:05 +02:00
Chris Rebert db95e0bd01 disable core tests for Savage builds 2014-11-19 16:00:46 -08:00
Heinrich Fenkart ff5f9db68e HTML validation: No longer relax the `X-UA-Compatible` error
The validator no longer complains about it unless the value is different from `content=IE=edge`, see https://www.w3.org/Bugs/Public/show_bug.cgi?id=27091
2014-11-10 20:02:06 +01:00
Heinrich Fenkart 30df201abc Use a Jekyll plugin instead of the `copy:configBridge` grunt task 2014-11-05 18:35:13 +01:00
Heinrich Fenkart d107004278 Remove duplicate code from Customizer/Gruntfile by sharing it 2014-11-04 12:35:38 +01:00
XhmikosR a515191afd Customizer: include the minified files only on GitHub pages. 2014-10-29 07:30:57 +02: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