rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity
13,319 Commits 108 Branches 89 Tags 547 MiB
9e23bbc1bc
Commit Graph

340 Commits

Author SHA1 Message Date
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
Heinrich Fenkart
1604af041b Add jQuery version check to existing jQuery presence check 
Fixes #14809.
Closes #14825.
 2014-10-23 05:57:15 +02:00
XhmikosR
924c68f8bb Update FileSaver.js v2014-08-29. 2014-10-09 08:16:32 +03:00
XhmikosR
7ded2d185d Update Blob.js to v2014-07-24. 2014-10-09 08:16:31 +03:00
Chris Rebert
0013f12989 fix #14609 2014-09-17 17:36:07 -07:00
vsn4ik
1965f032ca Gruntfile.js: Simplify copy task. 2014-08-30 01:20:48 +04: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
06c4002019 Gruntfile: Fix #13949 by separating docs into separate task & refactoring 2014-08-14 11:42:13 -07:00
Chris Rebert
559f16572f Gruntfile: switch cssmin & jade tasks from files over to src & dest 
Refs #14388.
 2014-08-13 17:36:13 -07:00
vsn4ik
da8daa667c Gruntfile.js: Use user-friendly properties. 2014-08-13 23:12:09 +04:00
Chris Rebert
a8437f0d23 Merge pull request #14325 from hnrch02/cleanup-buttons-docs 
Clean up buttons documentation
 2014-08-08 12:23:55 -07:00
Heinrich Fenkart
2c625c7d1a Clean up buttons documentation 2014-08-06 06:10:51 +02:00
Michael J.
d80be40d04 Make grunt concat js files when watching 2014-08-06 10:22:16 +08:00
Michael J.
0c03d0c273 grunt now watch files in all folders/subfolders 2014-07-31 10:21:56 +08:00
Chris Rebert
031cb969d7 Have HTML5 validator ignore autocomplete="off" on input[type="checkbox"] 
Not clear from the spec whether this is invalid per se.
But it is the current best known workaround for Firefox's unusual behavior.
 2014-07-18 14:19:16 -07:00
vsn4ik
59171b3377 Gruntfile.js: Add semicolon in "_update-shrinkwrap" task. 2014-07-11 03:42:09 +04:00
Chris Rebert
5d1abf8b38 Merge pull request #14036 from twbs/fix-13575 
Jekyll: Use non-minified assets when not running from GitHub Pages
 2014-07-07 19:36:32 -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
1dc54dc160 use non-minified Bootstrap JS when on non-gh-pages 2014-07-03 13:40:47 -07:00
Chris Rebert
92fd25a2a2 use non-minified docs JS on non-gh-pages 2014-07-03 13:18:44 -07:00
Chris Rebert
b793fbb13a use non-minified docs CSS on non-gh-pages 2014-07-03 13:12:58 -07:00
XhmikosR
2a47034598 Copy all files in docs/dist. 
Now we are on par with what we have on the gh-pages dist/ folder.
 2014-07-01 07:38:38 +03:00
XhmikosR
b93b7b1b6d Revert "Revert "Turn off clean-css' advanced optimizations."" 
This reverts commit e31c2edf88.
 2014-06-25 01:53:10 +03:00
Chris Rebert
e31c2edf88 Revert "Turn off clean-css' advanced optimizations." 
This reverts commit 25ca51319b.
 2014-06-24 14:54:51 -07:00
Chris Rebert
6ec5b8cea8 retry each test up to 3 times in the event of timeout 
Big thanks to @gvas for https://github.com/axemclion/grunt-saucelabs/pull/136 ! <3
 2014-06-24 12:17:38 -07:00
XhmikosR
25ca51319b Turn off clean-css' advanced optimizations. 
Works around #13914.

We might give it another go in the future but the stuff this breaks over the time does not justify having it enabled. The gain in size is negligible:

dist/css/bootstrap.min.css: 108.65 kB → 109.5 kB
dist/css/bootstrap-theme.min.css: 18.84 kB → 18.86 kB
docs/assets/css/docs.min.css: 20.44 kB → 20.61 kB
 2014-06-24 19:01:40 +03:00
Chris Rebert
c2c19a4d2d Revert UMD (#13772 & friends) for now, due to #13812. 
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a1a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa9010d.

Revert "address #13811"
This reverts commit f347d7d955.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
 2014-06-23 11:11:59 -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
4686d1483b Merge pull request #13829 from BBosman/preserve 
Always use preserveComment: 'some'
 2014-06-19 12:57:52 +03:00
Chris Rebert
f347d7d955 address #13811 2014-06-17 18:53:52 -07:00
Chris Rebert
85c15eec0f Gruntfile: add note about duplicate copy of jqueryCheck code 
Refs #13842
 2014-06-17 18:48:15 -07:00
Bas Bosman
3f68c40ac1 Make autoprefixer browsers fixed 
Closes #13795 by merging it.
 2014-06-17 11:56:16 -07:00
Bas Bosman
fdc33ced17 Always use preserveComment: 'some' 2014-06-15 16:41:53 +02:00
XhmikosR
89c0e4d2ab Update ZeroClipboard to v1.3.5. 
Also use the official filenames.
 2014-06-10 08:30:17 +03:00
Mark Otto
7d1365ce1c Refactor and restyle. 2014-06-10 08:30:16 +03:00
soundarapandian
250e021ff1 Integrate ZeroClipboard to easily copy code snippets 2014-06-10 08:30:16 +03:00
XhmikosR
7b0acf14d8 Comply to the new style. 2014-06-06 01:23:07 +03: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
Robert Dodd
8e354c4240 Reassigned minification of CSS to cssmin task. 
Reassigned minification of CSS files from the less task to the cssmin
task
 2014-05-19 17:07:31 +10:00
Chris Rebert
6638fc1649 Gruntfile: skip steps when $TWBS_DO_*=0 2014-05-18 17:20:54 -07:00
Chris Rebert
db26c9f4b4 Gruntfile: extract runSubset() func 2014-05-18 17:20:54 -07:00
Chris Rebert
828a5baa00 remove update-shrinkwrap from the default Grunt task 
Most folks shouldn't care about the shrinkwrap.
It should only be run on-demand, not as a routine/periodic thing.
 2014-05-13 02:08:25 -07:00
XhmikosR
d0fca8aaad Remove RTL leftovers. 2014-05-13 09:26:24 +03:00
Mark Otto
58f03754c6 unfuck the gruntifle 2014-05-12 22:01:29 -07:00
Mark Otto
e52920ca87 no more concurrency 2014-05-12 21:50:13 -07:00
Mark Otto
d8baec85f5 remove the comment 2014-05-12 20:14:39 -07:00
Mark Otto
f5513fd30e nuke rtl 2014-05-12 19:47:53 -07:00
Chris Rebert
eab6d3ead8 add IE warning scripts to linter config 2014-04-24 19:14:06 -07:00
Chris Rebert
5458134f5e Add Gist & Customizer URLs to customized files & config.json 
Fixes #9951
Fixes #12865
 2014-03-28 10:58:32 -07:00
XhmikosR
dea1945b47 Gruntfile.js: Remove default report option. 2014-03-27 19:48:23 +02:00
Zlatan Vasović
8ae48183b2 Fix #13138: use underscore prefix to ignore directories 2014-03-24 21:47: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
Mark Otto
43cf003f9a Update gruntfile to point to new customizer nav, run grunt 2014-03-16 20:40:30 -07:00
Chris Rebert
96525fdec4 move sauce_browsers.yml into /grunt/; fixes #13065 2014-03-16 20:30:50 -07:00
Chris Rebert
1751922ca0 upgrade to grunt-css-flip v0.2.0 2014-03-12 16:59:58 -07:00
XhmikosR
28d2de3703 Gruntfile.js: fix path after d08bbdc6ec. 2014-03-12 19:15:41 +02:00
XhmikosR
b39a8c77c3 Simplify tasks a little bit. 2014-03-11 19:49:11 +02:00
XhmikosR
f750f7e448 Run usebanner before cssmin. 2014-03-11 19:49:11 +02:00
XhmikosR
4bf0645060 Merge pull request #12977 from ZDroid/var 
Rename generateRawFilesJs to generateRawFiles
 2014-03-10 01:16:30 +02:00
Mark Otto
4883605624 Fix bad grunt merge and then G R U N T 2014-03-09 16:15:53 -07:00
Mark Otto
b263a0197b Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	Gruntfile.js
 2014-03-09 16:11:04 -07:00
Mark Otto
2f7b04a192 Reorder the Gruntfile a bit 2014-03-09 16:09:36 -07:00
XhmikosR
9d027d2bee Remove unneeded quotes. 2014-03-09 11:10:52 +02:00
Zlatan Vasović
e4c9492ad9 Rename generateRawFilesJs to generateRawFiles 2014-03-08 10:54:41 +01:00
Chris Rebert
b9a0d1e4cd Merge pull request #12505 from ZDroid/js-cs-hint 
Reorganize docs assets
 2014-03-07 08:47:09 -08:00
Zlatan Vasović
d08bbdc6ec Reorganize docs assets 2014-03-07 17:37:23 +01:00
Bas Bosman
de27e729da Do csscomb earlier in build phase 2014-03-07 13:39:07 +01:00
Bas Bosman
cb7eb674ac Add autoprefixer 2014-03-07 09:01:54 +01:00
XhmikosR
73ad81d89c Add time-grunt plugin. 2014-03-07 08:47:23 +02:00
Chris Rebert
310465b035 re-enable requireCamelCaseOrUpperCaseIdentifiers in JSCS & use null to override it for Gruntfile 2014-03-06 13:15:32 -08: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
Mark Otto
559b90f944 Rename RTL files and add some basic docs 2014-03-03 23:50:04 -08:00
Mark Otto
587814f16e Simplify gruntfile more to remove theme RTL 2014-03-03 22:49:43 -08:00
Mark Otto
4dd7b4bd87 Don't RTL the theme file--no need 2014-03-03 21:54:07 -08:00
Mark Otto
af39290a9d Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip 
Conflicts:
	Gruntfile.js
	package.json
	test-infra/npm-shrinkwrap.canonical.json
 2014-03-03 21:52:56 -08:00
XhmikosR
cd134f1ed6 Merge pull request #12864 from twbs/csslint-fix 
Csslint fix
 2014-03-02 09:50:21 +02:00
XhmikosR
055730d84e Gruntfile.js: use the same targets as JSHint for JSCS to avoid duplication. 2014-02-28 17:30:08 +02:00
XhmikosR
c586a56d57 Move immed to JSCS. 2014-02-28 17:30:08 +02:00
XhmikosR
299f985e5d Gruntfile.js: Remove extra comma. 2014-02-28 17:29:36 +02:00
XhmikosR
a7339a0f4c Move csslint overrides in Gruntfile.js. 
This works around https://github.com/gruntjs/grunt-contrib-csslint/issues/26
 2014-02-27 11:39:30 +02:00
XhmikosR
05ccc185d9 Break csslint targets. 2014-02-27 11:15:32 +02:00
XhmikosR
2ef9f9b213 Run csscomb before cssmin. 2014-02-27 10:52:30 +02:00
XhmikosR
8ff7e64359 Add docs.css in the CSSComb task. 2014-02-27 10:12:52 +02:00
XhmikosR
63031a3ca5 Bump grunt-jscs-checker. 2014-02-26 19:32:43 +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
XhmikosR
db32afe6cf Update grunt-contrib-cssmin. 2014-02-18 07:40:02 +02:00
XhmikosR
5796b56d96 Switch to the minified JSZip. 2014-02-12 20:50:47 +02:00
Chris Rebert
1e1f510294 rm BrowserStack testing from build 2014-02-11 10:11:38 -08:00
Zlatan Vasović
ba4206b644 Use different coding style for Gruntfile 
Fixes #12657
 2014-02-10 11:15:08 -08:00
Chris Rebert
9afead3fb0 fix indentation in Gruntfile 2014-02-10 11:09:59 -08:00
Zlatan Vasović
938779ca93 Move jade files to docs/jade/ 2014-02-08 22:29:06 +01:00
Chris Rebert
f07423511d Merge pull request #12648 from ZDroid/index.html-only 
Replace wildcard with file name
 2014-02-07 12:44:51 -08:00
Zlatan Vasović
54aece3458 Replace wildcard with file name 2014-02-07 20:48:12 +01:00
Zlatan Vasović
aead10fafa Avoid setting jshint node: true in every Grunt JS file 2014-02-07 13:34:17 +01:00
XhmikosR
119ed54bd1 Merge pull request #12605 from ZDroid/license-object 
Use license object instead of licenses array
 2014-02-06 21:04:36 +02:00
Zlatan Vasović
9bb5c319b8 Update grunt paths 2014-02-06 19:39:45 +01:00
Zlatan Vasović
96fd2dca02 Use license object instead of licenses array 2014-02-06 11:37:39 +01:00
Chris Rebert
46f9d27142 reorganize all grunt tasks into one directory 
also fixes #12581
 2014-02-04 13:18:54 -08:00
Mark Otto
ef3c560a06 Reorder grunt dist tasks to ensure JS gets copied over 2014-02-04 02:04:23 -08:00
XhmikosR
aeed64d1cb Gruntfile.js: Move common uglify properties together. 2014-02-04 11:14:20 +02:00
XhmikosR
9f668a5573 Add examples/**/*.css in csscomb task. 2014-02-04 10:39:02 +02:00
XhmikosR
3a89fbc9a3 Add examples/**/*css in the csslint task. 
Fixes #12457.
 2014-02-04 09:04:40 +02:00
Chris Rebert
d99d79d2e8 fix #12531 2014-02-02 21:38:37 -08:00
Chris Rebert
623d650758 most of Bootstrap's components are pure CSS and thus don't require jQuery 
Refs https://news.ycombinator.com/item?id=7156305
 2014-01-31 09:50:47 -08:00
Mark Otto
80ef14a11a Merge pull request #12423 from ZDroid/name 
Rename pack.min.css to docs.min.css to match with docs.min.js
 2014-01-29 21:44:01 -08:00
Zlatan Vasović
00f062fc7e Rename pack.min.css to docs.min.css to match with docs.min.js 2014-01-29 20:50:10 +01:00
Chris Rebert
9ec5905c07 Merge pull request #12415 from XhmikosR/master 
Gruntfile.js: remove unused code.
 2014-01-28 17:35:09 -08:00
Zlatan Vasović
f8bb6811bd Remove redundant jshint comment 2014-01-28 22:47:23 +01:00
XhmikosR
615f1ad4aa Gruntfile.js: remove unused code. 2014-01-28 21:07:56 +02:00
Chris Rebert
5a3f1a90ba fix #12261 2014-01-26 14:22:06 -08:00
Chris Rebert
3de48d29f5 fix #12280 by templating the customizer's nav sidebar too 
The customizer is such a PITA.
 2014-01-20 18:06:16 -08:00
Chris Rebert
6b8d4e9c76 clarify Grunt task licensing 2014-01-20 16:56:24 -08:00
Chris Rebert
336f5f1dce rename raw-files.js to raw-files.min.js 
it's not /technically/ minified, but close enough
it's autogenerated, not terribly human-readable, and not meant to be directly modified
 2014-01-19 22:29:51 -08:00
Zlatan Vasović
956064ec56 Improve grunt config and vars 2014-01-19 22:41:01 +01:00
XhmikosR
4bca3c79b3 Move docs third-party libraries to a separate folder. 2014-01-18 08:15:21 +02:00
Chris Rebert
ffdc18cbbf fix #12274 2014-01-17 11:52:35 -08:00
Chris Rebert
47bbc30b2c increase Sauce concurrency 
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-32309827
Thanks @admc & @saucelabs !
 2014-01-15 15:55:47 -08:00
Chris Rebert
e2a18430f9 Merge pull request #12213 from twbs/browserstack 
tests: run BrowserStack in parallel with Sauce Labs
 2014-01-14 20:44:47 -08:00
Chris Rebert
3a97697456 tests: run BrowserStack in parallel with Sauce Labs 
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-31922999
and internal twbs team discussion.
Effectively reverts the deletions from #11701.
 2014-01-14 14:13:52 -08:00
Chris Rebert
46b0874ef5 add copyright notice to raw-files.js 2014-01-14 13:27:50 -08:00
Zlatan Vasović
c335104957 Rename uglify.js to uglify.min.js for consistency 2014-01-14 13:41:21 +01:00
Chris Rebert
ea591748ed sort out attribution banners of docs assets; fixes #11976 2014-01-13 21:58:27 -08:00
Chris Rebert
aff64cffce avoid redundant banner in minified docs CSS 2014-01-13 21:31:40 -08:00
Chris Rebert
685fe722c2 preserve third-party attribution comments when minifying docs JS 2014-01-13 17:00:26 -08:00
Chris Rebert
4b5e73b842 add Blob.js separate from filesaver.js 
Blob.js version 2013-12-27 / 0055d054acbca43eff44fc25c891055440685d9c
Refs #12196
 2014-01-12 14:41:30 -08:00
XhmikosR
ef22ab5aed update less.js to v1.6.1 & use accurate filename; refs #12196 2014-01-12 14:32:58 -08:00
Mark Otto
e68d3b961e Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets 
Conflicts:
	package.json
 2014-01-11 14:48:04 -08:00
Chris Rebert
39861714a8 Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095 
also updates variables file organization (courtesy @mdo)
 2014-01-08 12:41:51 -08:00
XhmikosR
d06d61dc12 Use single quotes in the jqueryCheck too. 2014-01-08 13:41:17 +02:00
XhmikosR
d7bf9372ec Remove extra newline from banner. 2014-01-08 13:41:17 +02:00
XhmikosR
016d573a80 Use the docs banner for all the docs generated files. 2014-01-08 13:41:17 +02:00
XhmikosR
9b71314fd8 Turn advanced optimizations off until it's fixed in clean-css. 2014-01-08 13:41:17 +02:00
XhmikosR
f00bbdd994 Minify docs CSS too. 2014-01-08 13:41:17 +02:00
XhmikosR
ebf7807985 docs-assets: concatenate and minify all javascript files. 2014-01-08 13:41:16 +02:00
Chris Rebert
d7a128c636 extract glyphicons.yml generator out of Gruntfile into separate module 2014-01-07 22:34:09 -08:00
Chris Rebert
d1c29af591 extract raw-files.js generator out of Gruntfile into separate module 2014-01-07 22:16:52 -08:00
Chris Rebert
a712abd06e enable CSSLint in test suite; fixes #12094 2014-01-07 19:34:49 -08:00
Chris Rebert
c891be5e5f adjust filename to indicate that customize JS is minified 2014-01-07 19:10:31 -08:00
Chris Rebert
bf5017c01c fix #12143 2014-01-07 17:08:40 -08:00
Julian Thilo
7fcfe61f4d Update copyright notices in all places 
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
 2014-01-07 01:05:24 +01:00
Chris Rebert
938bc12c58 add /docs/assets JS to JSCS Grunt task config 2014-01-05 20:52:37 -08:00
Zlatan Vasović
0cc4fe6ee3 Drop trailling comma 
No need for it.
 2014-01-02 15:46:13 +01:00
Mark Otto
50cf0b1a9d Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state 2013-12-31 18:23:10 -08:00
Mark Otto
e3aa358696 derp 2013-12-31 13:57:35 -08:00